Changeset 4f762d3 for benchmark/io/http/worker.cfa

Timestamp:

Feb 19, 2021, 1:48:14 PM (3 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:

d60d30e

Parents:

78da4ab

Message:

Fix httpforall after changes to I/O

File:

• benchmark/io/http/worker.cfa (modified) (3 diffs)

benchmark/io/http/worker.cfa

@@ -35 +35 @@
         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], 0 );
                 if(fd < 0) {
                         if( errno == ECONNABORTED ) break;
@@ -42 +41 @@
                         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 +55 @@
                         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