Changeset 4f762d3 for benchmark/io/http/protocol.cfa

Timestamp:

Feb 19, 2021, 1:48:14 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:

d60d30e

Parents:

78da4ab

Message:

Fix httpforall after changes to I/O

File:

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

benchmark/io/http/protocol.cfa

@@ -53 +53 @@
         while(len > 0) {
                 // Call write
-                int ret = cfa_write(fd, it, len, 0, -1`s, 0p, 0p);
-                // int ret = write(fd, it, len);
+                int ret = cfa_send(fd, it, len, 0, 0);
                 if( ret < 0 ) {
                         if( errno == ECONNRESET || errno == EPIPE ) return -ECONNRESET;
@@ -94 +93 @@
 
 
-[HttpCode code, bool closed, * const char file, size_t len] http_read(int fd, []char buffer, size_t len, io_cancellation * cancel) {
+[HttpCode code, bool closed, * const char file, size_t len] http_read(int fd, []char buffer, size_t len) {
         char * it = buffer;
         size_t count = len - 1;
@@ -100 +99 @@
         READ:
         for() {
-                int ret = cfa_read(fd, (void*)it, count, 0, -1`s, cancel, 0p);
+                int ret = cfa_recv(fd, (void*)it, count, 0, 0);
                 // int ret = read(fd, (void*)it, count);
                 if(ret == 0 ) return [OK200, true, 0, 0];
@@ -139 +138 @@
         ssize_t ret;
         SPLICE1: while(count > 0) {
-                ret = cfa_splice(ans_fd, &offset, pipe[1], 0p, count, sflags, 0, -1`s, 0p, 0p);
+                ret = cfa_splice(ans_fd, &offset, pipe[1], 0p, count, sflags, 0);
                 // ret = splice(ans_fd, &offset, pipe[1], 0p, count, sflags);
                 if( ret < 0 ) {
@@ -152 +151 @@
                 size_t in_pipe = ret;
                 SPLICE2: while(in_pipe > 0) {
-                        ret = cfa_splice(pipe[0], 0p, fd, 0p, in_pipe, sflags, 0, -1`s, 0p, 0p);
+                        ret = cfa_splice(pipe[0], 0p, fd, 0p, in_pipe, sflags, 0);
                         // ret = splice(pipe[0], 0p, fd, 0p, in_pipe, sflags);
                         if( ret < 0 ) {