Changeset cd4c605

Timestamp:

Nov 19, 2021, 3:04:12 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

059ad16

Parents:

1757f98 (diff), c60e5094 (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

Location:

benchmark/io/http

Files:

• main.cfa (modified) (1 diff)
• protocol.cfa (modified) (5 diffs)
• worker.cfa (modified) (1 diff)

benchmark/io/http/main.cfa

@@ -150 +150 @@
                         if(errno == EADDRINUSE) {
                                 if(waited == 0) {
+                                        if(!options.interactive) abort | "Port already in use in non-interactive mode. Aborting";
                                         sout | "Waiting for port";
                                 } else {

benchmark/io/http/protocol.cfa

@@ -332 +332 @@
         wait(this.f);
 
-        // Did something crazy happen?
-        if(this.f.result > this.len) {
-                mutex(serr) serr | "SPLICE IN spliced too much!";
-                return error(this.res, -ERANGE);
-        }
-
         // Something failed?
         if(this.f.result < 0) {
@@ -351 +345 @@
                         return error(this.res, -ECONNRESET);
                 }
+        }
+
+        // Did something crazy happen?
+        if(this.f.result > this.len) {
+                mutex(serr) serr | "SPLICE IN spliced too much!";
+                return error(this.res, -ERANGE);
         }
 
@@ -401 +401 @@
         wait(this.f);
 
-        // Did something crazy happen?
-        if(this.f.result > this.len) {
-                mutex(serr) serr | "SPLICE OUT spliced too much!";
-                return error(this.res, -ERANGE);
-        }
-
         // Something failed?
         if(this.f.result < 0) {
@@ -420 +414 @@
                         return error(this, -ECONNRESET);
                 }
+        }
+
+        // Did something crazy happen?
+        if(this.f.result > this.len) {
+                mutex(serr) serr | "SPLICE OUT spliced too much!" | this.f.result | ">" | this.len;
+                return error(this.res, -ERANGE);
         }
 
@@ -544 +544 @@
 const char * original_http_msgs[] = {
         "HTTP/1.1 200 OK\nServer: HttpForall\nDate: %s \nContent-Type: text/plain\nContent-Length: ",
-        "HTTP/1.1 200 OK\r\nServer: HttpForall\r\nDate\r\nConnection: keep-alive\r\nContent-Length: 15\r\nContent-Type: text/html: %s \r\n\r\nHello, World!\r\n",
+        "HTTP/1.1 200 OK\r\nServer: HttpForall\r\nConnection: keep-alive\r\nContent-Length: 15\r\nContent-Type: text/html\r\nDate: %s \r\n\r\nHello, World!\r\n",
         "HTTP/1.1 400 Bad Request\nServer: HttpForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
         "HTTP/1.1 404 Not Found\nServer: HttpForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",

benchmark/io/http/worker.cfa

@@ -18 +18 @@
 void ?{}( Worker & this ) {
         size_t cli = rand() % options.clopts.cltr_cnt;
-        ((thread&)this){ "Server Worker Thread", *options.clopts.instance[cli], 512000 };
+        ((thread&)this){ "Server Worker Thread", *options.clopts.instance[cli], 64000 };
         options.clopts.thrd_cnt[cli]++;
         this.pipe[0] = -1;