Changes in benchmark/io/http/options.cfa [86c12d65:8c58e73]

File:

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

benchmark/io/http/options.cfa

@@ -38 +38 @@
                 10,    // backlog
                 1024,  // buflen
-                false, // onereuse
-                false  // manyreuse
+                false  // reuseport
         },
 
         { // cluster
-                1,     // nclusters;
                 1,     // nprocs;
                 1,     // nworkers;
@@ -54 +52 @@
 
 void parse_options( int argc, char * argv[] ) {
-        // bool fixedfd = false;
-        // bool sqkpoll = false;
-        // bool iokpoll = false;
         unsigned nentries = 0;
-        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},
                 { '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', "sout",           "Redirect standard out to file", options.reopen_stdout},
@@ -72 +63 @@
                 {'\0', "shell",          "Disable interactive mode", options.interactive, parse_setfalse},
                 {'\0', "accept-backlog", "Maximum number of pending accepts", options.socket.backlog},
-                {'\0', "reuseport-one",  "Create a single listen socket with SO_REUSEPORT", options.socket.onereuse, parse_settrue},
-                {'\0', "reuseport",      "Use many listen sockets with SO_REUSEPORT", options.socket.manyreuse, parse_settrue},
+                {'\0', "reuseport",      "Use acceptor threads with reuse port SO_REUSEPORT", options.socket.reuseport, parse_settrue},
                 {'\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 },
@@ -101 +91 @@
                 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;
-        }
+        options.clopts.instance = 0p;
+        options.clopts.thrd_cnt = 0;