Changeset 3f95dab for benchmark/io/http/protocol.cfa

Timestamp:

Jul 28, 2022, 12:04:19 PM (21 months ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

c4c8571

Parents:

7ce8873

Message:

Committing hopefully last version of the webserver

File:

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

benchmark/io/http/protocol.cfa

@@ -29 +29 @@
 #define PLAINTEXT_MEMCPY
 #define PLAINTEXT_NOCOPY
-#define LINKED_IO
+// #define LINKED_IO
 
 static inline __s32 wait_res( io_future_t & this ) {
@@ -72 +72 @@
                 if( ret < 0 ) {
                         if( errno == ECONNRESET || errno == EPIPE ) { close(fd); return -ECONNRESET; }
-                        if( errno == EAGAIN || errno == EWOULDBLOCK) return -EAGAIN;
 
                         abort( "'answer error' error: (%d) %s\n", (int)errno, strerror(errno) );
@@ -152 +151 @@
 }
 
-static int sendfile( int pipe[2], int fd, int ans_fd, size_t count ) {
+static int sendfile( int pipe[2], int fd, int ans_fd, size_t count, sendfile_stats_t & stats ) {
+        int zipf_idx = -1;
+        STATS: for(i; zipf_cnts) {
+                if(count <= zipf_sizes[i]) {
+                        zipf_idx = i;
+                        break STATS;
+                }
+        }
+        if(zipf_idx < 0) mutex(serr) serr | "SENDFILE" | count | " greated than biggest zipf file";
+
+
         unsigned sflags = SPLICE_F_MOVE; // | SPLICE_F_MORE;
         off_t offset = 0;
         ssize_t ret;
         SPLICE1: while(count > 0) {
-                ret = cfa_splice(ans_fd, &offset, pipe[1], 0p, count, sflags, CFA_IO_LAZY);
-                if( ret < 0 ) {
-                        if( errno != EAGAIN && errno != EWOULDBLOCK) continue SPLICE1;
+                stats.tries++;
+                // ret = cfa_splice(ans_fd, &offset, pipe[1], 0p, count, sflags, CFA_IO_LAZY);
+                ret = splice(ans_fd, &offset, pipe[1], 0p, count, sflags);
+                if( ret <= 0 ) {
                         if( errno == ECONNRESET ) return -ECONNRESET;
                         if( errno == EPIPE ) return -EPIPE;
-                        abort( "splice [0] error: (%d) %s\n", (int)errno, strerror(errno) );
-                }
-
+                        abort( "splice [0] error: %d (%d) %s\n", ret, (int)errno, strerror(errno) );
+                }
                 count -= ret;
+                stats.splcin++;
+                if(count > 0) stats.avgrd[zipf_idx].calls++;
+                stats.avgrd[zipf_idx].bytes += ret;
+
                 size_t in_pipe = ret;
                 SPLICE2: while(in_pipe > 0) {
-                        ret = cfa_splice(pipe[0], 0p, fd, 0p, in_pipe, sflags, CFA_IO_LAZY);
-                        if( ret < 0 ) {
-                                if( errno != EAGAIN && errno != EWOULDBLOCK) continue SPLICE2;
+                        // ret = cfa_splice(pipe[0], 0p, fd, 0p, in_pipe, sflags, CFA_IO_LAZY);
+                        ret = splice(pipe[0], 0p, fd, 0p, in_pipe, sflags);
+                        if( ret <= 0 ) {
                                 if( errno == ECONNRESET ) return -ECONNRESET;
                                 if( errno == EPIPE ) return -EPIPE;
-                                abort( "splice [1] error: (%d) %s\n", (int)errno, strerror(errno) );
+                                abort( "splice [1] error: %d (%d) %s\n", ret, (int)errno, strerror(errno) );
                         }
+                        stats.splcot++;
                         in_pipe -= ret;
                 }
@@ -506 +520 @@
                 return len + fsize;
         #else
-                stats.tries++;
                 int ret = answer_header(fd, fsize);
                 if( ret < 0 ) { close(fd); return ret; }
-                return sendfile(pipe, fd, ans_fd, fsize);
+                return sendfile(pipe, fd, ans_fd, fsize, stats);
         #endif
 }
@@ -528 +541 @@
                 }
                 // int ret = read(fd, (void*)it, count);
-                if(ret == 0 ) return [OK200, true, 0, 0];
+                if(ret == 0 ) { close(fd); return [OK200, true, 0, 0]; }
                 if(ret < 0 ) {
-                        if( errno == EAGAIN || errno == EWOULDBLOCK) continue READ;
                         if( errno == ECONNRESET ) { close(fd); return [E408, true, 0, 0]; }
                         if( errno == EPIPE ) { close(fd); return [E408, true, 0, 0]; }