Changeset 348f81d

Timestamp:

Feb 23, 2021, 4:02:27 PM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

arm-eh, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b664af2

Parents:

a06023f

Message:

Added option to isolate processor so everything has it's own cluster

Location:

benchmark/io/http

Files:

• main.cfa (modified) (7 diffs)
• options.cfa (modified) (5 diffs)
• options.hfa (modified) (2 diffs)
• protocol.cfa (modified) (1 diff)
• worker.cfa (modified) (1 diff)

benchmark/io/http/main.cfa

@@ -29 +29 @@
 
 //=============================================================================================
-// Globals
-//=============================================================================================
-struct ServerProc {
-        processor self;
-};
-
-void ?{}( ServerProc & this ) {
-        /* paranoid */ assert( options.clopts.instance != 0p );
-        (this.self){ "Benchmark Processor", *options.clopts.instance };
-
-        #if !defined(__CFA_NO_STATISTICS__)
-                if( options.clopts.procstats ) {
-                        print_stats_at_exit( this.self, options.clopts.instance->print_stats );
-                }
-                if( options.clopts.viewhalts ) {
-                        print_halts( this.self );
-                }
-        #endif
-}
-
-struct ServerIoContext {
-        io_context self;
-};
-
-void ?{}( ServerIoContext & this ) {
-        /* paranoid */ assert( options.clopts.instance != 0p );
-        (this.self){ *options.clopts.instance };
-}
-
-extern void init_protocol(void);
-extern void deinit_protocol(void);
-
-//=============================================================================================
 // Stats Printer
 //============================================================================================='
@@ -67 +34 @@
 thread StatsPrinter {};
 
