Merge branch 'main' into fix/posix-websocket-broadcast-race

Author: mathieucarbou

examples/arduino/PerfTests/PerfTests.ino

@@ -239,7 +239,7 @@ void loop() {
 
 #ifdef ESP32
   if (now - lastHeap >= 2000) {
-    Serial.printf("Uptime: %3lu s, requests: %3u, Free heap: %" PRIu32 "\n", millis() / 1000, requests, ESP.getFreeHeap());
+    Serial.printf("Uptime: %3lu s, requests: %3u, Free heap: %" PRIu32 ", Min free heap: %" PRIu32 "\n", millis() / 1000, requests, ESP.getFreeHeap(), ESP.getMinFreeHeap());
     lastHeap = now;
   }
 #endif

examples/arduino/WebSocket/WebSocket.ino

@@ -210,7 +210,7 @@ void loop() {
     ws.pingAll();
 
 #ifdef ESP32
-    Serial.printf("Free heap: %" PRIu32 "\n", ESP.getFreeHeap());
+    Serial.printf("Uptime: %3lu s, Free heap: %" PRIu32 ", Min free heap: %" PRIu32 "\n", millis() / 1000, ESP.getFreeHeap(), ESP.getMinFreeHeap());
 #endif
     lastHeap = now;
   }

src/AsyncWebSocket.cpp

@@ -367,6 +367,7 @@ void AsyncWebSocketClient::_onAck(size_t len, uint32_t time) {
 
 void AsyncWebSocketClient::_onPoll() {
   asyncsrv::unique_lock_type lock(_lock);
+
   if (!_client) {
     return;
   }
@@ -454,6 +455,7 @@ bool AsyncWebSocketClient::canSend() const {
 
 bool AsyncWebSocketClient::_queueControl(uint8_t opcode, const uint8_t *data, size_t len, bool mask) {
   asyncsrv::lock_guard_type lock(_lock);
+
   if (!_client) {
     return false;
   }
@@ -470,6 +472,7 @@ bool AsyncWebSocketClient::_queueControl(uint8_t opcode, const uint8_t *data, si
 
 bool AsyncWebSocketClient::_queueMessage(AsyncWebSocketSharedBuffer buffer, uint8_t opcode, bool mask) {
   asyncsrv::unique_lock_type lock(_lock);
+
   if (!_client || !buffer || buffer->empty() || _status != WS_CONNECTED) {
     return false;
   }
@@ -958,6 +961,7 @@ bool AsyncWebSocketClient::binary(const __FlashStringHelper *data, size_t len) {
 
 IPAddress AsyncWebSocketClient::remoteIP() const {
   asyncsrv::lock_guard_type lock(_lock);
+
   if (!_client) {
     return IPAddress((uint32_t)0U);
   }
@@ -967,6 +971,7 @@ IPAddress AsyncWebSocketClient::remoteIP() const {
 
 uint16_t AsyncWebSocketClient::remotePort() const {
   asyncsrv::lock_guard_type lock(_lock);
+
   if (!_client) {
     return 0;
   }