Changeset a6b587f

Timestamp:

Jan 21, 2021, 1:46:29 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:

c2df3031

Parents:

2fab24e3

Message:

Fix bugs and added nentries command line option.

File:

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

benchmark/io/http/options.cfa

@@ -9 +9 @@
 }
 
+#include <bitmanip.hfa>
 #include <fstream.hfa>
 #include <kernel.hfa>
@@ -51 +52 @@
         bool iokpoll = false;
         unsigned sublen = 16;
+        unsigned nentries = 16;
+
 
         static cfa_option opt[] = {
@@ -68 +71 @@
                 { 'i', "kpollcomplete",  "If set, cluster uses IORING_SETUP_IOPOLL", iokpoll, parse_settrue },
                 {'\0', "submitlength",   "Max number of submitions that can be submitted together", sublen },
+                {'\0', "numentries",     "Number of I/O entries", nentries },
 
         };
@@ -74 +78 @@
         char **left;
         parse_args( argc, argv, opt, opt_cnt, "[OPTIONS]... [PATH]\ncforall http server", left );
+
+        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;
+        }
+        options.clopts.params.num_entries = nentries;
 
         options.clopts.params.poller_submits = subthrd;
@@ -94 +112 @@
         options.clopts.params.num_ready = sublen;
 
-        if( left[0] == 0p ) { return "."; }
+        if( left[0] == 0p ) { return; }
 
         const char * path = left[0];
@@ -100 +118 @@
 
         if( left[0] != 0p ) {
-                serr | "Too many trailing arguments!";
+                serr | "Too many trailing arguments!" | '\'' | path | '\'';
+                while(left[0] != 0p) {
+                        serr | " - " | left[0];
+                        left++;
+                }
                 exit(EXIT_FAILURE);
         }