Changeset d17cf8c in mainline for uspace/app/hbench/hbench.h

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/hbench.h (modified) (4 diffs)

uspace/app/hbench/hbench.h

@@ -37 +37 @@
 #define HBENCH_H_
 
+#include <adt/hash_table.h>
 #include <errno.h>
 #include <stdarg.h>
@@ -58 +59 @@
         size_t error_buffer_size;
 } bench_run_t;
+
+/** Benchmark environment configuration.
+ *
+ * Use proper access functions when modifying data inside this structure.
+ */
+typedef struct {
+        hash_table_t parameters;
+} bench_env_t;
+
+typedef bool (*benchmark_entry_t)(bench_env_t *, bench_run_t *, uint64_t);
+typedef bool (*benchmark_helper_t)(bench_env_t *, bench_run_t *);
+
+typedef struct {
+        const char *name;
+        const char *desc;
+        benchmark_entry_t entry;
+        benchmark_helper_t setup;
+        benchmark_helper_t teardown;
+} benchmark_t;
 
 static inline void bench_run_init(bench_run_t *run, char *error_buffer,
@@ -87 +107 @@
 }
 
-typedef bool (*benchmark_entry_t)(bench_run_t *, uint64_t);
-typedef bool (*benchmark_helper_t)(bench_run_t *);
-
-typedef struct {
-        const char *name;
-        const char *desc;
-        benchmark_entry_t entry;
-        benchmark_helper_t setup;
-        benchmark_helper_t teardown;
-} benchmark_t;
-
 extern benchmark_t *benchmarks[];
 extern size_t benchmark_count;
@@ -105 +114 @@
 extern void csv_report_close(void);
 
-extern errno_t bench_param_init(void);
-extern errno_t bench_param_set(const char *, const char *);
-extern const char *bench_param_get(const char *, const char *);
-extern void bench_param_cleanup(void);
+extern errno_t bench_env_init(bench_env_t *);
+extern errno_t bench_env_param_set(bench_env_t *, const char *, const char *);
+extern const char *bench_env_param_get(bench_env_t *, const char *, const char *);
+extern void bench_env_cleanup(bench_env_t *);
 
 /* Put your benchmark descriptors here (and also to benchlist.c). */