Changeset 365e423 for benchmark/io/readv.cfa

Timestamp:

Jul 10, 2020, 2:22:17 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:

7922158, e1801fc

Parents:

0a92c78 (diff), 59f74a2 (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/readv.cfa (modified) (9 diffs)

benchmark/io/readv.cfa

@@ +1 @@
+#define _GNU_SOURCE
+
 #include <stdlib.h>
 #include <stdio.h>
@@ -22 +24 @@
 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;
@@ -28 +32 @@
 
 unsigned long int buflen = 50;
+bool fixed_file = false;
 
 thread __attribute__((aligned(128))) Reader {};
 void ?{}( Reader & this ) {
         ((thread&)this){ "Reader Thread", *the_benchmark_cluster };
+}
+
+int do_read(int fd, struct iovec * iov) {
+        if(fixed_file) {
+                return cfa_preadv2_fixed(fd, iov, 1, 0, 0);
+        }
+        else {
+                return cfa_preadv2(fd, iov, 1, 0, 0);
+        }
 }
 
@@ -42 +56 @@
 
         while(__atomic_load_n(&run, __ATOMIC_RELAXED)) {
-                int r = cfa_preadv2(fd, &iov, 1, 0, 0);
+                int r = do_read(fd, &iov);
                 if(r < 0) abort("%s\n", strerror(-r));
 
@@ -52 +66 @@
         BENCH_DECL
         unsigned flags = 0;
+        int file_flags = 0;
         unsigned sublen = 16;
 
@@ -96 +111 @@
                         case 'k':
                                 flags |= CFA_CLUSTER_IO_KERNEL_POLL_SUBMITS;
+                                fixed_file = true;
                                 break;
                         case 'i':
                                 flags |= CFA_CLUSTER_IO_KERNEL_POLL_COMPLETES;
+                                file_flags |= O_DIRECT;
                                 break;
                         case 'l':
@@ -123 +140 @@
         }
 
-        fd = open(__FILE__, 0);
-        if(fd < 0) {
+        int lfd = open(__FILE__, file_flags);
+        if(lfd < 0) {
                 fprintf(stderr, "Could not open source file\n");
                 exit(EXIT_FAILURE);
@@ -134 +151 @@
                 Time start, end;
                 BenchCluster cl = { flags, CFA_STATS_READY_Q | CFA_STATS_IO };
+
+                if(fixed_file) {
+                        fd = 0;
+                        register_fixed_files( cl.self, &lfd, 1 );
+                }
+                else {
+                        fd = lfd;
+                }
+
                 {
                         BenchProc procs[nprocs];
@@ -161 +187 @@
         }
 
-        close(fd);
+        close(lfd);
 }