talksik/uWebSockets
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Always emit drain event in case of having no backpressure

Browse Source
This commit is contained in:
Alex Hultman
2020-05-07 08:10:57 +02:00
committed by GitHub
parent c1a969cedd
commit 11aafd32f5
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/WebSocketContext.h
+5 -3
View File
@@ -310,14 +310,16 @@ private:
AsyncSocket<SSL> *asyncSocket = (AsyncSocket<SSL> *) s; AsyncSocket<SSL> *asyncSocket = (AsyncSocket<SSL> *) s;
WebSocketData *webSocketData = (WebSocketData *)(us_socket_ext(SSL, s)); WebSocketData *webSocketData = (WebSocketData *)(us_socket_ext(SSL, s));
/* We store old backpressure since it is unclear whether write drained anything */ /* We store old backpressure since it is unclear whether write drained anything,
* however, in case of coming here with 0 backpressure we still need to emit drain event */
int backpressure = asyncSocket->getBufferedAmount(); int backpressure = asyncSocket->getBufferedAmount();
/* Drain as much as possible */ /* Drain as much as possible */
asyncSocket->write(nullptr, 0); asyncSocket->write(nullptr, 0);
/* Behavior: if we actively drain backpressure, always reset timeout (even if we are in shutdown) */ /* Behavior: if we actively drain backpressure, always reset timeout (even if we are in shutdown) */
if (backpressure < asyncSocket->getBufferedAmount()) { /* Also emit drain event if we came here with 0 backpressure */
if (!backpressure || backpressure < asyncSocket->getBufferedAmount()) {
auto *webSocketContextData = (WebSocketContextData<SSL> *) us_socket_context_ext(SSL, us_socket_context(SSL, (us_socket_t *) s)); auto *webSocketContextData = (WebSocketContextData<SSL> *) us_socket_context_ext(SSL, us_socket_context(SSL, (us_socket_t *) s));
asyncSocket->timeout(webSocketContextData->idleTimeout); asyncSocket->timeout(webSocketContextData->idleTimeout);
} }
@@ -329,7 +331,7 @@ private:
/* Now perform the actual TCP/TLS shutdown which was postponed due to backpressure */ /* Now perform the actual TCP/TLS shutdown which was postponed due to backpressure */
asyncSocket->shutdown(); asyncSocket->shutdown();
} }
} else if (backpressure > asyncSocket->getBufferedAmount()) { } else if (!backpressure || backpressure > asyncSocket->getBufferedAmount()) {
/* Only call drain if we actually drained backpressure */ /* Only call drain if we actually drained backpressure */
auto *webSocketContextData = (WebSocketContextData<SSL> *) us_socket_context_ext(SSL, us_socket_context(SSL, (us_socket_t *) s)); auto *webSocketContextData = (WebSocketContextData<SSL> *) us_socket_context_ext(SSL, us_socket_context(SSL, (us_socket_t *) s));
if (webSocketContextData->drainHandler) { if (webSocketContextData->drainHandler) {