Changeset 7a80113 for benchmark/io/http/worker.cfa

Timestamp:

Sep 22, 2020, 11:29:12 AM (4 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:

0a945fd

Parents:

1c507eb (diff), 08f3ad3 (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) (2 diffs)

benchmark/io/http/worker.cfa

@@ -28 +28 @@
         CONNECTION:
         for() {
-                int fd = take(wait_connect);
-                if (fd < 0) break;
+                int fd = cfa_accept4( this.[sockfd, addr, addrlen, flags], 0, -1`s, 0p, 0p );
+                if(fd < 0) {
+                        if( errno == ECONNABORTED ) break;
+                        abort( "accept error: (%d) %s\n", (int)errno, strerror(errno) );
+                }
 
                 printf("New connection %d, waiting for requests\n", fd);
@@ -82 +85 @@
         }
 }
-
-//=============================================================================================
-// Acceptor Thread
-//=============================================================================================
-void ?{}( Acceptor & this, int sockfd, struct sockaddr * addr, socklen_t * addrlen, int flags ) {
-        ((thread&)this){ "Acceptor Thread", *options.clopts.instance };
-        this.sockfd  = sockfd;
-        this.addr    = addr;
-        this.addrlen = addrlen;
-        this.flags   = flags;
-}
-
-void main( Acceptor & this ) {
-        for() {
-                int ret = cfa_accept4( this.[sockfd, addr, addrlen, flags] );
-                if(ret < 0) {
-                        if( errno == ECONNABORTED ) break;
-                        abort( "accept error: (%d) %s\n", (int)errno, strerror(errno) );
-                }
-
-                printf("New connection accepted\n");
-                put( wait_connect, ret );
-        }
-}