Changeset e67a82d for benchmark/readyQ/yield.cfa

Timestamp:

Aug 20, 2020, 11:48:15 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

d685cb0

Parents:

67ca73e (diff), 013b028 (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:

fix conflicts

File:

• benchmark/readyQ/yield.cfa (modified) (2 diffs)

benchmark/readyQ/yield.cfa

@@ -43 +43 @@
 
 int main(int argc, char * argv[]) {
-        BENCH_DECL
+        unsigned num_io = 1;
+        io_context_params params;
 
-        for(;;) {
-                static struct option options[] = {
-                        BENCH_OPT_LONG
-                        {0, 0, 0, 0}
-                };
+        cfa_option opt[] = {
+                BENCH_OPT_CFA
+        };
+        int opt_cnt = sizeof(opt) / sizeof(cfa_option);
 
-                int idx = 0;
-                int opt = getopt_long(argc, argv, BENCH_OPT_SHORT, options, &idx);
-
-                const char * arg = optarg ? optarg : "";
-                char * end;
-                switch(opt) {
-                        case -1:
-                                goto run;
-                        BENCH_OPT_CASE
-                        default: /* ? */
-                                fprintf( stderr, "Unkown option '%c'\n", opt);
-                        usage:
-                                bench_usage( argv );
-                                exit(1);
-                }
-        }
-        run:
+        char **left;
+        parse_args( argc, argv, opt, opt_cnt, "[OPTIONS]...\ncforall yield benchmark", left );
 
         {
@@ -73 +58 @@
 
                 Time start, end;
-                BenchCluster cl = { 0, CFA_STATS_READY_Q };
+                BenchCluster cl = { num_io, params, CFA_STATS_READY_Q };
                 {
                         BenchProc procs[nprocs];