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

Timestamp:

Jan 25, 2021, 3:45:42 PM (5 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:

c292244

Parents:

b6a8b31 (diff), 7158202 (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) (6 diffs)

benchmark/io/http/worker.cfa

@@ -6 +6 @@
 #include <unistd.h>
 
+#include <fstream.hfa>
 #include <iofwd.hfa>
 
@@ -33 +34 @@
         CONNECTION:
         for() {
-                if( options.log ) printf("=== Accepting connection ===\n");
+                if( options.log ) sout | "=== Accepting connection ===";
                 int fd = cfa_accept4( this.[sockfd, addr, addrlen, flags], 0, -1`s, &this.cancel, 0p );
                 // int fd = accept4( this.[sockfd, addr, addrlen, flags] );
                 if(fd < 0) {
                         if( errno == ECONNABORTED ) break;
-                        if( errno == EINVAL && this.done ) break;
+                        if( this.done && (errno == EINVAL || errno == EBADF) ) break;
                         abort( "accept error: (%d) %s\n", (int)errno, strerror(errno) );
                 }
 
-                if( options.log ) printf("=== New connection %d, waiting for requests ===\n", fd);
+                if( options.log ) sout | "=== New connection" | fd | "" | ", waiting for requests ===";
                 REQUEST:
                 for() {
@@ -53 +54 @@
                         size_t len = options.socket.buflen;
                         char buffer[len];
-                        if( options.log ) printf("=== Reading request ===\n");
+                        if( options.log ) sout | "=== Reading request ===";
                         [code, closed, file, name_size] = http_read(fd, buffer, len, &this.cancel);
 
                         // if we are done, break out of the loop
-                        if( closed ) {
-                                if( options.log ) printf("=== Connection closed ===\n");
-                                close(fd);
-                                continue CONNECTION;
-                        }
+                        if( closed ) break REQUEST;
 
                         // If this wasn't a request retrun 400
                         if( code != OK200 ) {
-                                printf("=== Invalid Request : %d ===\n", code_val(code));
+                                sout | "=== Invalid Request :" | code_val(code) | "===";
                                 answer_error(fd, code);
                                 continue REQUEST;
@@ -71 +68 @@
 
                         if(0 == strncmp(file, "plaintext", min(name_size, sizeof("plaintext") ))) {
-                                if( options.log ) printf("=== Request for /plaintext ===\n");
+                                if( options.log ) sout | "=== Request for /plaintext ===";
 
                                 char text[] = "Hello, World!\n";
 
                                 // Send the header
-                                answer_plain(fd, text, sizeof(text));
+                                int ret = answer_plain(fd, text, sizeof(text));
+                                if( ret == -ECONNRESET ) break REQUEST;
 
-                                if( options.log ) printf("=== Answer sent ===\n");
+                                if( options.log ) sout | "=== Answer sent ===";
                                 continue REQUEST;
                         }
 
                         if(0 == strncmp(file, "ping", min(name_size, sizeof("ping") ))) {
-                                if( options.log ) printf("=== Request for /ping ===\n");
+                                if( options.log ) sout | "=== Request for /ping ===";
 
                                 // Send the header
-                                answer_empty(fd);
+                                int ret = answer_empty(fd);
+                                if( ret == -ECONNRESET ) break REQUEST;
 
-                                if( options.log ) printf("=== Answer sent ===\n");
+                                if( options.log ) sout | "=== Answer sent ===";
                                 continue REQUEST;
                         }
 
-                        if( options.log ) printf("=== Request for file %.*s ===\n", (int)name_size, file);
+                        if( options.log ) {
+                                sout | "=== Request for file " | nonl;
+                                write(sout, file, name_size);
+                                sout | " ===";
+                        }
+
+                        if( !options.file_cache.path ) {
+                                if( options.log ) {
+                                        sout | "=== File Not Found (" | nonl;
+                                        write(sout, file, name_size);
+                                        sout | ") ===";
+                                }
+                                answer_error(fd, E405);
+                                continue REQUEST;
+                        }
 
                         // Get the fd from the file cache
@@ -101 +114 @@
                         // If we can't find the file, return 404
                         if( ans_fd < 0 ) {
-                                printf("=== File Not Found ===\n");
+                                if( options.log ) {
+                                        sout | "=== File Not Found (" | nonl;
+                                        write(sout, file, name_size);
+                                        sout | ") ===";
+                                }
                                 answer_error(fd, E404);
                                 continue REQUEST;
@@ -107 +124 @@
 
                         // Send the header
-                        answer_header(fd, count);
+                        int ret = answer_header(fd, count);
+                        if( ret == -ECONNRESET ) break REQUEST;
 
                         // Send the desired file
-                        sendfile( this.pipe, fd, ans_fd, count);
+                        ret = sendfile( this.pipe, fd, ans_fd, count);
+                        if( ret == -ECONNRESET ) break REQUEST;
 
-                        if( options.log ) printf("=== Answer sent ===\n");
+                        if( options.log ) sout | "=== Answer sent ===";
                 }
+
+                if( options.log ) sout | "=== Connection closed ===";
+                close(fd);
+                continue CONNECTION;
         }
 }