Changes in benchmark/io/readv.cfa [cbabfd4:4069faad]

File:

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

benchmark/io/readv.cfa

@@ -16 +16 @@
 #include <thread.hfa>
 #include <time.hfa>
+
+#if !defined(HAVE_LINUX_IO_URING_H)
+#warning no io uring
+#endif
 
 extern bool traceHeapOn();
@@ -49 +53 @@
         while(__atomic_load_n(&run, __ATOMIC_RELAXED)) {
                 int r = cfa_preadv2(fd, &iov, 1, 0, 0);
-                if(r < 0) abort("%s\n", strerror(-r));
+                if(r < 0) abort(strerror(-r));
 
                 __atomic_fetch_add( &count, 1, __ATOMIC_SEQ_CST );
@@ -59 +63 @@
         unsigned long int nthreads = 2;
         unsigned long int nprocs   = 1;
-        int flags = 0;
+
+        printf("Setting local\n");
+        setlocale(LC_NUMERIC, "");
 
         arg_loop:
         for(;;) {
                 static struct option options[] = {
-                        {"duration",   required_argument, 0, 'd'},
-                        {"nthreads",   required_argument, 0, 't'},
-                        {"nprocs",     required_argument, 0, 'p'},
-                        {"bufsize",    required_argument, 0, 'b'},
-                        {"userthread", no_argument      , 0, 'u'},
+                        {"duration",  required_argument, 0, 'd'},
+                        {"nthreads",  required_argument, 0, 't'},
+                        {"nprocs",    required_argument, 0, 'p'},
+                        {"bufsize",   required_argument, 0, 'b'},
                         {0, 0, 0, 0}
                 };
 
                 int idx = 0;
-                int opt = getopt_long(argc, argv, "d:t:p:b:u", options, &idx);
+                int opt = getopt_long(argc, argv, "d:t:p:b:", options, &idx);
 
                 const char * arg = optarg ? optarg : "";
@@ -110 +115 @@
                                 }
                                 break;
-                        case 'u':
-                                flags |= CFA_CLUSTER_IO_POLLER_USER_THREAD;
-                                break;
                         // Other cases
                         default: /* ? */
@@ -133 +135 @@
         }
 
-        printf("Running %lu threads, reading %lu bytes each, over %lu processors for %lf seconds\n", nthreads, buflen, nprocs, duration);
+        printf("Running %lu threads over %lu processors for %lf seconds\n", nthreads, nprocs, duration);
 
         {
                 Time start, end;
-                cluster cl = { "IO Cluster", flags };
+                cluster cl = { "IO Cluster" };
                 the_cluster = &cl;
                 #if !defined(__CFA_NO_STATISTICS__)
@@ -159 +161 @@
                         }
                 }
-                printf("Took %'ld ms\n", (end - start)`ms);
-                printf("Total reads      : %'15zu\n", count);
-                printf("Reads per second : %'18.2lf\n", ((double)count) / (end - start)`s);
-                printf("Total read size  : %'15zu\n", buflen * count);
-                printf("Bytes per second : %'18.2lf\n", ((double)count * buflen) / (end - start)`s);
+                printf("Took %ld ms\n", (end - start)`ms);
+                printf("Total reads:      %'zu\n", count);
+                printf("Reads per second: %'lf\n", ((double)count) / (end - start)`s);
         }