Changeset 2cd784a

Timestamp:

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

d5006b1

Parents:

dddb3dd0

Message:

update http server according to last push

Location:

benchmark/io/http

Files:

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

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 | "'";
                                         }
 

benchmark/io/http/options.cfa

@@ -20 +20 @@
 Options options @= {
         false, // log
+        false, // stats
 
         { // file_cache
@@ -61 +62 @@
                 {'\0', "isolate",        "Create one cluster per processor", isolate, parse_settrue},
                 {'\0', "log",            "Enable logs", options.log, parse_settrue},
+                {'\0', "stats",          "Enable statistics", options.stats, parse_settrue},
                 {'\0', "accept-backlog", "Maximum number of pending accepts", options.socket.backlog},
                 {'\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},

benchmark/io/http/options.hfa

@@ -9 +9 @@
 struct Options {
         bool log;
+        bool stats;
 
         struct {

benchmark/io/http/protocol.cfa

@@ -52 +52 @@
         while(len > 0) {
                 // Call write
-                int ret = cfa_send(fd, it, len, 0, 0);
+                int ret = cfa_send(fd, it, len, 0, CFA_IO_LAZY);
                 if( ret < 0 ) {
                         if( errno == ECONNRESET || errno == EPIPE ) return -ECONNRESET;
@@ -121 +121 @@
         READ:
         for() {
-                int ret = cfa_recv(fd, (void*)it, count, 0, 0);
+                int ret = cfa_recv(fd, (void*)it, count, 0, CFA_IO_LAZY);
                 // int ret = read(fd, (void*)it, count);
                 if(ret == 0 ) return [OK200, true, 0, 0];
@@ -160 +160 @@
         ssize_t ret;
         SPLICE1: while(count > 0) {
-                ret = cfa_splice(ans_fd, &offset, pipe[1], 0p, count, sflags, 0);
-                // ret = splice(ans_fd, &offset, pipe[1], 0p, count, sflags);
+                ret = cfa_splice(ans_fd, &offset, pipe[1], 0p, count, sflags, CFA_IO_LAZY);
                 if( ret < 0 ) {
                         if( errno != EAGAIN && errno != EWOULDBLOCK) continue SPLICE1;
@@ -173 +172 @@
                 size_t in_pipe = ret;
                 SPLICE2: while(in_pipe > 0) {
-                        ret = cfa_splice(pipe[0], 0p, fd, 0p, in_pipe, sflags, 0);
-                        // ret = splice(pipe[0], 0p, fd, 0p, in_pipe, sflags);
+                        ret = cfa_splice(pipe[0], 0p, fd, 0p, in_pipe, sflags, CFA_IO_LAZY);
                         if( ret < 0 ) {
                                 if( errno != EAGAIN && errno != EWOULDBLOCK) continue SPLICE2;
@@ -232 +230 @@
                 Time now = getTimeNsec();
                 strftime( buff, 100, "%a, %d %b %Y %H:%M:%S %Z", now );
+                sout | "Updated date to '" | buff | "'";
 
                 for(i; KNOWN_CODES) {
@@ -244 +243 @@
                 this.idx = (this.idx + 1) % 2;
 
+                sout | "Date thread sleeping";
+
                 sleep(1`s);
         }

benchmark/io/http/worker.cfa

@@ -37 +37 @@
         for() {
                 if( options.log ) sout | "=== Accepting connection ===";
-                int fd = cfa_accept4( this.[sockfd, addr, addrlen, flags], 0 );
+                int fd = cfa_accept4( this.[sockfd, addr, addrlen, flags], CFA_IO_LAZY );
                 if(fd < 0) {
                         if( errno == ECONNABORTED ) break;