-void ?{}( StatsPrinter & this ) {
-        ((thread&)this){ "Stats Printer Thread" };
+void ?{}( StatsPrinter & this, cluster & cl ) {
+        ((thread&)this){ "Stats Printer Thread", cl };
 }
 
@@ -80 +47 @@
                 sleep(10`s);
 
-                print_stats_now( *options.clopts.instance, CFA_STATS_READY_Q | CFA_STATS_IO );
-        }
-}
+                print_stats_now( *active_cluster(), CFA_STATS_READY_Q | CFA_STATS_IO );
+        }
+}
+
+//=============================================================================================
+// Globals
+//=============================================================================================
+// struct ServerProc {
+//      processor self;
+// };
+
+// void ?{}( ServerProc & this ) {
+//      /* paranoid */ assert( options.clopts.instance != 0p );
+//      (this.self){ "Benchmark Processor", *options.clopts.instance };
+
+//      #if !defined(__CFA_NO_STATISTICS__)
+//              if( options.clopts.procstats ) {
+//                      print_stats_at_exit( this.self, options.clopts.instance->print_stats );
+//              }
+//              if( options.clopts.viewhalts ) {
+//                      print_halts( this.self );
+//              }
+//      #endif
+// }
+
+// struct ServerIoContext {
+//      io_context self;
+// };
+
+// void ?{}( ServerIoContext & this ) {
+//      /* paranoid */ assert( options.clopts.instance != 0p );
+//      (this.self){ *options.clopts.instance };
+// }
+
+struct ServerCluster {
+        cluster self;
+        processor    * procs;
+        io_context   * ctxs;
+        StatsPrinter * prnt;
+
+};
+
+void ?{}( ServerCluster & this ) {
+        (this.self){ "Server Cluster", options.clopts.params };
+
+        this.procs = alloc(options.clopts.nprocs);
+        for(i; options.clopts.nprocs) {
+                (this.procs[i]){ "Benchmark Processor", this.self };
+
+                #if !defined(__CFA_NO_STATISTICS__)
+                        if( options.clopts.procstats ) {
+                                print_stats_at_exit( *this.procs, this.self.print_stats );
+                        }
+                        if( options.clopts.viewhalts ) {
+                                print_halts( *this.procs );
+                        }
+                #endif
+        }
+
+        this.ctxs = alloc(options.clopts.nprocs);
+        for(i; options.clopts.nprocs) {
+                (this.ctxs[i]){ this.self };
+        }
+
+        this.prnt = alloc(options.clopts.nprocs);
+        for(i; options.clopts.nprocs) {
+                (this.prnt[i]){ this.self };
+        }
+
+        #if !defined(__CFA_NO_STATISTICS__)
+                print_stats_at_exit( this.self, CFA_STATS_READY_Q | CFA_STATS_IO );
+        #endif
+
+        options.clopts.instance[options.clopts.cltr_cnt] = &this.self;
+        options.clopts.cltr_cnt++;
+}
+
+void ^?{}( ServerCluster & this ) {
+        for(i; options.clopts.nprocs) {
+                ^(this.prnt[i]){};
+        }
+        free(this.prnt);
+
+        for(i; options.clopts.nprocs) {
+                ^(this.ctxs[i]){};
+        }
+        free(this.ctxs);
+
+        for(i; options.clopts.nprocs) {
+                ^(this.procs[i]){};
+        }
+        free(this.procs);
+
+        ^(this.self){};
+}
+
+extern void init_protocol(void);
+extern void deinit_protocol(void);
 
 //=============================================================================================
@@ -146 +208 @@
         // Run Server Cluster
         {
-                cluster cl = { "Server Cluster", options.clopts.params };
-                #if !defined(__CFA_NO_STATISTICS__)
-                        print_stats_at_exit( cl, CFA_STATS_READY_Q | CFA_STATS_IO );
-                #endif
-                options.clopts.instance = &cl;
-
-
                 int pipe_cnt = options.clopts.nworkers * 2;
                 int pipe_off;
@@ -167 +222 @@
 
                 {
-                        ServerProc procs[options.clopts.nprocs];
-                        ServerIoContext ioctxs[options.clopts.nprocs];
-                        // StatsPrinter printer;
+                        ServerCluster cl[options.clopts.nclusters];
 
                         init_protocol();
@@ -190 +243 @@
                                         unpark( workers[i] );
                                 }
-                                sout | options.clopts.nworkers | "workers started on" | options.clopts.nprocs | "processors";
+                                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;
+                                }
+                                sout | nl;
                                 {
                                         char buffer[128];
@@ -230 +287 @@
                         sout | "done";
 
-                        sout | "Stopping processors..." | nonl; flush( sout );
+                        sout | "Stopping processors/clusters..." | nonl; flush( sout );
                 }
                 sout | "done";

benchmark/io/http/options.cfa

@@ -13 +13 @@
 #include <kernel.hfa>
 #include <parseargs.hfa>
+#include <stdlib.hfa>
 
 #include <stdlib.h>
@@ -36 +37 @@
 
         { // cluster
+                1,     // nclusters;
                 1,     // nprocs;
                 1,     // nworkers;
@@ -50 +52 @@
         // bool iokpoll = false;
         unsigned nentries = 16;
+        bool isolate = false;
 
 
@@ -56 +59 @@
                 { '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', "accept-backlog", "Maximum number of pending accepts", options.socket.backlog},
@@ -85 +89 @@
                 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( fixedfd ) {

benchmark/io/http/options.hfa

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

benchmark/io/http/protocol.cfa

@@ -182 +182 @@
 
 void ?{}( DateFormater & this ) {
-        ((thread&)this){ "Server Date Thread", *options.clopts.instance };
+        ((thread&)this){ "Server Date Thread", *options.clopts.instance[0] };
         this.idx = 0;
         memset( this.buffers[0].buff, 0, sizeof(this.buffers[0]) );

benchmark/io/http/worker.cfa

@@ -17 +17 @@
 //=============================================================================================
 void ?{}( Worker & this ) {
-        ((thread&)this){ "Server Worker Thread", *options.clopts.instance };
+        size_t cli = rand() % options.clopts.cltr_cnt;
+        ((thread&)this){ "Server Worker Thread", *options.clopts.instance[cli] };
+        options.clopts.thrd_cnt[cli]++;
         this.pipe[0] = -1;
         this.pipe[1] = -1;