Changes in benchmark/io/http/worker.hfa [329e26a:ef3c383]

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>
 
@@ -9 +7 @@
 }
 
-#include "printer.hfa"
-
 //=============================================================================================
 // Worker Thread
 //=============================================================================================
 
-struct connection {
-        int pipe[2];
+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 {
-                sendfile_stats_t sendfile;
-        } stats;
+                volatile uint64_t calls;
+                volatile uint64_t bytes;
+        } avgrd[zipf_cnts];
 };
 
-static inline void ?{}( connection & this ) {
-        this.pipe[0] = -1;
-        this.pipe[1] = -1;
-}
-
-thread AcceptWorker {
-        connection conn;
+thread Worker {
+        int pipe[2];
         int sockfd;
         struct sockaddr * addr;
@@ -34 +33 @@
         int flags;
         volatile bool done;
+        struct {
+                sendfile_stats_t sendfile;
+        } stats;
 };
-void ?{}( AcceptWorker & this);
-void main( AcceptWorker & );
-
-
-struct PendingRead {
-        PendingRead * volatile next;
-        io_future_t f;
-        struct {
-                void * buf;
-                size_t len;
-        } in;
-        struct {
-                volatile int fd;
-        } out;
-};
-
-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 &, int cli );
-void main( Acceptor & );
+void ?{}( Worker & this);
+void main( Worker & );