Changeset 04b73b6 for benchmark/io/http/worker.cfa

Timestamp:

Jul 23, 2020, 3:37:05 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:

f4ec4a90

Parents:

f0c3120 (diff), e262b5e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• benchmark/io/http/worker.cfa (modified) (5 diffs)

benchmark/io/http/worker.cfa

@@ -12 +12 @@
 #include "filecache.hfa"
 
-extern "C" {
-// extern ssize_t sendfile(int out_fd, int in_fd, off_t *offset, size_t count);
-extern ssize_t splice(int fd_in, loff_t *off_in, int fd_out, loff_t *off_out, size_t len, unsigned int flags);
-}
-
-ssize_t sendfile(int out_fd, int in_fd, off_t *offset, size_t count) {
-        return splice(in_fd, offset, out_fd, 0p, count, 0);
-}
-
-
 //=============================================================================================
 // Worker Thread
 //=============================================================================================
 void ?{}( Worker & this ) {
-        ((thread&)this){ "Server Worker Thread", *options.the_cluster };
-        int ret = pipe(this.pipe);
-        if( ret < 0 ) { abort( "pipe error: (%d) %s\n", (int)errno, strerror(errno) ); }
+        ((thread&)this){ "Server Worker Thread", *options.clopts.instance };
+        this.pipe[0] = -1;
+        this.pipe[1] = -1;
 }
 
 void main( Worker & this ) {
+        park( __cfaabi_dbg_ctx );
+        /* paranoid */ assert( this.pipe[0] != -1 );
+        /* paranoid */ assert( this.pipe[1] != -1 );
+
         CONNECTION:
-        while( int fd = take(wait_connect); fd >= 0) {
-            printf("New connection, waiting for requests\n");
+        for() {
+                int fd = take(wait_connect);
+                if (fd < 0) break;
+
+                printf("New connection %d, waiting for requests\n", fd);
                 REQUEST:
                 for() {
@@ -43 +40 @@
 
                         // Read the http request
-                        size_t len = 1024;
+                        size_t len = options.socket.buflen;
                         char buffer[len];
                         printf("Reading request\n");
@@ -56 +53 @@
                         // If this wasn't a request retrun 400
                         if( code != OK200 ) {
-                                printf("Invalid Request\n");
+                                printf("Invalid Request : %d\n", code_val(code));
                                 answer_error(fd, code);
                                 continue REQUEST;
                         }
 
-                        printf("Request for file %.*s\n", name_size, file);
+                        printf("Request for file %.*s\n", (int)name_size, file);
 
                         // Get the fd from the file cache
@@ -90 +87 @@
 //=============================================================================================
 void ?{}( Acceptor & this, int sockfd, struct sockaddr * addr, socklen_t * addrlen, int flags ) {
-        ((thread&)this){ "Acceptor Thread", *options.the_cluster };
+        ((thread&)this){ "Acceptor Thread", *options.clopts.instance };
         this.sockfd  = sockfd;
         this.addr    = addr;
@@ -105 +102 @@
                 }
 
-            printf("New connection accepted\n");
+                printf("New connection accepted\n");
                 put( wait_connect, ret );
-      }
+        }
 }