Changeset 92538ab for benchmark/io/http/protocol.cfa

Timestamp:

Apr 10, 2022, 2:53:18 PM (4 years ago)

Author:

JiadaL <j82liang@…>

Branches:

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

Children:

d8e2a09

Parents:

4559b34 (diff), 6256891 (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:

Resolve conflict

File:

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

benchmark/io/http/protocol.cfa

@@ -24 +24 @@
 
 #include "options.hfa"
+#include "worker.hfa"
 
 #define PLAINTEXT_1WRITE
@@ -156 +157 @@
 
                 count -= ret;
-                offset += ret;
                 size_t in_pipe = ret;
                 SPLICE2: while(in_pipe > 0) {
@@ -173 +173 @@
 }
 
-static void zero_sqe(struct io_uring_sqe * sqe) {
-        sqe->flags = 0;
-        sqe->ioprio = 0;
-        sqe->fd = 0;
-        sqe->off = 0;
-        sqe->addr = 0;
-        sqe->len = 0;
-        sqe->fsync_flags = 0;
-        sqe->__pad2[0] = 0;
-        sqe->__pad2[1] = 0;
-        sqe->__pad2[2] = 0;
-        sqe->fd = 0;
-        sqe->off = 0;
-        sqe->addr = 0;
-        sqe->len = 0;
-}
-
 enum FSM_STATE {
         Initial,
@@ -266 +249 @@
 }
 
-static inline int wait_and_process(header_g & this) {
+static inline int wait_and_process(header_g & this, sendfile_stats_t & stats) {
         wait(this.f);
 
@@ -295 +278 @@
         }
 
+        stats.header++;
+
         // It must be a Short read
         this.len  -= this.f.result;
@@ -306 +291 @@
         io_future_t f;
         int fd; int pipe; size_t len; off_t off;
+        short zipf_idx;
         FSM_Result res;
 };
@@ -314 +300 @@
         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";
 }
 
@@ -329 +323 @@
 }
 
-static inline int wait_and_process(splice_in_t & this) {
+static inline int wait_and_process(splice_in_t & this, sendfile_stats_t & stats ) {
         wait(this.f);
 
@@ -345 +339 @@
                         return error(this.res, -ECONNRESET);
                 }
+                mutex(serr) serr | "SPLICE IN got" | error | ", WTF!";
+                return error(this.res, -ECONNRESET);
         }
 
@@ -357 +353 @@
                 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
@@ -398 +398 @@
 }
 
-static inline void wait_and_process(splice_out_g & this) {
+static inline void wait_and_process(splice_out_g & this, sendfile_stats_t & stats ) {
         wait(this.f);
 
@@ -414 +414 @@
                         return error(this, -ECONNRESET);
                 }
+                mutex(serr) serr | "SPLICE OUT got" | error | ", WTF!";
+                return error(this, -ECONNRESET);
         }
 
@@ -428 +430 @@
 
 SHORT_WRITE:
+        stats.splcot++;
+
         // It must be a Short Write
         this.len -= this.f.result;
@@ -434 +438 @@
 }
 
-int answer_sendfile( int pipe[2], int fd, int ans_fd, size_t fsize ) {
+int answer_sendfile( int pipe[2], int fd, int ans_fd, size_t fsize, sendfile_stats_t & stats ) {
+        stats.calls++;
         #if defined(LINKED_IO)
                 char buffer[512];
@@ -443 +448 @@
 
                 RETRY_LOOP: for() {
+                        stats.tries++;
                         int have = need(header.res) + need(splice_in.res) + 1;
                         int idx = 0;
@@ -461 +467 @@
                         // we may need to kill the connection if it fails
                         // If it already completed, this is a no-op
-                        wait_and_process(splice_in);
+                        wait_and_process(splice_in, stats);
 
                         if(is_error(splice_in.res)) {
@@ -469 +475 @@
 
                         // Process the other 2
-                        wait_and_process(header);
-                        wait_and_process(splice_out);
+                        wait_and_process(header, stats);
+                        wait_and_process(splice_out, stats);
 
                         if(is_done(splice_out.res)) {
@@ -490 +496 @@
                 return len + fsize;
         #else
+                stats.tries++;
                 int ret = answer_header(fd, fsize);
                 if( ret < 0 ) { close(fd); return ret; }