Workaround FreeBSD's sendfile not reading data from the disk. bertha#5

Signed-off-by: Jille Timmermans <[email protected]>
Jille · Apr 27, 2012 · 71e393c · 71e393c · bwesterb · May 12, 2012
1 parent 6a37435
commit 71e393c
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/berthad-vfs.c b/berthad-vfs.c
@@ -1019,8 +1019,11 @@ static inline void conn_get_handle__sendfile(BProgram* prog, GList* lhconn)
                         /* Socket buffers are full */
                         data->socket_ready = FALSE;
                 } else if(errno == EBUSY) {
+			char cbuf;
                         /* File buffers are depleted */
                         data->file_ready = FALSE;
+                        /* Trigger the kernel to read from the disk */
+                        res = read(data->fd, &cbuf, 1);
                 } else {
                         perror("sendfile");
                         g_error("Sendfile failed?!\n");
@@ -1035,7 +1038,9 @@ static inline void conn_get_handle__sendfile(BProgram* prog, GList* lhconn)
                 /* We're done! */
                 shutdown(conn->sock, SHUT_RDWR);
                 conn_close(prog, lhconn);
+                return;
         }
+        lseek(data->fd, data->n_sent, SEEK_SET);
 }
 #endif /* USE_SENDFILE */