Changeset 8c58e73

Timestamp:

Jun 8, 2022, 7:24:27 PM (23 months ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

137974a

Parents:

bbf61838

Message:

Removed webserver feature to have multiple clusters (it never actually worked)

Location:

benchmark/io/http

Files:

• main.cfa (modified) (4 diffs)
• options.cfa (modified) (3 diffs)
• options.hfa (modified) (2 diffs)
• worker.cfa (modified) (3 diffs)

benchmark/io/http/main.cfa

@@ -163 +163 @@
         #endif
 
-        options.clopts.instance[options.clopts.cltr_cnt] = &this.self;
-        options.clopts.cltr_cnt++;
+        options.clopts.instance = &this.self;
 }
 
@@ -268 +267 @@
                         Acceptor * acceptors = 0p;
                         Q * queues = 0p;
-                        ServerCluster cl[options.clopts.nclusters];
+                        ServerCluster cl;
 
                         init_protocol();
@@ -320 +319 @@
                                         }
                                 }
-                                cl[0].prnt->conns = conns;
-                                cl[0].prnt->conn_cnt = options.clopts.nworkers;
-                                sout | options.clopts.nworkers | "workers started on" | options.clopts.nprocs | "processors /" | options.clopts.nclusters | "clusters";
-                                for(i; options.clopts.nclusters) {
-                                        sout | options.clopts.thrd_cnt[i] | nonl;
-                                }
+                                cl.prnt->conns = conns;
+                                cl.prnt->conn_cnt = options.clopts.nworkers;
+                                sout | options.clopts.nworkers | "workers started on" | options.clopts.nprocs | "processors";
                                 sout | nl;
                                 {
@@ -440 +436 @@
 
                         sout | "Stopping printer threads..." | nonl; flush( sout );
-                        for(i; options.clopts.nclusters) {
-                                StatsPrinter * p = cl[i].prnt;
-                                if(p) {
-                                        notify_one(p->var);
-                                        join(*p);
-                                }
+                        StatsPrinter * p = cl.prnt;
+                        if(p) {
+                                notify_one(p->var);
+                                join(*p);
                         }
                         sout | "done";

benchmark/io/http/options.cfa

@@ -42 +42 @@
 
         { // cluster
-                1,     // nclusters;
                 1,     // nprocs;
                 1,     // nworkers;
@@ -53 +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},
@@ -99 +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;
 
 

benchmark/io/http/options.hfa

@@ -31 +31 @@
 
         struct {
-                int nclusters;
                 int nprocs;
                 int nworkers;
@@ -37 +36 @@
                 bool procstats;
                 bool viewhalts;
-                cluster ** instance;
-                size_t   * thrd_cnt;
-                size_t     cltr_cnt;
+                cluster * instance;
+                size_t    thrd_cnt;
         } clopts;
 };

benchmark/io/http/worker.cfa

@@ -117 +117 @@
 //=============================================================================================
 void ?{}( AcceptWorker & this ) {
-        size_t cli = rand() % options.clopts.cltr_cnt;
-        ((thread&)this){ "Server Worker Thread", *options.clopts.instance[cli], 64000 };
-        options.clopts.thrd_cnt[cli]++;
+        ((thread&)this){ "Server Worker Thread", *options.clopts.instance, 64000 };
+        options.clopts.thrd_cnt++;
         this.done = false;
 }
@@ -151 +150 @@
 //=============================================================================================
 void ?{}( ChannelWorker & this ) {
-        size_t cli = rand() % options.clopts.cltr_cnt;
-        ((thread&)this){ "Server Worker Thread", *options.clopts.instance[cli], 64000 };
-        options.clopts.thrd_cnt[cli]++;
+        ((thread&)this){ "Server Worker Thread", *options.clopts.instance, 64000 };
+        options.clopts.thrd_cnt++;
         this.done = false;
 }
@@ -182 +180 @@
 
 void ?{}( Acceptor & this ) {
-        size_t cli = rand() % options.clopts.cltr_cnt;
-        ((thread&)this){ "Server Worker Thread", *options.clopts.instance[cli], 64000 };
-        options.clopts.thrd_cnt[cli]++;
+        ((thread&)this){ "Server Worker Thread", *options.clopts.instance, 64000 };
+        options.clopts.thrd_cnt++;
         this.done = false;
 }