Changes in benchmark/io/http/worker.cfa [8c43d05:ee59ede]

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>
 
@@ -34 +33 @@
         CONNECTION:
         for() {
-                if( options.log ) sout | "=== Accepting connection ===";
+                if( options.log ) printf("=== Accepting connection ===\n");
                 int fd = cfa_accept4( this.[sockfd, addr, addrlen, flags], 0, -1`s, &this.cancel, 0p );
                 // int fd = accept4( this.[sockfd, addr, addrlen, flags] );
@@ -43 +42 @@
                 }
 
-                if( options.log ) sout | "=== New connection" | fd | "" | ", waiting for requests ===";
+                if( options.log ) printf("=== New connection %d, waiting for requests ===\n", fd);
                 REQUEST:
                 for() {
@@ -54 +53 @@
                         size_t len = options.socket.buflen;
                         char buffer[len];
-                        if( options.log ) sout | "=== Reading request ===";
+                        if( options.log ) printf("=== Reading request ===\n");
                         [code, closed, file, name_size] = http_read(fd, buffer, len, &this.cancel);
 
@@ -62 +61 @@
                         // If this wasn't a request retrun 400
                         if( code != OK200 ) {
-                                sout | "=== Invalid Request :" | code_val(code) | "===";
+                                printf("=== Invalid Request : %d ===\n", code_val(code));
                                 answer_error(fd, code);
                                 continue REQUEST;
@@ -68 +67 @@
 
                         if(0 == strncmp(file, "plaintext", min(name_size, sizeof("plaintext") ))) {
-                                if( options.log ) sout | "=== Request for /plaintext ===";
+                                if( options.log ) printf("=== Request for /plaintext ===\n");
 
                                 char text[] = "Hello, World!\n";
@@ -76 +75 @@
                                 if( ret == -ECONNRESET ) break REQUEST;
 
-                                if( options.log ) sout | "=== Answer sent ===";
+                                if( options.log ) printf("=== Answer sent ===\n");
                                 continue REQUEST;
                         }
 
                         if(0 == strncmp(file, "ping", min(name_size, sizeof("ping") ))) {
-                                if( options.log ) sout | "=== Request for /ping ===";
+                                if( options.log ) printf("=== Request for /ping ===\n");
 
                                 // Send the header
@@ -87 +86 @@
                                 if( ret == -ECONNRESET ) break REQUEST;
 
-                                if( options.log ) sout | "=== Answer sent ===";
+                                if( options.log ) printf("=== Answer sent ===\n");
                                 continue REQUEST;
                         }
 
-                        if( options.log ) {
-                                sout | "=== Request for file " | nonl;
-                                write(sout, file, name_size);
-                                sout | " ===";
-                        }
+                        if( options.log ) printf("=== Request for file %.*s ===\n", (int)name_size, file);
 
                         // Get the fd from the file cache
@@ -104 +99 @@
                         // If we can't find the file, return 404
                         if( ans_fd < 0 ) {
-                                sout | "=== File Not Found (" | nonl;
-                                write(sout, file, name_size);
-                                sout | ") ===";
+                                printf("=== File Not Found ===\n");
                                 answer_error(fd, E404);
                                 continue REQUEST;
@@ -119 +112 @@
                         if( ret == -ECONNRESET ) break REQUEST;
 
-                        if( options.log ) sout | "=== Answer sent ===";
+                        if( options.log ) printf("=== Answer sent ===\n");
                 }
 
-                if( options.log ) sout | "=== Connection closed ===";
+                if( options.log ) printf("=== Connection closed ===\n");
                 close(fd);
                 continue CONNECTION;