Changeset 7270432

Timestamp:

Jan 13, 2021, 1:38:12 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:

97748ee

Parents:

075b8fd

Message:

Splice no longer uses SPLICE_F_MORE.
Added answer_empty

Location:

benchmark/io/http

Files:

• protocol.cfa (modified) (4 diffs)
• protocol.hfa (modified) (1 diff)

benchmark/io/http/protocol.cfa

@@ -48 +48 @@
                 // Call write
                 int ret = cfa_write(fd, it, len, 0, -1`s, 0p, 0p);
+                // int ret = write(fd, it, len);
                 if( ret < 0 ) { if( errno != EAGAIN && errno != EWOULDBLOCK) abort( "'answer error' error: (%d) %s\n", (int)errno, strerror(errno) ); }
 
@@ -75 +76 @@
         if( ret < 0 ) return ret;
         return answer(fd, buffer, size);
+}
+
+int answer_empty( int fd ) {
+        return answer_header(fd, 0);
 }
 
@@ -115 +120 @@
 
 void sendfile( int pipe[2], int fd, int ans_fd, size_t count ) {
+        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, SPLICE_F_MOVE | SPLICE_F_MORE, 0, -1`s, 0p, 0p);
+                ret = cfa_splice(ans_fd, &offset, pipe[1], 0p, count, sflags, 0, -1`s, 0p, 0p);
+                // ret = splice(ans_fd, &offset, pipe[1], 0p, count, sflags);
                 if( ret < 0 ) {
                         if( errno != EAGAIN && errno != EWOULDBLOCK) continue SPLICE1;
@@ -128 +135 @@
                 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, 0, -1`s, 0p, 0p);
+                        ret = cfa_splice(pipe[0], 0p, fd, 0p, in_pipe, sflags, 0, -1`s, 0p, 0p);
+                        // ret = splice(pipe[0], 0p, fd, 0p, in_pipe, sflags);
                         if( ret < 0 ) {
                                 if( errno != EAGAIN && errno != EWOULDBLOCK) continue SPLICE2;

benchmark/io/http/protocol.hfa

@@ -17 +17 @@
 int answer_header( int fd, size_t size );
 int answer_plain( int fd, char buffer [], size_t size );
+int answer_empty( int fd );
 
 [HttpCode code, bool closed, * const char file, size_t len] http_read(int fd, []char buffer, size_t len, io_cancellation *);