Changes in benchmark/io/http/main.cfa [7223dbf2:8c43d05]

File:

• benchmark/io/http/main.cfa (modified) (8 diffs)

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";
+}