Changeset 4f762d3 for benchmark/io/http/main.cfa

Timestamp:

Feb 19, 2021, 1:48:14 PM (9 months ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

arm-eh, jacob/cs343-translation, master, new-ast-unique-expr

Children:

d60d30e

Parents:

78da4ab

Message:

Fix httpforall after changes to I/O

File:

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

benchmark/io/http/main.cfa

@@ -47 +47 @@
                 }
         #endif
+}
+
+struct ServerIoContext {
+        io_context self;
+};
+
+void ?{}( ServerIoContext & this ) {
+        /* paranoid */ assert( options.clopts.instance != 0p );
+        (this.self){ *options.clopts.instance };
 }
 
@@ -153 +162 @@
                 }
 
-                if(options.file_cache.path && options.file_cache.fixed_fds) {
-                        register_fixed_files(cl, fds, pipe_off);
-                }
+                // if(options.file_cache.path && options.file_cache.fixed_fds) {
+                //      register_fixed_files(cl, fds, pipe_off);
+                // }
 
                 {
                         ServerProc procs[options.clopts.nprocs];
-                        StatsPrinter printer;
+                        ServerIoContext ioctxs[options.clopts.nprocs];
+                        // StatsPrinter printer;
 
                         init_protocol();
@@ -183 +193 @@
                                 {
                                         char buffer[128];
-                                        while(int ret = cfa_read(0, buffer, 128, 0, -1`s, 0p, 0p); ret != 0) {
+                                        while(int ret = cfa_read(0, buffer, 128, 0); ret != 0) {
                                                 if(ret < 0) abort( "main read error: (%d) %s\n", (int)errno, strerror(errno) );
                                         }
@@ -193 +203 @@
                                 for(i; options.clopts.nworkers) {
                                         workers[i].done = true;
-                                        cancel(workers[i].cancel);
                                 }
                                 sout | "done";