Changeset d17cf8c in mainline for uspace/app/hbench/main.c

Timestamp:

2019-01-21T13:39:37Z (6 years ago)

Author:

Vojtech Horky <vojtech.horky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

94d52d5

Parents:

e7f9a09

Message:

hbench: remove global state

Move benchmark parameters into a benchmark environment structure that is
passed to each benchmark.

File:

• uspace/app/hbench/main.c (modified) (12 diffs)

uspace/app/hbench/main.c

@@ -148 +148 @@
 }
 
-static bool run_benchmark(benchmark_t *bench)
+static bool run_benchmark(bench_env_t *env, benchmark_t *bench)
 {
         printf("Warm up and determine workload size...\n");
@@ -169 +169 @@
 
         if (bench->setup != NULL) {
-                ret = bench->setup(&helper_run);
+                ret = bench->setup(env, &helper_run);
                 if (!ret) {
                         goto leave_error;
@@ -190 +190 @@
                 bench_run_init(&run, error_msg, MAX_ERROR_STR_LENGTH);
 
-                bool ok = bench->entry(&run, workload_size);
+                bool ok = bench->entry(env, &run, workload_size);
                 if (!ok) {
                         goto leave_error;
@@ -212 +212 @@
                 bench_run_init(&runs[i], error_msg, MAX_ERROR_STR_LENGTH);
 
-                bool ok = bench->entry(&runs[i], workload_size);
+                bool ok = bench->entry(env, &runs[i], workload_size);
                 if (!ok) {
                         free(runs);
@@ -233 +233 @@
 leave:
         if (bench->teardown != NULL) {
-                bool ok = bench->teardown(&helper_run);
+                bool ok = bench->teardown(env, &helper_run);
                 if (!ok) {
                         printf("Error: %s\n", error_msg);
@@ -245 +245 @@
 }
 
-static int run_benchmarks(void)
+static int run_benchmarks(bench_env_t *env)
 {
         unsigned int count_ok = 0;
@@ -256 +256 @@
         for (size_t it = 0; it < benchmark_count; it++) {
                 printf("%s (%s)\n", benchmarks[it]->name, benchmarks[it]->desc);
-                if (run_benchmark(benchmarks[it])) {
+                if (run_benchmark(env, benchmarks[it])) {
                         count_ok++;
                         continue;
@@ -314 +314 @@
 }
 
-static void handle_param_arg(char *arg)
+static void handle_param_arg(bench_env_t *env, char *arg)
 {
         char *value = NULL;
         char *key = str_tok(arg, "=", &value);
-        bench_param_set(key, value);
+        bench_env_param_set(env, key, value);
 }
 
 int main(int argc, char *argv[])
 {
-        errno_t rc = bench_param_init();
+        bench_env_t bench_env;
+        errno_t rc = bench_env_init(&bench_env);
         if (rc != EOK) {
                 fprintf(stderr, "Failed to initialize internal params structure: %s\n",
@@ -350 +351 @@
                         break;
                 case 'p':
-                        handle_param_arg(optarg);
+                        handle_param_arg(&bench_env, optarg);
                         break;
                 case -1:
@@ -378 +379 @@
 
         if (str_cmp(benchmark, "*") == 0) {
-                exit_code = run_benchmarks();
+                exit_code = run_benchmarks(&bench_env);
         } else {
                 bool benchmark_exists = false;
@@ -384 +385 @@
                         if (str_cmp(benchmark, benchmarks[i]->name) == 0) {
                                 benchmark_exists = true;
-                                exit_code = run_benchmark(benchmarks[i]) ? 0 : -1;
+                                exit_code = run_benchmark(&bench_env, benchmarks[i]) ? 0 : -1;
                                 break;
                         }
@@ -395 +396 @@
 
         csv_report_close();
-        bench_param_cleanup();
+        bench_env_cleanup(&bench_env);
 
         return exit_code;