Changeset 7770cc8 for benchmark/io/http/options.cfa

Timestamp:

Nov 24, 2021, 9:47:56 PM (4 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

5235d49

Parents:

94647b0b (diff), 3cc1111 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

benchmark/io/http/options.cfa

@@ -21 +21 @@
         false, // log
         false, // stats
+        true, // interactive
+        0, // redirect
+        0, // redirect
 
         { // file_cache
@@ -52 +55 @@
         // bool sqkpoll = false;
         // bool iokpoll = false;
-        unsigned nentries = 16;
+        unsigned nentries = 0;
         bool isolate = false;
 
@@ -62 +65 @@
                 {'\0', "isolate",        "Create one cluster per processor", isolate, parse_settrue},
                 {'\0', "log",            "Enable logs", options.log, parse_settrue},
+                {'\0', "sout",           "Redirect standard out to file", options.reopen_stdout},
+                {'\0', "serr",           "Redirect standard error to file", options.reopen_stderr},
                 {'\0', "stats",          "Enable statistics", options.stats, parse_settrue},
+                {'\0', "shell",          "Disable interactive mode", options.interactive, parse_setfalse},
                 {'\0', "accept-backlog", "Maximum number of pending accepts", options.socket.backlog},
                 {'\0', "request_len",    "Maximum number of bytes in the http request, requests with more data will be answered with Http Code 414", options.socket.buflen},
@@ -79 +85 @@
         parse_args( argc, argv, opt, opt_cnt, "[OPTIONS]... [PATH]\ncforall http server", left );
 
-        if( !is_pow2(nentries) ) {
+        if( nentries != 0 && !is_pow2(nentries) ) {
                 unsigned v = nentries;
                 v--;
@@ -131 +137 @@
 
         options.file_cache.path = path;
+
+        if( options.reopen_stdout && options.reopen_stderr && 0 == strcmp(options.reopen_stdout, options.reopen_stderr) ) {
+                serr | "Redirect sout and serr to the same file is not supported";
+                exit(EXIT_FAILURE);
+        }
+
+        if( options.reopen_stdout ) {
+                sout | "redirecting sout to '" | options.reopen_stdout | "'";
+                FILE  * ret = freopen( options.reopen_stdout, "w", stdout);
+                if( ret == 0p ) {
+                        serr | "Failed to redirect sout to '" | options.reopen_stdout | "'";
+                        exit(EXIT_FAILURE);
+                }
+        }
+
+        if( options.reopen_stderr ) {
+                sout | "redirecting serr to '" | options.reopen_stderr | "'";
+                FILE  * ret = freopen( options.reopen_stderr, "w", stderr);
+                if( ret == 0p ) {
+                        serr | "Failed to redirect serr to '" | options.reopen_stderr | "'";
+                        exit(EXIT_FAILURE);
+                }
+        }
 }