Automatically cork WebSocket::send

yongju-hong · Dec 28, 2019 · 563e95b · 563e95b
1 parent f4bb87a
commit 563e95b
Showing 1 changed file with 27 additions and 9 deletions.
diff --git a/src/WebSocket.h b/src/WebSocket.h
@@ -55,12 +55,6 @@ struct WebSocket : AsyncSocket<SSL> {
 
     /* Send or buffer a WebSocket frame, compressed or not. Returns false on increased user space backpressure. */
     bool send(std::string_view message, uWS::OpCode opCode = uWS::OpCode::BINARY, bool compress = false) {
-        /* Every send resets the timeout */
-        WebSocketContextData<SSL> *webSocketContextData = (WebSocketContextData<SSL> *) us_socket_context_ext(SSL,
-            (us_socket_context_t *) us_socket_context(SSL, (us_socket_t *) this)
-        );
-        AsyncSocket<SSL>::timeout(webSocketContextData->idleTimeout);
-
         /* Transform the message to compressed domain if requested */
         if (compress) {
             WebSocketData *webSocketData = (WebSocketData *) Super::getAsyncSocketData();
@@ -79,20 +73,44 @@ struct WebSocket : AsyncSocket<SSL> {
             }
         }
 
+        /* Check to see if we can cork for the user */
+        bool automaticallyCorked = false;
+        if (!Super::isCorked() && Super::canCork()) {
+            automaticallyCorked = true;
+            Super::cork();
+        }
+
         /* Get size, alloate size, write if needed */
         size_t messageFrameSize = protocol::messageFrameSize(message.length());
         auto[sendBuffer, requiresWrite] = Super::getSendBuffer(messageFrameSize);
         protocol::formatMessage<isServer>(sendBuffer, message.data(), message.length(), opCode, message.length(), compress);
+        /* This is the slow path, when we couldn't cork for the user */
         if (requiresWrite) {
             auto[written, failed] = Super::write(sendBuffer, (int) messageFrameSize);
 
-            /* For now, we are slow here (fix!) */
+            /* For now, we are slow here */
             free(sendBuffer);
 
-            /* Return true for success */
-            return !failed;
+            if (failed) {
+                /* Return false for failure, skipping to reset the timeout below */
+                return false;
+            }
         }
 
+        /* Uncork here if we automatically corked for the user */
+        if (automaticallyCorked) {
+            auto [written, failed] = Super::uncork();
+            if (failed) {
+                return false;
+            }
+        }
+
+        /* Every successful send resets the timeout */
+        WebSocketContextData<SSL> *webSocketContextData = (WebSocketContextData<SSL> *) us_socket_context_ext(SSL,
+            (us_socket_context_t *) us_socket_context(SSL, (us_socket_t *) this)
+        );
+        AsyncSocket<SSL>::timeout(webSocketContextData->idleTimeout);
+
         /* Return success */
         return true;
     }