Improved sendfile by not setting the tcp_cork option when the file is smaller than 64k.

Author: matyhtf

include/swoole_config.h

@@ -53,6 +53,7 @@
 #define SW_SOCKET_DEFAULT_CONNECT_TIMEOUT 2
 #define SW_SOCKET_DEFAULT_READ_TIMEOUT 60
 #define SW_SOCKET_DEFAULT_WRITE_TIMEOUT 60
+#define SW_SOCKET_CORK_MIN_SIZE 65536
 
 #define SW_SYSTEMD_FDS_START 3
 

include/swoole_socket.h

@@ -72,13 +72,15 @@ struct SendfileTask {
 
 struct SendfileRequest {
     File file;
+    int8_t corked;
     off_t begin;
     off_t end;
 
   public:
     SendfileRequest(const char *filename, off_t _offset) : file(filename, O_RDONLY) {
         begin = _offset;
         end = 0;
+        corked = 0;
     }
 };
 

src/network/socket.cc

@@ -131,6 +131,11 @@ int Socket::sendfile_sync(const char *filename, off_t offset, size_t length, dou
         return SW_ERR;
     }
 
+    auto corked = false;
+    if (end - offset > SW_SOCKET_CORK_MIN_SIZE) {
+        corked = cork();
+    }
+
     ssize_t n, sent_bytes;
     while (offset < end) {
         sent_bytes = get_sendfile_chunk_size(offset, end);
@@ -149,6 +154,10 @@ int Socket::sendfile_sync(const char *filename, off_t offset, size_t length, dou
         }
     }
 
+    if (corked) {
+        uncork();
+    }
+
     return SW_OK;
 }
 
@@ -636,8 +645,12 @@ int Socket::handle_sendfile() {
     BufferChunk *chunk = buffer->front();
     SendfileRequest *task = (SendfileRequest *) chunk->value.ptr;
 
-    if (task->begin == 0) {
-        cork();
+    if (task->corked == 0) {
+        if (task->end - task->begin > SW_SOCKET_CORK_MIN_SIZE) {
+            task->corked = cork() ? 1 : -1;
+        } else {
+            task->corked = -1;
+        }
     }
 
     size_t sendn = get_sendfile_chunk_size(task->begin, task->end);
@@ -679,7 +692,10 @@ int Socket::handle_sendfile() {
     // sendfile completed
     if (task->begin == task->end) {
         buffer->pop();
-        uncork();
+        if (task->corked == 1) {
+            uncork();
+            task->corked = 0;
+        }
     }
 
     return SW_OK;