Changeset 7f389a5c

Timestamp:

Jul 16, 2020, 2:56:45 PM (4 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:

79306383

Parents:

0aec496

Message:

Added support for argument parsing.
Removed unnecessary headers.
Fixed magic number in splice.

Location:

benchmark/io/http

Files:

• main.cfa (modified) (5 diffs)
• parseargs.cfa (added)
• parseargs.hfa (added)
• worker.cfa (modified) (3 diffs)

benchmark/io/http/main.cfa

@@ -7 +7 @@
 extern "C" {
         #include <sys/socket.h>
-        #include <sys/types.h>
         #include <netinet/in.h>
 }
@@ -18 +17 @@
 #include "filecache.hfa"
 #include "options.hfa"
+#include "parseargs.hfa"
 #include "worker.hfa"
 
@@ -57 +57 @@
 int main( int argc, char * argv[] ) {
         int port      = 8080;
-        int ret       = 0;
         int backlog   = 10;
         int nprocs    = 1;
@@ -66 +65 @@
         //===================
         // Parse args
+        static cfa_option opt[] = {
+                {'p', "port", "Port the server will listen on", port},
+                {'c', "cpus", "Number of processors to use", nprocs},
+                {'t', "threads", "Number of worker threads to use", nworkers},
+                {'b', "accept-backlog", "Maximum number of pending accepts", backlog},
+                {'B', "channel-size", "Maximum number of accepted connection pending", chan_size}
+        };
+        int opt_cnt = sizeof(opt) / sizeof(cfa_option);
+
+        char **left;
+      parse_args( argc, argv, opt, opt_cnt, "[OPTIONS] [PATH]  -- cforall http server", left );
+
 
         //===================
@@ -80 +91 @@
         }
 
+        int ret = 0;
         struct sockaddr_in address;
         int addrlen = sizeof(address);

benchmark/io/http/worker.cfa

@@ -7 +7 @@
 #include <string.h>
 extern "C" {
+        #include <fcntl.h>
         #include <sys/socket.h>
         #include <sys/types.h>
-        #include <linux/fcntl.h>
-        #include <linux/stat.h>
         #include <netinet/in.h>
 }
@@ -37 +36 @@
         ssize_t ret;
         SPLICE1: while(count > 0) {
-                ret = cfa_splice(ans_fd, &offset, this.pipe[1], 0p, count, 5);
+                ret = cfa_splice(ans_fd, &offset, this.pipe[1], 0p, count, SPLICE_F_MOVE | SPLICE_F_MORE);
                 if( ret < 0 ) {
                         if( errno != EAGAIN && errno != EWOULDBLOCK) continue SPLICE1;
@@ -47 +46 @@
                 size_t in_pipe = ret;
                 SPLICE2: while(in_pipe > 0) {
-                        ret = cfa_splice(this.pipe[0], 0p, fd, 0p, in_pipe, 5);
+                        ret = cfa_splice(this.pipe[0], 0p, fd, 0p, in_pipe, SPLICE_F_MOVE | SPLICE_F_MORE);
                         if( ret < 0 ) {
                                 if( errno != EAGAIN && errno != EWOULDBLOCK) continue SPLICE2;