Changeset aeb20a4 for benchmark/io/http/protocol.cfa

Timestamp:

Jun 9, 2022, 2:26:43 PM (23 months ago)

Author:

caparsons <caparson@…>

Branches:

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

Children:

c06551b

Parents:

db7a3ad (diff), 430ce61 (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:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

benchmark/io/http/protocol.cfa

@@ -30 +30 @@
 #define PLAINTEXT_NOCOPY
 #define LINKED_IO
+
+static inline __s32 wait_res( io_future_t & this ) {
+        wait( this );
+        if( this.result < 0 ) {{
+                errno = -this.result;
+                return -1;
+        }}
+        return this.result;
+}
 
 struct https_msg_str {
@@ -470 +479 @@
 
                         if(is_error(splice_in.res)) {
+                                if(splice_in.res.error == -EPIPE) return -ECONNRESET;
                                 mutex(serr) serr | "SPLICE IN failed with" | splice_in.res.error;
                                 close(fd);
@@ -503 +513 @@
 }
 
-[HttpCode code, bool closed, * const char file, size_t len] http_read(int fd, []char buffer, size_t len) {
+[HttpCode code, bool closed, * const char file, size_t len] http_read(volatile int & fd, []char buffer, size_t len, io_future_t * f) {
         char * it = buffer;
         size_t count = len - 1;
@@ -509 +519 @@
         READ:
         for() {
-                int ret = cfa_recv(fd, (void*)it, count, 0, CFA_IO_LAZY);
+                int ret;
+                if( f ) {
+                        ret = wait_res(*f);
+                        reset(*f);
+                        f = 0p;
+                } else {
+                        ret = cfa_recv(fd, (void*)it, count, 0, CFA_IO_LAZY);
+                }
                 // int ret = read(fd, (void*)it, count);
                 if(ret == 0 ) return [OK200, true, 0, 0];
@@ -570 +587 @@
 
 void ?{}( DateFormater & this ) {
-        ((thread&)this){ "Server Date Thread", *options.clopts.instance[0] };
+        ((thread&)this){ "Server Date Thread", *options.clopts.instance };
         this.idx = 0;
         memset( &this.buffers[0], 0, sizeof(this.buffers[0]) );