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

Timestamp:

2019-01-21T13:39:37Z (5 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/env.c (moved) (moved from uspace/app/hbench/params.c ) (4 diffs)

uspace/app/hbench/env.c

@@ -34 +34 @@
  */
 
-#include <adt/hash_table.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -90 +89 @@
 };
 
-/** Table of extra parameters (of param_t). */
-static hash_table_t param_hash_table;
-
-extern errno_t bench_param_init(void)
+extern errno_t bench_env_init(bench_env_t *env)
 {
-        bool ok = hash_table_create(&param_hash_table, 0, 0, &param_hash_table_ops);
+        bool ok = hash_table_create(&env->parameters, 0, 0, &param_hash_table_ops);
         if (!ok) {
                 return ENOMEM;
@@ -103 +99 @@
 }
 
-extern void bench_param_cleanup(void)
+extern void bench_env_cleanup(bench_env_t *env)
 {
-        hash_table_destroy(&param_hash_table);
+        hash_table_destroy(&env->parameters);
 }
 
-errno_t bench_param_set(const char *key, const char *value)
+errno_t bench_env_param_set(bench_env_t *env, const char *key, const char *value)
 {
         param_t *param = malloc(sizeof(param_t));
@@ -126 +122 @@
         }
 
-        hash_table_insert(&param_hash_table, &param->link);
+        hash_table_insert(&env->parameters, &param->link);
 
         return EOK;
 }
 
-const char *bench_param_get(const char *key, const char *default_value)
+const char *bench_env_param_get(bench_env_t *env, const char *key, const char *default_value)
 {
-        ht_link_t *item = hash_table_find(&param_hash_table, (char *) key);
+        ht_link_t *item = hash_table_find(&env->parameters, (char *) key);
 
         if (item == NULL) {