Changeset d11d6eb for benchmark/io/http/main.cfa

Timestamp:

Aug 28, 2020, 1:26:28 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:

8e3034d

Parents:

8e2cb4a

Message:

Fixed some compilation errors.
Fixed file descriptor support in progress.

File:

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

benchmark/io/http/main.cfa

@@ -12 +12 @@
 #include <kernel.hfa>
 #include <stats.hfa>
+#include <time.hfa>
 #include <thread.hfa>
 
@@ -18 +19 @@
 #include "options.hfa"
 #include "worker.hfa"
+
+extern void register_fixed_files( cluster &, int *, unsigned count );
+
+Duration default_preemption() {
+        return 0;
+}
 
 //=============================================================================================
@@ -84 +91 @@
         // Run Server Cluster
         {
-                cluster cl = { "Server Cluster", options.clopts.flags };
+                cluster cl = { "Server Cluster", options.clopts.params };
                 #if !defined(__CFA_NO_STATISTICS__)
                         print_stats_at_exit( cl, CFA_STATS_READY_Q | CFA_STATS_IO );
@@ -102 +109 @@
                 }
 
+                if(options.file_cache.fixed_fds) {
+                        register_fixed_files(cl, fds, pipe_off);
+                }
+
                 {
                         ServerProc procs[options.clopts.nprocs];
@@ -107 +118 @@
                                 Worker workers[options.clopts.nworkers];
                                 for(i; options.clopts.nworkers) {
-                                        if( options.file_cache.fixed_fds ) {
-                                                workers[i].pipe[0] = pipe_off + (i * 2) + 0;
-                                                workers[i].pipe[1] = pipe_off + (i * 2) + 1;
-                                        }
-                                        else {
+                                        // if( options.file_cache.fixed_fds ) {
+                                        //      workers[i].pipe[0] = pipe_off + (i * 2) + 0;
+                                        //      workers[i].pipe[1] = pipe_off + (i * 2) + 1;
+                                        // }
+                                        // else
+                                        {
                                                 workers[i].pipe[0] = fds[pipe_off + (i * 2) + 0];
                                                 workers[i].pipe[1] = fds[pipe_off + (i * 2) + 1];