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

Timestamp:

Aug 28, 2020, 1:26:28 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

8e3034d

Parents:

8e2cb4a

Message:

Fixed some compilation errors.
Fixed file descriptor support in progress.

File:

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

benchmark/io/http/protocol.cfa

@@ -11 +11 @@
 extern "C" {
       int snprintf ( char * s, size_t n, const char * format, ... );
+        #include <linux/io_uring.h>
 }
 #include <string.h>
-
 #include <errno.h>
 
+#include "options.hfa"
 
 const char * http_msgs[] = {
@@ -74 +75 @@
         READ:
         for() {
-                int ret = cfa_read(fd, it, count);
-                if(ret == 0 ) return [OK200, true, 0p, 0];
+                int ret = cfa_read(fd, (void*)it, count, 0, -1`s, 0p, 0p);
+                if(ret == 0 ) return [OK200, true, 0, 0];
                 if(ret < 0 ) {
                         if( errno == EAGAIN || errno == EWOULDBLOCK) continue READ;
@@ -88 +89 @@
                 count -= ret;
 
-                if( count < 1 ) return [E414, false, 0p, 0];
+                if( count < 1 ) return [E414, false, 0, 0];
         }
 
@@ -95 +96 @@
         it = buffer;
         int ret = memcmp(it, "GET /", 5);
-        if( ret != 0 ) return [E400, false, 0p, 0];
+        if( ret != 0 ) return [E400, false, 0, 0];
         it += 5;
 
@@ -106 +107 @@
         ssize_t ret;
         SPLICE1: while(count > 0) {
-                ret = cfa_splice(ans_fd, &offset, pipe[1], 0p, count, SPLICE_F_MOVE | SPLICE_F_MORE);
+                ret = cfa_splice(ans_fd, &offset, pipe[1], 0p, count, SPLICE_F_MOVE | SPLICE_F_MORE, 0, -1`s, 0p, 0p);
                 if( ret < 0 ) {
                         if( errno != EAGAIN && errno != EWOULDBLOCK) continue SPLICE1;
@@ -116 +117 @@
                 size_t in_pipe = ret;
                 SPLICE2: while(in_pipe > 0) {
-                        ret = cfa_splice(pipe[0], 0p, fd, 0p, in_pipe, SPLICE_F_MOVE | SPLICE_F_MORE);
+                        ret = cfa_splice(pipe[0], 0p, fd, 0p, in_pipe, SPLICE_F_MOVE | SPLICE_F_MORE, 0, -1`s, 0p, 0p);
                         if( ret < 0 ) {
                                 if( errno != EAGAIN && errno != EWOULDBLOCK) continue SPLICE2;