Changeset 920dca3 for benchmark/io

Timestamp:

Jul 30, 2020, 3:01:04 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

3ac8b9f

Parents:

f00b26d4

Message:

Fixed readv after io_context re-work

File:

• benchmark/io/readv.cfa (modified) (12 diffs)

benchmark/io/readv.cfa

@@ -12 +12 @@
 }
 
+#include <errno.h>
 #include <unistd.h>
 
 #include <clock.hfa>
+#include <iofwd.hfa>
 #include <kernel.hfa>
 #include <thread.hfa>
@@ -23 +25 @@
 
 extern bool traceHeapOn();
-extern ssize_t cfa_preadv2(int fd, const struct iovec *iov, int iovcnt, off_t offset, int flags);
-extern ssize_t cfa_preadv2_fixed(int fd, const struct iovec *iov, int iovcnt, off_t offset, int flags);
-extern void register_fixed_files( cluster &, int *, unsigned count );
 
 int fd;
@@ -31 +30 @@
 volatile size_t count = 0;
 
-unsigned long int buflen = 50;
+unsigned long int buflen = 512;
 bool fixed_file = false;
 
@@ -40 +39 @@
 
 int do_read(int fd, struct iovec * iov) {
+        // extern ssize_t cfa_preadv2(int, const struct iovec *, int, off_t, int, int = 0, Duration = -1`s, io_cancellation * = 0p, io_context * = 0p);
+        int sflags = 0;
         if(fixed_file) {
-                return cfa_preadv2_fixed(fd, iov, 1, 0, 0);
+                sflags |= CFA_IO_FIXED_FD1;
         }
-        else {
-                return cfa_preadv2(fd, iov, 1, 0, 0);
-        }
+        return cfa_preadv2(fd, iov, 1, 0, 0, sflags, -1`s, 0p, 0p);
 }
 
@@ -52 +51 @@
         /* paranoid */ assert( true == __atomic_load_n(&run, __ATOMIC_RELAXED) );
 
-        char data[buflen];
+        __attribute__((aligned(512)))  char data[buflen];
         struct iovec iov = { data, buflen };
 
         while(__atomic_load_n(&run, __ATOMIC_RELAXED)) {
                 int r = do_read(fd, &iov);
-                if(r < 0) abort("%s\n", strerror(-r));
+                if(r < 0) abort("%s\n", strerror(errno));
 
                 __atomic_fetch_add( &count, 1, __ATOMIC_SEQ_CST );
@@ -65 +64 @@
 int main(int argc, char * argv[]) {
         BENCH_DECL
-        unsigned flags = 0;
+        unsigned num_io = 1;
+        io_context_params params;
         int file_flags = 0;
         unsigned sublen = 16;
@@ -74 +74 @@
                         BENCH_OPT_LONG
                         {"bufsize",       required_argument, 0, 'b'},
-                        {"userthread",    no_argument      , 0, 'u'},
                         {"submitthread",  no_argument      , 0, 's'},
                         {"eagersubmit",   no_argument      , 0, 'e'},
                         {"kpollsubmit",   no_argument      , 0, 'k'},
                         {"kpollcomplete", no_argument      , 0, 'i'},
+                        {"fixed-files",   no_argument      , 0, 'f'},
+                        {"open-direct",   no_argument      , 0, 'o'},
                         {"submitlength",  required_argument, 0, 'l'},
                         {0, 0, 0, 0}
@@ -84 +85 @@
 
                 int idx = 0;
-                int opt = getopt_long(argc, argv, BENCH_OPT_SHORT "b:usekil:", options, &idx);
+                int opt = getopt_long(argc, argv, BENCH_OPT_SHORT "b:sekil:", options, &idx);
 
                 const char * arg = optarg ? optarg : "";
@@ -100 +101 @@
                                 }
                                 break;
-                        case 'u':
-                                flags |= CFA_CLUSTER_IO_POLLER_USER_THREAD;
-                                break;
                         case 's':
-                                flags |= CFA_CLUSTER_IO_POLLER_THREAD_SUBMITS;
+                                params.poller_submits = true;
                                 break;
                         case 'e':
-                                flags |= CFA_CLUSTER_IO_EAGER_SUBMITS;
+                                params.eager_submits = true;
                                 break;
                         case 'k':
-                                flags |= CFA_CLUSTER_IO_KERNEL_POLL_SUBMITS;
+                                params.poll_submit = true;
+                        case 'f':
                                 fixed_file = true;
                                 break;
                         case 'i':
-                                flags |= CFA_CLUSTER_IO_KERNEL_POLL_COMPLETES;
+                                params.poll_complete = true;
+                        case 'o':
                                 file_flags |= O_DIRECT;
                                 break;
@@ -123 +123 @@
                                         goto usage;
                                 }
-                                flags |= (sublen << CFA_CLUSTER_IO_BUFFLEN_OFFSET);
+                                // flags |= (sublen << CFA_CLUSTER_IO_BUFFLEN_OFFSET);
                                 break;
                         default: /* ? */
@@ -150 +150 @@
         {
                 Time start, end;
-                BenchCluster cl = { flags, CFA_STATS_READY_Q | CFA_STATS_IO };
+                BenchCluster cl = { num_io, params, CFA_STATS_READY_Q | CFA_STATS_IO };
 
                 if(fixed_file) {
@@ -179 +179 @@
                                 printf("\nDone\n");
                         }
+                        printf("Readers closed\n");
                 }
                 printf("Took %'ld ms\n", (end - start)`ms);