Changes in benchmark/io/http/protocol.cfa [ef3c383:644162a]

File:

• benchmark/io/http/protocol.cfa (modified) (17 diffs)

benchmark/io/http/protocol.cfa

@@ -24 +24 @@
 
 #include "options.hfa"
-#include "worker.hfa"
 
 #define PLAINTEXT_1WRITE
@@ -157 +156 @@
 
                 count -= ret;
+                offset += ret;
                 size_t in_pipe = ret;
                 SPLICE2: while(in_pipe > 0) {
@@ -266 +266 @@
 }
 
-static inline int wait_and_process(header_g & this, sendfile_stats_t & stats) {
+static inline int wait_and_process(header_g & this) {
         wait(this.f);
 
@@ -295 +295 @@
         }
 
-        stats.header++;
-
         // It must be a Short read
         this.len  -= this.f.result;
@@ -308 +306 @@
         io_future_t f;
         int fd; int pipe; size_t len; off_t off;
-        short zipf_idx;
         FSM_Result res;
 };
@@ -317 +314 @@
         this.len = len;
         this.off = 0;
-        this.zipf_idx = -1;
-        STATS: for(i; zipf_cnts) {
-                if(len <= zipf_sizes[i]) {
-                        this.zipf_idx = i;
-                        break STATS;
-                }
-        }
-        if(this.zipf_idx < 0) mutex(serr) serr | "SPLICE IN" | len | " greated than biggest zipf file";
 }
 
@@ -340 +329 @@
 }
 
-static inline int wait_and_process(splice_in_t & this, sendfile_stats_t & stats ) {
+static inline int wait_and_process(splice_in_t & this) {
         wait(this.f);
 
@@ -356 +345 @@
                         return error(this.res, -ECONNRESET);
                 }
-                mutex(serr) serr | "SPLICE IN got" | error | ", WTF!";
-                return error(this.res, -ECONNRESET);
         }
 
@@ -370 +357 @@
                 return done(this.res);
         }
-
-        stats.splcin++;
-        stats.avgrd[this.zipf_idx].calls++;
-        stats.avgrd[this.zipf_idx].bytes += this.f.result;
 
         // It must be a Short read
@@ -415 +398 @@
 }
 
-static inline void wait_and_process(splice_out_g & this, sendfile_stats_t & stats ) {
+static inline void wait_and_process(splice_out_g & this) {
         wait(this.f);
 
@@ -431 +414 @@
                         return error(this, -ECONNRESET);
                 }
-                mutex(serr) serr | "SPLICE OUT got" | error | ", WTF!";
-                return error(this, -ECONNRESET);
         }
 
@@ -447 +428 @@
 
 SHORT_WRITE:
-        stats.splcot++;
-
         // It must be a Short Write
         this.len -= this.f.result;
@@ -455 +434 @@
 }
 
-int answer_sendfile( int pipe[2], int fd, int ans_fd, size_t fsize, sendfile_stats_t & stats ) {
-        stats.calls++;
+int answer_sendfile( int pipe[2], int fd, int ans_fd, size_t fsize ) {
         #if defined(LINKED_IO)
                 char buffer[512];
@@ -465 +443 @@
 
                 RETRY_LOOP: for() {
-                        stats.tries++;
                         int have = need(header.res) + need(splice_in.res) + 1;
                         int idx = 0;
@@ -484 +461 @@
                         // we may need to kill the connection if it fails
                         // If it already completed, this is a no-op
-                        wait_and_process(splice_in, stats);
+                        wait_and_process(splice_in);
 
                         if(is_error(splice_in.res)) {
@@ -492 +469 @@
 
                         // Process the other 2
-                        wait_and_process(header, stats);
-                        wait_and_process(splice_out, stats);
+                        wait_and_process(header);
+                        wait_and_process(splice_out);
 
                         if(is_done(splice_out.res)) {
@@ -513 +490 @@
                 return len + fsize;
         #else
-                stats.tries++;
                 int ret = answer_header(fd, fsize);
                 if( ret < 0 ) { close(fd); return ret; }