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

Timestamp:

Jun 9, 2022, 2:26:43 PM (2 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

c06551b

Parents:

db7a3ad (diff), 430ce61 (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.hfa (modified) (3 diffs)

benchmark/io/http/worker.hfa

@@ -1 +1 @@
 #pragma once
 
+#include <iofwd.hfa>
+#include <queueLockFree.hfa>
 #include <thread.hfa>
 
@@ -7 +9 @@
 }
 
+#include "printer.hfa"
+
 //=============================================================================================
 // Worker Thread
 //=============================================================================================
 
-extern const size_t zipf_sizes[];
-enum { zipf_cnts = 36, };
-
-struct sendfile_stats_t {
-        volatile uint64_t calls;
-        volatile uint64_t tries;
-        volatile uint64_t header;
-        volatile uint64_t splcin;
-        volatile uint64_t splcot;
+struct connection {
+        int pipe[2];
         struct {
-                volatile uint64_t calls;
-                volatile uint64_t bytes;
-        } avgrd[zipf_cnts];
+                sendfile_stats_t sendfile;
+        } stats;
 };
 
-thread Worker {
-        int pipe[2];
+static inline void ?{}( connection & this ) {
+        this.pipe[0] = -1;
+        this.pipe[1] = -1;
+}
+
+thread AcceptWorker {
+        connection conn;
         int sockfd;
         struct sockaddr * addr;
@@ -33 +34 @@
         int flags;
         volatile bool done;
+};
+void ?{}( AcceptWorker & this);
+void main( AcceptWorker & );
+
+
+struct PendingRead {
+        PendingRead * volatile next;
+        io_future_t f;
         struct {
-                sendfile_stats_t sendfile;
-        } stats;
+                void * buf;
+                size_t len;
+        } in;
+        struct {
+                volatile int fd;
+        } out;
 };
-void ?{}( Worker & this);
-void main( Worker & );
+
+static inline PendingRead * volatile & ?`next ( PendingRead * node ) {
+        return node->next;
+}
+
+thread ChannelWorker {
+        connection conn;
+        volatile bool done;
+        mpsc_queue(PendingRead) * queue;
+};
+void ?{}( ChannelWorker & );
+void main( ChannelWorker & );
+
+thread Acceptor {
+        mpsc_queue(PendingRead) * queue;
+        int sockfd;
+        struct sockaddr * addr;
+        socklen_t * addrlen;
+        int flags;
+        volatile bool done;
+        acceptor_stats_t stats;
+};
+void ?{}( Acceptor & );
+void main( Acceptor & );