Changeset 137974a for benchmark/io/http/worker.cfa

Timestamp:

Jun 9, 2022, 10:56:34 AM (8 months ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

master, pthread-emulation, qualifiedEnum

Children:

430ce61

Parents:

8c58e73

Message:

Moved stats printer to it's own file and now using push-stats rather than pull

File:

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

benchmark/io/http/worker.cfa

@@ -14 +14 @@
 #include "filecache.hfa"
 
-void ?{}( sendfile_stats_t & this ) {
-        this.calls = 0;
-        this.tries = 0;
-        this.header = 0;
-        this.splcin = 0;
-        this.splcot = 0;
-        for(i; zipf_cnts) {
-                this.avgrd[i].calls = 0;
-                this.avgrd[i].bytes = 0;
-        }
-}
-
 //=============================================================================================
 // Generic connection handling
 //=============================================================================================
-static void handle_connection( connection & this, volatile int & fd, char * buffer, size_t len, io_future_t * f ) {
+static void handle_connection( connection & this, volatile int & fd, char * buffer, size_t len, io_future_t * f, unsigned long long & last ) {
         REQUEST:
         for() {
@@ -111 +99 @@
                 if( options.log ) sout | "=== Answer sent ===";
         }
+
+        if (stats_thrd) {
+                unsigned long long next = rdtscl();
+                if(next > (last + 500000000)) {
+                        if(try_lock(stats_thrd->stats.lock)) {
+                                push(this.stats.sendfile, stats_thrd->stats.send);
+                                unlock(stats_thrd->stats.lock);
+                                last = next;
+                        }
+                }
+        }
 }
 
@@ -124 +123 @@
 void main( AcceptWorker & this ) {
         park();
+        unsigned long long last = rdtscl();
         /* paranoid */ assert( this.conn.pipe[0] != -1 );
         /* paranoid */ assert( this.conn.pipe[1] != -1 );
@@ -139 +139 @@
                 size_t len = options.socket.buflen;
                 char buffer[len];
-                handle_connection( this.conn, fd, buffer, len, 0p );
+                handle_connection( this.conn, fd, buffer, len, 0p, last );
 
                 if( options.log ) sout | "=== Connection closed ===";
@@ -157 +157 @@
 void main( ChannelWorker & this ) {
         park();
+        unsigned long long last = rdtscl();
         /* paranoid */ assert( this.conn.pipe[0] != -1 );
         /* paranoid */ assert( this.conn.pipe[1] != -1 );
@@ -168 +169 @@
 
                 if( options.log ) sout | "=== Waiting new connection ===";
-                handle_connection( this.conn, p.out.fd, buffer, len, &p.f );
+                handle_connection( this.conn, p.out.fd, buffer, len, &p.f, last );
 
                 if( options.log ) sout | "=== Connection closed ===";
@@ -187 +188 @@
 void main( Acceptor & this ) {
         park();
+        unsigned long long last = rdtscl();
         if( options.log ) sout | "=== Accepting connection ===";
         for() {
@@ -192 +194 @@
                 if(fd < 0) {
                         if( errno == EWOULDBLOCK) {
+                                this.stats.eagains++;
                                 yield();
                                 continue;
@@ -199 +202 @@
                         abort( "accept error: (%d) %s\n", (int)errno, strerror(errno) );
                 }
+                this.stats.accepts++;
+
                 if(this.done) return;
 
@@ -210 +215 @@
                                 if(p) break;
                                 yield();
+                                this.stats.creates++;
                         };
 
@@ -216 +222 @@
                 }
 
+                if (stats_thrd) {
+                        unsigned long long next = rdtscl();
+                        if(next > (last + 500000000)) {
+                                if(try_lock(stats_thrd->stats.lock)) {
+                                        push(this.stats, stats_thrd->stats.accpt);
+                                        unlock(stats_thrd->stats.lock);
+                                        last = next;
+                                }
+                        }
+                }
+
                 if( options.log ) sout | "=== Accepting connection ===";
         }