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

Timestamp:

Jan 15, 2021, 3:01:31 PM (4 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

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

Children:

77ff383

Parents:

2d63023 (diff), b7664a0 (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) (10 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] );
@@ -42 +43 @@
                 }
 
-                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);
 
@@ -61 +62 @@
                         // 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;
@@ -67 +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";
@@ -75 +76 @@
                                 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
@@ -86 +87 @@
                                 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 | " ===";
+                        }
 
                         // Get the fd from the file cache
@@ -99 +104 @@
                         // If we can't find the file, return 404
                         if( ans_fd < 0 ) {
-                                printf("=== File Not Found ===\n");
+                                sout | "=== File Not Found (" | nonl;
+                                write(sout, file, name_size);
+                                sout | ") ===";
                                 answer_error(fd, E404);
                                 continue REQUEST;
@@ -112 +119 @@
                         if( ret == -ECONNRESET ) break REQUEST;
 
-                        if( options.log ) printf("=== Answer sent ===\n");
+                        if( options.log ) sout | "=== Answer sent ===";
                 }
 
-                if( options.log ) printf("=== Connection closed ===\n");
+                if( options.log ) sout | "=== Connection closed ===";
                 close(fd);
                 continue CONNECTION;