Changeset d9c2284 for benchmark/io

Timestamp:

Jul 20, 2020, 4:32:04 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

5751a56

Parents:

124c1b7

Message:

Started doing preliminary work to use Fixed FDs. Starting with the thread pipes.

Location:

benchmark/io/http

Files:

• filecache.cfa (modified) (1 diff)
• filecache.hfa (modified) (1 diff)
• main.cfa (modified) (2 diffs)
• worker.cfa (modified) (2 diffs)

benchmark/io/http/filecache.cfa

@@ -192 +192 @@
 }
 
+[int *, int] filefds(int extra) {
+        if(!file_cache.entries) {
+                abort("File cache not filled!\n");
+        }
+
+        return [aalloc(extra), 0];
+}
+
+
 void close_cache() {
         for(idx; file_cache.size) {

benchmark/io/http/filecache.hfa

@@ -11 +11 @@
 [int fd, size_t size] get_file( * const char file, size_t len );
 void fill_cache( const char * path );
+[int *, int] filefds( int extra );
 void close_cache();

benchmark/io/http/main.cfa

@@ -93 +93 @@
                 &wait_connect = &chan;
 
+                int pipe_cnt = options.clopts.nworkers * 2;
+                int pipe_off;
+                int * fds;
+                [fds, pipe_off] = filefds( pipe_cnt );
+                for(i; 0 ~ pipe_cnt ~ 2) {
+                        int ret = pipe(&fds[pipe_off + i]);
+                        if( ret < 0 ) { abort( "pipe error: (%d) %s\n", (int)errno, strerror(errno) ); }
+                }
+
                 {
                         ServerProc procs[options.clopts.nprocs];
                         {
                                 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 {
+                                                workers[i].pipe[0] = fds[pipe_off + (i * 2) + 0];
+                                                workers[i].pipe[1] = fds[pipe_off + (i * 2) + 1];
+                                        }
+                                        unpark( workers[i] __cfaabi_dbg_ctx2 );
+                                }
                                 printf("%d workers started on %d processors\n", options.clopts.nworkers, options.clopts.nprocs);
                                 {
@@ -117 +137 @@
                         printf("Workers Closed\n");
                 }
+
+                for(i; pipe_cnt) {
+                        ret = close( fds[pipe_off + i] );
+                        if(ret < 0) {
+                                abort( "close pipe error: (%d) %s\n", (int)errno, strerror(errno) );
+                        }
+                }
+                free(fds);
         }
 

benchmark/io/http/worker.cfa

@@ -12 +12 @@
 #include "filecache.hfa"
 
-extern "C" {
-// extern ssize_t sendfile(int out_fd, int in_fd, off_t *offset, size_t count);
-extern ssize_t splice(int fd_in, loff_t *off_in, int fd_out, loff_t *off_out, size_t len, unsigned int flags);
-}
-
-ssize_t sendfile(int out_fd, int in_fd, off_t *offset, size_t count) {
-        return splice(in_fd, offset, out_fd, 0p, count, 0);
-}
-
-
 //=============================================================================================
 // Worker Thread
@@ -27 +17 @@
 void ?{}( Worker & this ) {
         ((thread&)this){ "Server Worker Thread", *options.clopts.instance };
-        int ret = pipe(this.pipe);
-        if( ret < 0 ) { abort( "pipe error: (%d) %s\n", (int)errno, strerror(errno) ); }
+        this.pipe[0] = -1;
+        this.pipe[1] = -1;
 }
 
 void main( Worker & this ) {
+        park( __cfaabi_dbg_ctx );
+        /* paranoid */ assert( this.pipe[0] != -1 );
+        /* paranoid */ assert( this.pipe[1] != -1 );
+
         CONNECTION:
         for() {