Skip to content

Commit cdd2711

Browse files
fix(websocket): release client-lock during WEBSOCKET_EVENT_DATA
This resolves: 1) Deadlock when trying to reserve a lock in WEBSOCKET_EVENT_DATA, but lock is held by a thread trying to send a websocket message. 2) High latency caused by writers serialized with WEBSOCKET_EVENT_DATA while calling esp_websocket_client_send(), even when TCP window has enough space for the entire message being queued to send. Multiple writers are still serialized at fragment boundaries, but only with other writers and websocket error updates. Fixes #625
1 parent c5b49de commit cdd2711

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

components/esp_websocket_client/esp_websocket_client.c

+7-6
Original file line numberDiff line numberDiff line change
@@ -1044,12 +1044,6 @@ static void esp_websocket_client_task(void *pv)
10441044
break;
10451045
}
10461046
client->ping_tick_ms = _tick_get_ms();
1047-
1048-
if (esp_websocket_client_recv(client) == ESP_FAIL) {
1049-
ESP_LOGE(TAG, "Error receive data");
1050-
esp_websocket_client_abort_connection(client, WEBSOCKET_ERROR_TYPE_TCP_TRANSPORT);
1051-
break;
1052-
}
10531047
break;
10541048
case WEBSOCKET_STATE_WAIT_TIMEOUT:
10551049

@@ -1086,6 +1080,13 @@ static void esp_websocket_client_task(void *pv)
10861080
xSemaphoreTakeRecursive(client->lock, lock_timeout);
10871081
esp_websocket_client_abort_connection(client, WEBSOCKET_ERROR_TYPE_TCP_TRANSPORT);
10881082
xSemaphoreGiveRecursive(client->lock);
1083+
} else if (read_select > 0) {
1084+
if (esp_websocket_client_recv(client) == ESP_FAIL) {
1085+
ESP_LOGE(TAG, "Error receive data");
1086+
xSemaphoreTakeRecursive(client->lock, lock_timeout);
1087+
esp_websocket_client_abort_connection(client, WEBSOCKET_ERROR_TYPE_TCP_TRANSPORT);
1088+
xSemaphoreGiveRecursive(client->lock);
1089+
}
10891090
}
10901091
} else if (WEBSOCKET_STATE_WAIT_TIMEOUT == client->state) {
10911092
// waiting for reconnecting...

0 commit comments

Comments
 (0)