Fixed sendfile file descriptor leak.

Author: matyhtf

examples/event/stdin.php

@@ -0,0 +1,4 @@
+<?php
+swoole_event_add(STDIN, function($fp) {
+	echo "STDIN: ".fread($fp, 8192);
+});

include/Connection.h

@@ -38,6 +38,7 @@ swBuffer_trunk* swConnection_get_out_buffer(swConnection *conn, uint32_t type);
 swBuffer_trunk* swConnection_get_in_buffer(swConnection *conn);
 int swConnection_sendfile(swConnection *conn, char *filename);
 int swConnection_onSendfile(swConnection *conn, swBuffer_trunk *chunk);
+void swConnection_sendfile_destructor(swBuffer_trunk *chunk);
 char* swConnection_get_ip(swConnection *conn);
 int swConnection_get_port(swConnection *conn);
 

include/buffer.h

@@ -31,30 +31,31 @@ enum swBufferChunk
 
 typedef struct _swBuffer_trunk
 {
-	uint32_t type;
-	uint32_t length;
-	uint32_t offset;
-	union
-	{
-		void *ptr;
-		struct
-		{
-			uint32_t val1;
-			uint32_t val2;
-		} data;
-	} store;
-	uint32_t size;
-	struct _swBuffer_trunk *next;
+    uint32_t type;
+    uint32_t length;
+    uint32_t offset;
+    union
+    {
+        void *ptr;
+        struct
+        {
+            uint32_t val1;
+            uint32_t val2;
+        } data;
+    } store;
+    uint32_t size;
+    void (*destroy)(struct _swBuffer_trunk *chunk);
+    struct _swBuffer_trunk *next;
 } swBuffer_trunk;
 
 typedef struct _swBuffer
 {
-	int fd;
-	uint8_t trunk_num; //trunk数量
-	uint16_t trunk_size;
-	uint32_t length;
-	swBuffer_trunk *head;
-	swBuffer_trunk *tail;
+    int fd;
+    uint8_t trunk_num; //trunk数量
+    uint16_t trunk_size;
+    uint32_t length;
+    swBuffer_trunk *head;
+    swBuffer_trunk *tail;
 } swBuffer;
 
 #define swBuffer_get_trunk(buffer)   (buffer->head)

src/core/socket.c

@@ -44,6 +44,7 @@ int swSocket_sendfile_sync(int sock, char *filename, double timeout)
     {
         if (swSocket_wait(sock, timeout_ms, SW_EVENT_WRITE) < 0)
         {
+            close(file_fd);
             return SW_ERR;
         }
         else
@@ -52,7 +53,8 @@ int swSocket_sendfile_sync(int sock, char *filename, double timeout)
             n = swoole_sendfile(sock, file_fd, &offset, sendn);
             if (n <= 0)
             {
-                swWarn("sendfile() failed. Error: %s[%d]", strerror(errno), errno);
+                close(file_fd);
+                swSysError("sendfile(%d, %s) failed.", sock, filename);
                 return SW_ERR;
             }
             else
@@ -61,6 +63,7 @@ int swSocket_sendfile_sync(int sock, char *filename, double timeout)
             }
         }
     }
+    close(file_fd);
     return SW_OK;
 }
 

src/memory/Buffer.c

@@ -82,10 +82,9 @@ swBuffer_trunk *swBuffer_new_trunk(swBuffer *buffer, uint32_t type, uint32_t siz
 /**
  * pop the head chunk
  */
-void swBuffer_pop_trunk(swBuffer *buffer, swBuffer_trunk *trunk)
+void swBuffer_pop_trunk(swBuffer *buffer, swBuffer_trunk *chunk)
 {
-    //only one trunk
-    if (trunk->next == NULL)
+    if (chunk->next == NULL)
     {
         buffer->head = NULL;
         buffer->tail = NULL;
@@ -94,16 +93,19 @@ void swBuffer_pop_trunk(swBuffer *buffer, swBuffer_trunk *trunk)
     }
     else
     {
-        buffer->head = trunk->next;
-        buffer->length -= trunk->length;
+        buffer->head = chunk->next;
+        buffer->length -= chunk->length;
         buffer->trunk_num--;
     }
-
-    if (trunk->type == SW_CHUNK_DATA)
+    if (chunk->type == SW_CHUNK_DATA)
+    {
+        sw_free(chunk->store.ptr);
+    }
+    if (chunk->destroy)
     {
-        sw_free(trunk->store.ptr);
+        chunk->destroy(chunk);
     }
-    sw_free(trunk);
+    sw_free(chunk);
 }
 
 /**

src/network/Connection.c

@@ -81,8 +81,6 @@ int swConnection_onSendfile(swConnection *conn, swBuffer_trunk *chunk)
     if (task->offset >= task->filesize)
     {
         swBuffer_pop_trunk(conn->out_buffer, chunk);
-        close(task->fd);
-        sw_free(task);
 
 #ifdef HAVE_TCP_NOPUSH
         if (conn->tcp_nopush)
@@ -210,6 +208,14 @@ int swConnection_get_port(swConnection *conn)
     }
 }
 
+void swConnection_sendfile_destructor(swBuffer_trunk *chunk)
+{
+    swTask_sendfile *task = chunk->store.ptr;
+    close(task->fd);
+    sw_free(task->filename);
+    sw_free(task);
+}
+
 int swConnection_sendfile(swConnection *conn, char *filename)
 {
     if (conn->out_buffer == NULL)
@@ -221,6 +227,7 @@ int swConnection_sendfile(swConnection *conn, char *filename)
         }
     }
 
+    swBuffer_trunk error_chunk;
     swTask_sendfile *task = sw_malloc(sizeof(swTask_sendfile));
     if (task == NULL)
     {
@@ -238,28 +245,29 @@ int swConnection_sendfile(swConnection *conn, char *filename)
         swSysError("open(%s) failed.", task->filename);
         return SW_ERR;
     }
+    task->fd = file_fd;
 
     struct stat file_stat;
     if (fstat(file_fd, &file_stat) < 0)
     {
-        free(task->filename);
-        free(task);
         swSysError("fstat(%s) failed.", filename);
+        error_chunk.store.ptr = task;
+        swConnection_sendfile_destructor(&error_chunk);
         return SW_ERR;
     }
+    task->filesize = file_stat.st_size;
 
-    swBuffer_trunk *trunk = swBuffer_new_trunk(conn->out_buffer, SW_CHUNK_SENDFILE, 0);
-    if (trunk == NULL)
+    swBuffer_trunk *chunk = swBuffer_new_trunk(conn->out_buffer, SW_CHUNK_SENDFILE, 0);
+    if (chunk == NULL)
     {
-        free(task->filename);
-        free(task);
         swWarn("get out_buffer trunk failed.");
+        error_chunk.store.ptr = task;
+        swConnection_sendfile_destructor(&error_chunk);
         return SW_ERR;
     }
 
-    task->filesize = file_stat.st_size;
-    task->fd = file_fd;
-    trunk->store.ptr = (void *) task;
+    chunk->store.ptr = (void *) task;
+    chunk->destroy = swConnection_sendfile_destructor;
 
     return SW_OK;
 }