Changeset 2cd784a for benchmark/io/http/main.cfa

Timestamp:

Mar 2, 2021, 1:59:38 PM (3 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:

d5006b1

Parents:

dddb3dd0

Message:

update http server according to last push

File:

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

benchmark/io/http/main.cfa

@@ -38 +38 @@
 }
 
+void ^?{}( StatsPrinter & mutex this ) {}
+
 void main(StatsPrinter & this) {
         LOOP: for() {
@@ -54 +56 @@
 // 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;
+        // io_context   * ctxs;
         StatsPrinter * prnt;
 
@@ -106 +81 @@
         }
 
-        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(options.stats) {
+                this.prnt = alloc();
+                (*this.prnt){ this.self };
+        } else {
+                this.prnt = 0p;
         }
 
@@ -125 +97 @@
 
 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);
+        delete(this.prnt);
 
         for(i; options.clopts.nprocs) {
@@ -250 +214 @@
                                 {
                                         char buffer[128];
-                                        while(int ret = cfa_read(0, buffer, 128, 0); ret != 0) {
+                                        for() {
+                                                int ret = cfa_read(0, buffer, 128, 0);
+                                                if(ret == 0) break;
                                                 if(ret < 0) abort( "main read error: (%d) %s\n", (int)errno, strerror(errno) );
+                                                sout | "User wrote '" | "" | nonl;
+                                                write(sout, buffer, ret - 1);
+                                                sout | "'";
                                         }