Changeset 8c43d05

Timestamp:

Jan 15, 2021, 2:26:35 PM (4 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:

b7664a03

Parents:

804c0ff

Message:

httpforall now uses sout rather than printf

Location:

benchmark/io/http

Files:

• filecache.cfa (modified) (3 diffs)
• main.cfa (modified) (8 diffs)
• protocol.cfa (modified) (3 diffs)
• worker.cfa (modified) (10 diffs)

benchmark/io/http/filecache.cfa

@@ -4 +4 @@
 #include <string.h>
 
+#include <fstream.hfa>
 #include <stdlib.hfa>
 
@@ -182 +183 @@
                 conflicts += put_file( raw[i], fd );
         }
-        printf("Filled cache from path \"%s\" with %zu files\n", path, fcount);
+        sout | "Filled cache from path \"" | path | "\" with" | fcount | "files";
         if( conflicts > 0 ) {
-                printf("Found %d conflicts (seed: %u)\n", conflicts, options.file_cache.hash_seed);
+                sout | "Found" | conflicts | "conflicts (seed: " | options.file_cache.hash_seed | ")";
                 #if defined(REJECT_CONFLICTS)
                         abort("Conflicts found in the cache");
@@ -191 +192 @@
 
         if(options.file_cache.list) {
-                printf("Listing files and exiting\n");
+                sout | "Listing files and exiting";
                 for(i; fcount) {
                         int s; char u;
                         [s, u] = human_size(raw[i].size);
-                        printf("%4d%c - %s\n", s, u, raw[i].file);
+                        sout | s | u | "-" | raw[i].file;
                         free(raw[i].file);
                 }

benchmark/io/http/main.cfa

@@ -10 +10 @@
 }
 
+#include <fstream.hfa>
 #include <kernel.hfa>
 #include <iofwd.hfa>
@@ -83 +84 @@
         //===================
         // Open Files
-        printf("Filling cache from %s\n", path);
+        sout | "Filling cache from" | path;
         fill_cache( path );
 
         //===================
         // Open Socket
-        printf("%ld : Listening on port %d\n", getpid(), options.socket.port);
+        sout | getpid() | ": Listening on port" | options.socket.port;
         int server_fd = socket(AF_INET, SOCK_STREAM, 0);
         if(server_fd < 0) {
@@ -108 +109 @@
                         if(errno == EADDRINUSE) {
                                 if(waited == 0) {
-                                        printf("Waiting for port\n");
+                                        sout | "Waiting for port";
                                 } else {
-                                        printf("\r%d", waited);
-                                        fflush(stdout);
+                                        sout | "\r" | waited | nonl;
+                                        flush( sout );
                                 }
                                 waited ++;
@@ -173 +174 @@
                                         unpark( workers[i] );
                                 }
-                                printf("%d workers started on %d processors\n", options.clopts.nworkers, options.clopts.nprocs);
+                                sout | options.clopts.nworkers | "workers started on" | options.clopts.nprocs | "processors";
                                 {
                                         char buffer[128];
@@ -180 +181 @@
                                         }
 
-                                        printf("Shutting Down\n");
-                                }
-
+                                        sout | "Shutdown received";
+                                }
+
+                                sout | "Notifying connections";
                                 for(i; options.clopts.nworkers) {
                                         workers[i].done = true;
@@ -188 +190 @@
                                 }
 
-                                printf("Shutting down socket\n");
+                                sout | "Shutting down socket";
                                 int ret = shutdown( server_fd, SHUT_RD );
                                 if( ret < 0 ) { abort( "shutdown error: (%d) %s\n", (int)errno, strerror(errno) ); }
@@ -194 +196 @@
                                 //===================
                                 // Close Socket
-                                printf("Closing Socket\n");
+                                sout | "Closing Socket";
                                 ret = close( server_fd );
                                 if(ret < 0) {
                                         abort( "close socket error: (%d) %s\n", (int)errno, strerror(errno) );
                                 }
+                                sout | "Stopping connection threads..." | nonl;
                         }
-                        printf("Workers Closed\n");
-
+                        sout | "done";
+
+                        sout | "Stopping protocol threads..." | nonl;
                         deinit_protocol();
-                }
-
+                        sout | "done";
+
+                        sout | "Stopping processors..." | nonl;
+                }
+                sout | "done";
+
+                sout | "Closing splice fds..." | nonl;
                 for(i; pipe_cnt) {
                         ret = close( fds[pipe_off + i] );
@@ -212 +221 @@
                 }
                 free(fds);
-
-        }
+                sout | "done";
+
+                sout | "Stopping processors..." | nonl;
+        }
+        sout | "done";
 
         //===================
         // Close Files
-        printf("Closing Files\n");
+        sout | "Closing open files..." | nonl;
         close_cache();
-}
+        sout | "done";
+}

benchmark/io/http/protocol.cfa

@@ -5 +5 @@
         #include <fcntl.h>
 }
+
+#include <fstream.hfa>
 #include <iofwd.hfa>
 
@@ -11 +13 @@
 extern "C" {
       int snprintf ( char * s, size_t n, const char * format, ... );
-        #include <linux/io_uring.h>
+        // #include <linux/io_uring.h>
 }
 #include <string.h>
@@ -115 +117 @@
         }
 
-        if( options.log ) printf("%.*s\n", rlen, buffer);
+        if( options.log ) {
+                write(sout, buffer, rlen);
+                sout | nl;
+        }
 
         it = buffer;

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;