Changeset c82af9f for benchmark/io

Timestamp:

Jul 16, 2020, 3:22:01 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

5db836e

Parents:

463cb33

Message:

Moved sendfile to protocol.cfa to reduce compilation time

Location:

benchmark/io/http

Files:

• protocol.cfa (modified) (2 diffs)
• protocol.hfa (modified) (1 diff)
• worker.cfa (modified) (3 diffs)

benchmark/io/http/protocol.cfa

@@ -1 +1 @@
 #include "protocol.hfa"
 
+#define _GNU_SOURCE
+extern "C" {
+        #include <fcntl.h>
+}
 #include <iofwd.hfa>
 
@@ -83 +87 @@
         return [OK200, false, it, end - it];
 }
+
+void sendfile( int pipe[2], int fd, int ans_fd, size_t count ) {
+        off_t offset = 0;
+        ssize_t ret;
+        SPLICE1: while(count > 0) {
+                ret = cfa_splice(ans_fd, &offset, pipe[1], 0p, count, SPLICE_F_MOVE | SPLICE_F_MORE);
+                if( ret < 0 ) {
+                        if( errno != EAGAIN && errno != EWOULDBLOCK) continue SPLICE1;
+                        abort( "splice [0] error: (%d) %s\n", (int)errno, strerror(errno) );
+                }
+
+                count -= ret;
+                offset += ret;
+                size_t in_pipe = ret;
+                SPLICE2: while(in_pipe > 0) {
+                        ret = cfa_splice(pipe[0], 0p, fd, 0p, in_pipe, SPLICE_F_MOVE | SPLICE_F_MORE);
+                        if( ret < 0 ) {
+                                if( errno != EAGAIN && errno != EWOULDBLOCK) continue SPLICE2;
+                                abort( "splice [1] error: (%d) %s\n", (int)errno, strerror(errno) );
+                        }
+                        in_pipe -= ret;
+                }
+
+        }
+}

benchmark/io/http/protocol.hfa

@@ -14 +14 @@
 
 [HttpCode code, bool closed, * const char file, size_t len] http_read(int fd, []char buffer, size_t len);
+
+void sendfile( int pipe[2], int fd, int ans_fd, size_t count );

benchmark/io/http/worker.cfa

@@ -1 +1 @@
 #include "worker.hfa"
-
-#define __USE_GNU
 
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-extern "C" {
-        #include <fcntl.h>
-        #include <sys/socket.h>
-        #include <sys/types.h>
-        #include <netinet/in.h>
-}
+#include <unistd.h>
 
 #include <iofwd.hfa>
@@ -32 +25 @@
 // Worker Thread
 //=============================================================================================
-void sendfile( Worker & this, int fd, int ans_fd, size_t count ) {
-        off_t offset = 0;
-        ssize_t ret;
-        SPLICE1: while(count > 0) {
-                ret = cfa_splice(ans_fd, &offset, this.pipe[1], 0p, count, SPLICE_F_MOVE | SPLICE_F_MORE);
-                if( ret < 0 ) {
-                        if( errno != EAGAIN && errno != EWOULDBLOCK) continue SPLICE1;
-                        abort( "splice [0] error: (%d) %s\n", (int)errno, strerror(errno) );
-                }
-
-                count -= ret;
-                offset += ret;
-                size_t in_pipe = ret;
-                SPLICE2: while(in_pipe > 0) {
-                        ret = cfa_splice(this.pipe[0], 0p, fd, 0p, in_pipe, SPLICE_F_MOVE | SPLICE_F_MORE);
-                        if( ret < 0 ) {
-                                if( errno != EAGAIN && errno != EWOULDBLOCK) continue SPLICE2;
-                                abort( "splice [1] error: (%d) %s\n", (int)errno, strerror(errno) );
-                        }
-                        in_pipe -= ret;
-                }
-
-        }
-}
-
 void ?{}( Worker & this ) {
         ((thread&)this){ "Server Worker Thread", *options.the_cluster };
@@ -111 +79 @@
 
                         // Send the desired file
-                        sendfile( this, fd, ans_fd, count);
+                        sendfile( this.pipe, fd, ans_fd, count);
 
                         printf("File sent\n");