Changeset ece0e80 for benchmark/io/http/worker.cfa

Timestamp:

Jan 9, 2021, 4:27:57 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

561dd26

Parents:

35fd2c4

Message:

Added prints.
Naive implementation of cancel.
Server now shutdown cleanly.

File:

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

benchmark/io/http/worker.cfa

@@ -28 +28 @@
         CONNECTION:
         for() {
-                int fd = cfa_accept4( this.[sockfd, addr, addrlen, flags], 0, -1`s, 0p, 0p );
+                printf("=== Accepting connection ===\n");
+                int fd = cfa_accept4( this.[sockfd, addr, addrlen, flags], 0, -1`s, &this.cancel, 0p );
                 if(fd < 0) {
                         if( errno == ECONNABORTED ) break;
+                        if( errno == EINVAL ) break;
                         abort( "accept error: (%d) %s\n", (int)errno, strerror(errno) );
                 }
 
-                printf("New connection %d, waiting for requests\n", fd);
+                printf("=== New connection %d, waiting for requests ===\n", fd);
                 REQUEST:
                 for() {
@@ -45 +47 @@
                         size_t len = options.socket.buflen;
                         char buffer[len];
-                        printf("Reading request\n");
-                        [code, closed, file, name_size] = http_read(fd, buffer, len);
+                        printf("=== Reading request ===\n");
+                        [code, closed, file, name_size] = http_read(fd, buffer, len, &this.cancel);
 
                         // if we are done, break out of the loop
                         if( closed ) {
-                                printf("Connection closed\n");
+                                printf("=== Connection closed ===\n");
                                 continue CONNECTION;
                         }
@@ -56 +58 @@
                         // If this wasn't a request retrun 400
                         if( code != OK200 ) {
-                                printf("Invalid Request : %d\n", code_val(code));
+                                printf("=== Invalid Request : %d ===\n", code_val(code));
                                 answer_error(fd, code);
                                 continue REQUEST;
                         }
 
-                        printf("Request for file %.*s\n", (int)name_size, file);
+                        printf("=== Request for file %.*s ===\n", (int)name_size, file);
 
                         // Get the fd from the file cache
@@ -70 +72 @@
                         // If we can't find the file, return 404
                         if( ans_fd < 0 ) {
-                                printf("File Not Found\n");
+                                printf("=== File Not Found ===\n");
                                 answer_error(fd, E404);
                                 continue REQUEST;
@@ -81 +83 @@
                         sendfile( this.pipe, fd, ans_fd, count);
 
-                        printf("File sent\n");
+                        printf("=== File sent ===\n");
                 }
         }