Changeset c76bd34 for benchmark/io/http/worker.hfa

Timestamp:

Oct 7, 2020, 4:31:43 PM (5 years ago)

Author:

Colby Alexander Parsons <caparsons@…>

Branches:

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

Children:

848439f

Parents:

ae2c27a (diff), 597c5d18 (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 into master

File:

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

benchmark/io/http/worker.hfa

@@ -7 +7 @@
 }
 
-#include "channel.hfa"
-
-extern channel & wait_connect;
-
 //=============================================================================================
 // Worker Thread
@@ -17 +13 @@
 thread Worker {
         int pipe[2];
-};
-void ?{}( Worker & this );
-void main( Worker & );
-
-//=============================================================================================
-// Acceptor Thread
-//=============================================================================================
-thread Acceptor {
         int sockfd;
         struct sockaddr * addr;
@@ -30 +18 @@
         int flags;
 };
-
-void ?{}( Acceptor & this, int sockfd, struct sockaddr * addr, socklen_t * addrlen, int flags );
-void main( Acceptor & this );
+void ?{}( Worker & this);
+void main( Worker & );