Changes in benchmark/io/http/worker.cfa [3f95dab:07997cd]

File:

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

benchmark/io/http/worker.cfa

@@ -13 +13 @@
 #include "protocol.hfa"
 #include "filecache.hfa"
-
-static const unsigned long long period = 50_000_000;
 
 //=============================================================================================
@@ -97 +95 @@
                 // Send the desired file
                 int ret = answer_sendfile( this.pipe, fd, ans_fd, count, this.stats.sendfile );
-                if(ret < 0) {
-                        if( ret == -ECONNABORTED ) break REQUEST;
-                        if( ret == -ECONNRESET ) break REQUEST;
-                        if( ret == -EPIPE ) break REQUEST;
-                        abort( "sendfile error: %d (%d) %s\n", ret, (int)errno, strerror(errno) );
-                }
+                if( ret == -ECONNRESET ) break REQUEST;
 
                 if( options.log ) mutex(sout) sout | "=== Answer sent ===";
@@ -109 +102 @@
         if (stats_thrd) {
                 unsigned long long next = rdtscl();
-                if(next > (last + period)) {
+                if(next > (last + 500000000)) {
                         if(try_lock(stats_thrd->stats.lock __cfaabi_dbg_ctx2)) {
                                 push(this.stats.sendfile, stats_thrd->stats.send);
@@ -148 +141 @@
                 char buffer[len];
                 handle_connection( this.conn, fd, buffer, len, 0p, last );
-                this.conn.stats.sendfile.maxfd = max(this.conn.stats.sendfile.maxfd, fd);
-                this.conn.stats.sendfile.close++;
 
                 if( options.log ) mutex(sout) sout | "=== Connection closed ===";
@@ -171 +162 @@
         /* paranoid */ assert( this.conn.pipe[0] != -1 );
         /* paranoid */ assert( this.conn.pipe[1] != -1 );
-        this.conn.stats.sendfile.maxfd = max(this.conn.pipe[0], this.conn.pipe[1]);
         for() {
                 size_t len = options.socket.buflen;
@@ -183 +173 @@
                 if( options.log ) mutex(sout) sout | "=== Waiting new connection ===";
                 handle_connection( this.conn, p.out.fd, buffer, len, &p.f, last );
+
+                if( options.log ) mutex(sout) sout | "=== Connection closed ===";
                 if(this.done) break;
-                this.conn.stats.sendfile.maxfd = max(this.conn.stats.sendfile.maxfd, p.out.fd);
-                this.conn.stats.sendfile.close++;
-
-                if( options.log ) mutex(sout) sout | "=== Connection closed ===";
-        }
-
-        lock(stats_thrd->stats.lock __cfaabi_dbg_ctx2);
-        push(this.conn.stats.sendfile, stats_thrd->stats.send);
-        unlock(stats_thrd->stats.lock);
+        }
 }
 
@@ -214 +198 @@
 
 static inline void push_connection( Acceptor & this, int fd ) {
-        this.stats.accepts++;
         PendingRead * p = 0p;
         for() {
@@ -229 +212 @@
 
 // #define ACCEPT_SPIN
-#define ACCEPT_ONE
-// #define ACCEPT_MANY
+#define ACCEPT_MANY
 
 void main( Acceptor & this ) {
@@ -250 +232 @@
                         abort( "accept error: (%d) %s\n", (int)errno, strerror(errno) );
                 }
+                this.stats.accepts++;
 
                 if(this.done) return;
@@ -259 +242 @@
                 if (stats_thrd) {
                         unsigned long long next = rdtscl();
-                        if(next > (last + period)) {
-                                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 ===";
-        }
-
-#elif defined(ACCEPT_ONE)
-        if( options.log ) sout | "=== Accepting connection ===";
-        for() {
-                int fd = cfa_accept4(this.sockfd, this.[addr, addrlen, flags], 0);
-                if(fd < 0) {
-                        if( errno == ECONNABORTED ) break;
-                        if( this.done && (errno == EINVAL || errno == EBADF) ) break;
-                        abort( "accept error: (%d) %s\n", (int)errno, strerror(errno) );
-                }
-
-                if(this.done) return;
-
-                if( options.log ) sout | "=== New connection" | fd | "" | ", waiting for requests ===";
-
-                if(fd) push_connection(this, fd);
-
-                if (stats_thrd) {
-                        unsigned long long next = rdtscl();
-                        if(next > (last + period)) {
+                        if(next > (last + 500000000)) {
                                 if(try_lock(stats_thrd->stats.lock)) {
                                         push(this.stats, stats_thrd->stats.accpt);
@@ -316 +269 @@
                 if (stats_thrd) {
                         unsigned long long next = rdtscl();
-                        if(next > (last + period)) {
+                        if(next > (last + 500000000)) {
                                 if(try_lock(stats_thrd->stats.lock __cfaabi_dbg_ctx2)) {
                                         push(this.stats, stats_thrd->stats.accpt);
@@ -331 +284 @@
                                 int fd = get_res(res);
                                 reset(res);
+                                this.stats.accepts++;
                                 if(fd < 0) {
                                         if( errno == ECONNABORTED ) continue;
@@ -365 +319 @@
 #error no accept algorithm specified
 #endif
-        lock(stats_thrd->stats.lock);
-        push(this.stats, stats_thrd->stats.accpt);
-        unlock(stats_thrd->stats.lock);
-}
+}