Changes in benchmark/io/http/main.cfa [d9c2284:7f389a5c]

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"
 
@@ -22 +23 @@
 // Globals
 //=============================================================================================
+Options options @= {
+        0,
+        42u,
+        0,
+        false,
+        false,
+        0
+};
+
 channel & wait_connect;
 
@@ -29 +39 @@
 
 void ?{}( ServerProc & this ) {
-        /* paranoid */ assert( options.clopts.instance != 0p );
-        (this.self){ "Benchmark Processor", *options.clopts.instance };
+        /* paranoid */ assert( options.the_cluster != 0p );
+        (this.self){ "Benchmark Processor", *options.the_cluster };
 
         #if !defined(__CFA_NO_STATISTICS__)
-                if( options.clopts.procstats ) {
-                        print_stats_at_exit( this.self, options.clopts.instance->print_stats );
+                if( options.procstats ) {
+                        print_stats_at_exit( this.self, options.the_cluster->print_stats );
                 }
-                if( options.clopts.viewhalts ) {
+                if( options.viewhalts ) {
                         print_halts( this.self );
                 }
@@ -46 +56 @@
 //============================================================================================='
 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
-        const char * path = parse_options(argc, argv);
+        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}
+        };
+        int opt_cnt = sizeof(opt) / sizeof(cfa_option);
+
+        char **left;
+      parse_args( argc, argv, opt, opt_cnt, "[OPTIONS] [PATH]  -- cforall http server", left );
+
 
         //===================
@@ -57 +85 @@
         //===================
         // Open Socket
-        printf("Listening on port %d\n", options.socket.port);
+        printf("Listening on port %d\n", port);
         int server_fd = socket(AF_INET, SOCK_STREAM, 0);
         if(server_fd < 0) {
@@ -69 +97 @@
         address.sin_family = AF_INET;
         address.sin_addr.s_addr = htonl(INADDR_ANY);
-        address.sin_port = htons( options.socket.port );
+        address.sin_port = htons( port );
 
         ret = bind( server_fd, (struct sockaddr *)&address, sizeof(address) );
@@ -76 +104 @@
         }
 
-        ret = listen( server_fd, options.socket.backlog );
+        ret = listen( server_fd, backlog );
         if(ret < 0) {
                 abort( "listen error: (%d) %s\n", (int)errno, strerror(errno) );
@@ -84 +112 @@
         // Run Server Cluster
         {
-                cluster cl = { "Server Cluster", options.clopts.flags };
+                cluster cl = { "Server Cluster", cl_flags };
                 #if !defined(__CFA_NO_STATISTICS__)
                         print_stats_at_exit( cl, CFA_STATS_READY_Q | CFA_STATS_IO );
                 #endif
-                options.clopts.instance = &cl;
+                options.the_cluster = &cl;
 
-                channel chan = { options.clopts.chan_size };
+                channel chan = { chan_size };
                 &wait_connect = &chan;
 
-                int pipe_cnt = options.clopts.nworkers * 2;
-                int pipe_off;
-                int * fds;
-                [fds, pipe_off] = filefds( pipe_cnt );
-                for(i; 0 ~ pipe_cnt ~ 2) {
-                        int ret = pipe(&fds[pipe_off + i]);
-                        if( ret < 0 ) { abort( "pipe error: (%d) %s\n", (int)errno, strerror(errno) ); }
-                }
-
                 {
-                        ServerProc procs[options.clopts.nprocs];
+                        ServerProc procs[nprocs];
                         {
-                                Worker workers[options.clopts.nworkers];
-                                for(i; options.clopts.nworkers) {
-                                        if( options.file_cache.fixed_fds ) {
-                                                workers[i].pipe[0] = pipe_off + (i * 2) + 0;
-                                                workers[i].pipe[1] = pipe_off + (i * 2) + 1;
-                                        }
-                                        else {
-                                                workers[i].pipe[0] = fds[pipe_off + (i * 2) + 0];
-                                                workers[i].pipe[1] = fds[pipe_off + (i * 2) + 1];
-                                        }
-                                        unpark( workers[i] __cfaabi_dbg_ctx2 );
-                                }
-                                printf("%d workers started on %d processors\n", options.clopts.nworkers, options.clopts.nprocs);
+                                Worker workers[nworkers];
+                                printf("%d workers started on %d processors\n", nworkers, 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("Acceptor Closed\n");
+                                printf("Shutting Down\n");
 
                                 // Clean-up the workers
-                                for(options.clopts.nworkers) {
+                                for(nworkers) {
                                         put( wait_connect, -1 );
                                 }
                         }
-                        printf("Workers Closed\n");
                 }
-
-                for(i; pipe_cnt) {
-                        ret = close( fds[pipe_off + i] );
-                        if(ret < 0) {
-                                abort( "close pipe error: (%d) %s\n", (int)errno, strerror(errno) );
-                        }
-                }
-                free(fds);
         }