Changeset 8e4aa05 for benchmark/io/http/options.cfa

Timestamp:

Mar 4, 2021, 7:40:25 PM (5 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:

77d601f

Parents:

342af53 (diff), a5040fe (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

benchmark/io/http/options.cfa

@@ -9 +9 @@
 }
 
+#include <bitmanip.hfa>
+#include <fstream.hfa>
 #include <kernel.hfa>
 #include <parseargs.hfa>
+#include <stdlib.hfa>
 
+#include <stdlib.h>
 #include <string.h>
 
 Options options @= {
         false, // log
+        false, // stats
 
         { // file_cache
+                0,     // path
                 0,     // open_flags;
                 42u,   // hash_seed;
@@ -32 +38 @@
 
         { // cluster
+                1,     // nclusters;
                 1,     // nprocs;
                 1,     // nworkers;
-                0,     // flags;
+                {},     // params;
                 false, // procstats
                 false, // viewhalts
@@ -41 +48 @@
 };
 
-const char * parse_options( int argc, char * argv[] ) {
-        bool subthrd = false;
-        bool eagrsub = false;
-        bool fixedfd = false;
-        bool sqkpoll = false;
-        bool iokpoll = false;
-        unsigned sublen = 16;
+void parse_options( int argc, char * argv[] ) {
+        // bool fixedfd = false;
+        // bool sqkpoll = false;
+        // bool iokpoll = false;
+        unsigned nentries = 16;
+        bool isolate = false;
+
 
         static cfa_option opt[] = {
-                {'p', "port",           "Port the server will listen on", options.socket.port},
-                {'c', "cpus",           "Number of processors to use", options.clopts.nprocs},
-                {'L', "log",            "Enable logs", options.log, parse_settrue},
-                {'t', "threads",        "Number of worker threads to use", options.clopts.nworkers},
-                {'b', "accept-backlog", "Maximum number of pending accepts", options.socket.backlog},
-                {'r', "request_len",    "Maximum number of bytes in the http request, requests with more data will be answered with Http Code 414", options.socket.buflen},
-                {'S', "seed",           "seed to use for hashing", options.file_cache.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 },
-                {'s', "submitthread",   "If set, cluster uses polling thread to submit I/O", subthrd, parse_settrue },
-                {'e', "eagersubmit",    "If set, cluster submits I/O eagerly but still aggregates submits", eagrsub, parse_settrue},
-                {'f', "fixed-fds",      "If set, files are open eagerly and pre-registered with the cluster", fixedfd, parse_settrue},
-                {'k', "kpollsubmit",    "If set, cluster uses IORING_SETUP_SQPOLL, implies -f", sqkpoll, parse_settrue },
-                {'i', "kpollcomplete",  "If set, cluster uses IORING_SETUP_IOPOLL", iokpoll, parse_settrue },
-                {'L', "submitlength",   "Max number of submitions that can be submitted together", sublen },
+                { 'p', "port",           "Port the server will listen on", options.socket.port},
+                { 'c', "cpus",           "Number of processors to use", options.clopts.nprocs},
+                { 't', "threads",        "Number of worker threads to use", options.clopts.nworkers},
+                {'\0', "isolate",        "Create one cluster per processor", isolate, parse_settrue},
+                {'\0', "log",            "Enable logs", options.log, parse_settrue},
+                {'\0', "stats",          "Enable statistics", options.stats, parse_settrue},
+                {'\0', "accept-backlog", "Maximum number of pending accepts", options.socket.backlog},
+                {'\0', "request_len",    "Maximum number of bytes in the http request, requests with more data will be answered with Http Code 414", options.socket.buflen},
+                {'\0', "seed",           "seed to use for hashing", options.file_cache.hash_seed },
+                {'\0', "cache-size",     "Size of the cache to use, if set to small, will uses closes power of 2", options.file_cache.size },
+                {'\0', "list-files",     "List the files in the specified path and exit", options.file_cache.list, parse_settrue },
+                // { 'f', "fixed-fds",      "If set, files are open eagerly and pre-registered with the cluster", fixedfd, parse_settrue},
+                // { 'k', "kpollsubmit",    "If set, cluster uses IORING_SETUP_SQPOLL, implies -f", sqkpoll, parse_settrue },
+                // { 'i', "kpollcomplete",  "If set, cluster uses IORING_SETUP_IOPOLL", iokpoll, parse_settrue },
+                {'e', "numentries",     "Number of I/O entries", nentries },
 
         };
@@ -72 +79 @@
         parse_args( argc, argv, opt, opt_cnt, "[OPTIONS]... [PATH]\ncforall http server", left );
 
-        options.clopts.params.poller_submits = subthrd;
-        options.clopts.params.eager_submits  = eagrsub;
-
-        if( fixedfd ) {
-                options.file_cache.fixed_fds = true;
+        if( !is_pow2(nentries) ) {
+                unsigned v = nentries;
+                v--;
+                v |= v >> 1;
+                v |= v >> 2;
+                v |= v >> 4;
+                v |= v >> 8;
+                v |= v >> 16;
+                v++;
+                serr | "Warning: num_entries not a power of 2" | '(' | nentries | ')' | "raising to " | v;
+                nentries = v;
+        }
+        if(isolate) {
+                options.clopts.nclusters = options.clopts.nprocs;
+                options.clopts.nprocs = 1;
+        }
+        options.clopts.params.num_entries = nentries;
+        options.clopts.instance = alloc(options.clopts.nclusters);
+        options.clopts.thrd_cnt = alloc(options.clopts.nclusters);
+        options.clopts.cltr_cnt = 0;
+        for(i; options.clopts.nclusters) {
+                options.clopts.thrd_cnt[i] = 0;
         }
 
-        if( sqkpoll ) {
-                options.clopts.params.poll_submit = true;
-                options.file_cache.fixed_fds = true;
-        }
 
-        if( iokpoll ) {
-                options.clopts.params.poll_complete = true;
-                options.file_cache.open_flags |= O_DIRECT;
-        }
+        // if( fixedfd ) {
+        //      options.file_cache.fixed_fds = true;
+        // }
 
-        options.clopts.params.num_ready = sublen;
+        // if( sqkpoll ) {
+        //      options.file_cache.fixed_fds = true;
+        // }
 
-        if( left[0] == 0p ) { return "."; }
+        // if( iokpoll ) {
+        //      options.file_cache.open_flags |= O_DIRECT;
+        // }
+
+        if( left[0] == 0p ) { return; }
 
         const char * path = left[0];
@@ -97 +122 @@
 
         if( left[0] != 0p ) {
-                abort("Too many trailing arguments!\n");
+                serr | "Too many trailing arguments!" | '\'' | path | '\'';
+                while(left[0] != 0p) {
+                        serr | " - " | left[0];
+                        left++;
+                }
+                exit(EXIT_FAILURE);
         }
 
-        return path;
+        options.file_cache.path = path;
 }