Changeset 266ecf1 for benchmark/io/http/worker.cfa

Timestamp:

Mar 2, 2021, 5:28:32 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

6083392

Parents:

182256b (diff), 9eb7a532 (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/worker.cfa (modified) (5 diffs)

benchmark/io/http/worker.cfa

@@ -17 +17 @@
 //=============================================================================================
 void ?{}( Worker & this ) {
-        ((thread&)this){ "Server Worker Thread", *options.clopts.instance };
+        size_t cli = rand() % options.clopts.cltr_cnt;
+        ((thread&)this){ "Server Worker Thread", *options.clopts.instance[cli] };
+        options.clopts.thrd_cnt[cli]++;
         this.pipe[0] = -1;
         this.pipe[1] = -1;
@@ -35 +37 @@
         for() {
                 if( options.log ) sout | "=== Accepting connection ===";
-                int fd = cfa_accept4( this.[sockfd, addr, addrlen, flags], 0, -1`s, &this.cancel, 0p );
-                // int fd = accept4( this.[sockfd, addr, addrlen, flags] );
+                int fd = cfa_accept4( this.[sockfd, addr, addrlen, flags], CFA_IO_LAZY );
                 if(fd < 0) {
                         if( errno == ECONNABORTED ) break;
@@ -42 +43 @@
                         abort( "accept error: (%d) %s\n", (int)errno, strerror(errno) );
                 }
+                if(this.done) break;
 
                 if( options.log ) sout | "=== New connection" | fd | "" | ", waiting for requests ===";
@@ -55 +57 @@
                         char buffer[len];
                         if( options.log ) sout | "=== Reading request ===";
-                        [code, closed, file, name_size] = http_read(fd, buffer, len, &this.cancel);
+                        [code, closed, file, name_size] = http_read(fd, buffer, len);
 
                         // if we are done, break out of the loop
@@ -70 +72 @@
                                 if( options.log ) sout | "=== Request for /plaintext ===";
 
-                                char text[] = "Hello, World!\n";
-
-                                // Send the header
-                                int ret = answer_plain(fd, text, sizeof(text));
+                                int ret = answer_plaintext(fd);
                                 if( ret == -ECONNRESET ) break REQUEST;