Changeset b57db73 for benchmark/io/http/main.cfa

Timestamp:

Jan 16, 2021, 5:20:59 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:

0197418

Parents:

35ea4f3

Message:

httpforall now only loads file if explicit path is given.

File:

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

benchmark/io/http/main.cfa

@@ -80 +80 @@
         //===================
         // Parse args
-        const char * path = parse_options(argc, argv);
+        parse_options(argc, argv);
 
         //===================
         // Open Files
-        sout | "Filling cache from" | path;
-        fill_cache( path );
+        if( options.file_cache.path ) {
+                sout | "Filling cache from" | options.file_cache.path;
+                fill_cache( options.file_cache.path );
+        }
 
         //===================
@@ -147 +149 @@
                 }
 
-                if(options.file_cache.fixed_fds) {
+                if(options.file_cache.path && options.file_cache.fixed_fds) {
                         register_fixed_files(cl, fds, pipe_off);
                 }
@@ -184 +186 @@
                                 }
 
-                                sout | "Notifying connections";
+                                sout | "Notifying connections..." | nonl; flush( sout );
                                 for(i; options.clopts.nworkers) {
                                         workers[i].done = true;
                                         cancel(workers[i].cancel);
                                 }
-
-                                sout | "Shutting down socket";
+                                sout | "done";
+
+                                sout | "Shutting down socket..." | nonl; flush( sout );
                                 int ret = shutdown( server_fd, SHUT_RD );
-                                if( ret < 0 ) { abort( "shutdown error: (%d) %s\n", (int)errno, strerror(errno) ); }
+                                if( ret < 0 ) {
+                                        abort( "shutdown error: (%d) %s\n", (int)errno, strerror(errno) );
+                                }
+                                sout | "done";
 
                                 //===================
                                 // Close Socket
-                                sout | "Closing Socket";
+                                sout | "Closing Socket..." | nonl; flush( sout );
                                 ret = close( server_fd );
                                 if(ret < 0) {
                                         abort( "close socket error: (%d) %s\n", (int)errno, strerror(errno) );
                                 }
-                                sout | "Stopping connection threads..." | nonl;
+                                sout | "Stopping connection threads..." | nonl; flush( sout );
                         }
                         sout | "done";
 
-                        sout | "Stopping protocol threads..." | nonl;
+                        sout | "Stopping protocol threads..." | nonl; flush( sout );
                         deinit_protocol();
                         sout | "done";
 
-                        sout | "Stopping processors..." | nonl;
+                        sout | "Stopping processors..." | nonl; flush( sout );
                 }
                 sout | "done";
 
-                sout | "Closing splice fds..." | nonl;
+                sout | "Closing splice fds..." | nonl; flush( sout );
                 for(i; pipe_cnt) {
                         ret = close( fds[pipe_off + i] );
@@ -223 +229 @@
                 sout | "done";
 
-                sout | "Stopping processors..." | nonl;
+                sout | "Stopping processors..." | nonl; flush( sout );
         }
         sout | "done";
@@ -229 +235 @@
         //===================
         // Close Files
-        sout | "Closing open files..." | nonl;
-        close_cache();
-        sout | "done";
-}
+        if( options.file_cache.path ) {
+                sout | "Closing open files..." | nonl; flush( sout );
+                close_cache();
+                sout | "done";
+        }
+}