Changes in benchmark/io/http/main.cfa [53e4562:e95a117]

File:

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

benchmark/io/http/main.cfa

@@ -17 +17 @@
 #include "filecache.hfa"
 #include "options.hfa"
-#include "parseargs.hfa"
 #include "worker.hfa"
 
@@ -23 +22 @@
 // Globals
 //=============================================================================================
-Options options @= {
-        0,     //   open_flags;
-        42u,   //       hash_seed;
-        0,     //   file_cache_size;
-        false, //       file_cache_list;
-        false, //       procstats;
-        false, //       viewhalts;
-        0      //       the_cluster;
-};
-
 channel & wait_connect;
 
@@ -40 +29 @@
 
 void ?{}( ServerProc & this ) {
-        /* paranoid */ assert( options.the_cluster != 0p );
-        (this.self){ "Benchmark Processor", *options.the_cluster };
+        /* paranoid */ assert( options.clopts.instance != 0p );
+        (this.self){ "Benchmark Processor", *options.clopts.instance };
 
         #if !defined(__CFA_NO_STATISTICS__)
-                if( options.procstats ) {
-                        print_stats_at_exit( this.self, options.the_cluster->print_stats );
+                if( options.clopts.procstats ) {
+                        print_stats_at_exit( this.self, options.clopts.instance->print_stats );
                 }
-                if( options.viewhalts ) {
+                if( options.clopts.viewhalts ) {
                         print_halts( this.self );
                 }
@@ -57 +46 @@
 //============================================================================================='
 int main( int argc, char * argv[] ) {
-        int port      = 8080;
-        int backlog   = 10;
-        int nprocs    = 1;
-        int nworkers  = 1;
-        int cl_flags  = 0;
-        int chan_size = 10;
-        const char * path = ".";
         //===================
         // Parse args
-        static cfa_option opt[] = {
-                {'p', "port", "Port the server will listen on", port},
-                {'c', "cpus", "Number of processors to use", nprocs},
-                {'t', "threads", "Number of worker threads to use", nworkers},
-                {'b', "accept-backlog", "Maximum number of pending accepts", backlog},
-                {'B', "channel-size", "Maximum number of accepted connection pending", chan_size},
-                {'S', "seed", "seed to use for hashing", options.hash_seed },
-                {'C', "cache-size", "Size of the cache to use, if set to small, will uses closes power of 2", options.file_cache_size },
-                {'l', "list-files", "List the files in the specified path and exit", options.file_cache_list, parse_settrue }
-
-        };
-        int opt_cnt = sizeof(opt) / sizeof(cfa_option);
-
-        char **left;
-      parse_args( argc, argv, opt, opt_cnt, "[OPTIONS]... [PATH]\ncforall http server", left );
-        if( left[0] != 0p ) {
-                path = left[0];
-                left++;
-        }
-        if( left[0] != 0p ) {
-                abort("Too many trailing arguments!\n");
-        }
-
+        const char * path = parse_options(argc, argv);
 
         //===================
@@ -97 +57 @@
         //===================
         // Open Socket
-        printf("Listening on port %d\n", port);
+        printf("Listening on port %d\n", options.socket.port);
         int server_fd = socket(AF_INET, SOCK_STREAM, 0);
         if(server_fd < 0) {
@@ -109 +69 @@
         address.sin_family = AF_INET;
         address.sin_addr.s_addr = htonl(INADDR_ANY);
-        address.sin_port = htons( port );
+        address.sin_port = htons( options.socket.port );
 
         ret = bind( server_fd, (struct sockaddr *)&address, sizeof(address) );
@@ -116 +76 @@
         }
 
-        ret = listen( server_fd, backlog );
+        ret = listen( server_fd, options.socket.backlog );
         if(ret < 0) {
                 abort( "listen error: (%d) %s\n", (int)errno, strerror(errno) );
@@ -124 +84 @@
         // Run Server Cluster
         {
-                cluster cl = { "Server Cluster", cl_flags };
+                cluster cl = { "Server Cluster", options.clopts.flags };
                 #if !defined(__CFA_NO_STATISTICS__)
                         print_stats_at_exit( cl, CFA_STATS_READY_Q | CFA_STATS_IO );
                 #endif
-                options.the_cluster = &cl;
+                options.clopts.instance = &cl;
 
-                channel chan = { chan_size };
+                channel chan = { options.clopts.chan_size };
                 &wait_connect = &chan;
 
                 {
-                        ServerProc procs[nprocs];
+                        ServerProc procs[options.clopts.nprocs];
                         {
-                                Worker workers[nworkers];
-                                printf("%d workers started on %d processors\n", nworkers, nprocs);
+                                Worker workers[options.clopts.nworkers];
+                                printf("%d workers started on %d processors\n", options.clopts.nworkers, options.clopts.nprocs);
                                 {
                                         Acceptor acceptor = { server_fd, (struct sockaddr *)&address, (socklen_t*)&addrlen, 0 };
+
+                                        char buffer[128];
+                                        while(!feof(stdin)) {
+                                                fgets(buffer, 128, stdin);
+                                        }
+
+                                        printf("Shutting Down\n");
                                 }
-                                printf("Shutting Down\n");
+                                printf("Acceptor Closed\n");
 
                                 // Clean-up the workers
-                                for(nworkers) {
+                                for(options.clopts.nworkers) {
                                         put( wait_connect, -1 );
                                 }
                         }
+                        printf("Workers Closed\n");
                 }
         }