Changeset b57db73

Timestamp:

Jan 16, 2021, 5:20:59 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:

0197418

Parents:

35ea4f3

Message:

httpforall now only loads file if explicit path is given.

Location:

benchmark/io/http

Files:

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

benchmark/io/http/filecache.cfa

@@ -209 +209 @@
 
 [int *, int] filefds(int extra) {
+        if(!options.file_cache.path) {
+                int * data = alloc(extra);
+                return [data, 0];
+        }
+
         if(!file_cache.entries) {
                 abort("File cache not filled!\n");

benchmark/io/http/main.cfa

@@ -80 +80 @@
         //===================
         // Parse args
-        const char * path = parse_options(argc, argv);
+        parse_options(argc, argv);
 
         //===================
         // Open Files
-        sout | "Filling cache from" | path;
-        fill_cache( path );
+        if( options.file_cache.path ) {
+                sout | "Filling cache from" | options.file_cache.path;
+                fill_cache( options.file_cache.path );
+        }
 
         //===================
@@ -147 +149 @@
                 }
 
-                if(options.file_cache.fixed_fds) {
+                if(options.file_cache.path && options.file_cache.fixed_fds) {
                         register_fixed_files(cl, fds, pipe_off);
                 }
@@ -184 +186 @@
                                 }
 
-                                sout | "Notifying connections";
+                                sout | "Notifying connections..." | nonl; flush( sout );
                                 for(i; options.clopts.nworkers) {
                                         workers[i].done = true;
                                         cancel(workers[i].cancel);
                                 }
-
-                                sout | "Shutting down socket";
+                                sout | "done";
+
+                                sout | "Shutting down socket..." | nonl; flush( sout );
                                 int ret = shutdown( server_fd, SHUT_RD );
-                                if( ret < 0 ) { abort( "shutdown error: (%d) %s\n", (int)errno, strerror(errno) ); }
+                                if( ret < 0 ) {
+                                        abort( "shutdown error: (%d) %s\n", (int)errno, strerror(errno) );
+                                }
+                                sout | "done";
 
                                 //===================
                                 // Close Socket
-                                sout | "Closing Socket";
+                                sout | "Closing Socket..." | nonl; flush( sout );
                                 ret = close( server_fd );
                                 if(ret < 0) {
                                         abort( "close socket error: (%d) %s\n", (int)errno, strerror(errno) );
                                 }
-                                sout | "Stopping connection threads..." | nonl;
+                                sout | "Stopping connection threads..." | nonl; flush( sout );
                         }
                         sout | "done";
 
-                        sout | "Stopping protocol threads..." | nonl;
+                        sout | "Stopping protocol threads..." | nonl; flush( sout );
                         deinit_protocol();
                         sout | "done";
 
-                        sout | "Stopping processors..." | nonl;
+                        sout | "Stopping processors..." | nonl; flush( sout );
                 }
                 sout | "done";
 
-                sout | "Closing splice fds..." | nonl;
+                sout | "Closing splice fds..." | nonl; flush( sout );
                 for(i; pipe_cnt) {
                         ret = close( fds[pipe_off + i] );
@@ -223 +229 @@
                 sout | "done";
 
-                sout | "Stopping processors..." | nonl;
+                sout | "Stopping processors..." | nonl; flush( sout );
         }
         sout | "done";
@@ -229 +235 @@
         //===================
         // Close Files
-        sout | "Closing open files..." | nonl;
-        close_cache();
-        sout | "done";
-}
+        if( options.file_cache.path ) {
+                sout | "Closing open files..." | nonl; flush( sout );
+                close_cache();
+                sout | "done";
+        }
+}

benchmark/io/http/options.cfa

@@ -9 +9 @@
 }
 
+#include <fstream.hfa>
 #include <kernel.hfa>
 #include <parseargs.hfa>
 
+#include <stdlib.h>
 #include <string.h>
 
@@ -18 +20 @@
 
         { // file_cache
+                0,     // path
                 0,     // open_flags;
                 42u,   // hash_seed;
@@ -34 +37 @@
                 1,     // nprocs;
                 1,     // nworkers;
-                0,     // flags;
+                {},     // params;
                 false, // procstats
                 false, // viewhalts
@@ -41 +44 @@
 };
 
-const char * parse_options( int argc, char * argv[] ) {
+void parse_options( int argc, char * argv[] ) {
         bool subthrd = false;
         bool eagrsub = false;
@@ -97 +100 @@
 
         if( left[0] != 0p ) {
-                abort("Too many trailing arguments!\n");
+                serr | "Too many trailing arguments!";
+                exit(EXIT_FAILURE);
         }
 
-        return path;
+        options.file_cache.path = path;
 }

benchmark/io/http/options.hfa

@@ -11 +11 @@
 
         struct {
+                const char * path;
                 int open_flags;
                 uint32_t hash_seed;
@@ -36 +37 @@
 extern Options options;
 
-const char * parse_options( int argc, char * argv[] );
+void parse_options( int argc, char * argv[] );

benchmark/io/http/protocol.cfa

@@ -26 +26 @@
         "HTTP/1.1 400 Bad Request\nServer: HttoForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
         "HTTP/1.1 404 Not Found\nServer: HttoForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
+        "HTTP/1.1 405 Method Not Allowed\nServer: HttoForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
         "HTTP/1.1 408 Request Timeout\nServer: HttoForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
         "HTTP/1.1 413 Payload Too Large\nServer: HttoForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
@@ -37 +38 @@
         400,
         404,
+        405,
         408,
         413,

benchmark/io/http/protocol.hfa

@@ -7 +7 @@
         E400,
         E404,
+        E405,
         E408,
         E413,

benchmark/io/http/worker.cfa

@@ -97 +97 @@
                         }
 
+                        if( !options.file_cache.path ) {
+                                if( options.log ) {
+                                        sout | "=== File Not Found (" | nonl;
+                                        write(sout, file, name_size);
+                                        sout | ") ===";
+                                }
+                                answer_error(fd, E405);
+                                continue REQUEST;
+                        }
+
                         // Get the fd from the file cache
                         int ans_fd;
@@ -104 +114 @@
                         // If we can't find the file, return 404
                         if( ans_fd < 0 ) {
-                                sout | "=== File Not Found (" | nonl;
-                                write(sout, file, name_size);
-                                sout | ") ===";
+                                if( options.log ) {
+                                        sout | "=== File Not Found (" | nonl;
+                                        write(sout, file, name_size);
+                                        sout | ") ===";
+                                }
                                 answer_error(fd, E404);
                                 continue REQUEST;