Changeset ab936440 in mainline for uspace/app/hbench/benchlist.c

Timestamp:

2019-02-12T20:42:42Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (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.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:

• uspace/app/hbench/benchlist.c (moved) (moved from uspace/app/perf/perf.h ) (2 diffs)

uspace/app/hbench/benchlist.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2018 Jiri Svoboda
+ * Copyright (c) 2018 Vojtech Horky
  * All rights reserved.
  *
@@ -27 +28 @@
  */
 
-/** @addtogroup perf
+/** @addtogroup hbench
  * @{
  */
-/** @file
+/**
+ * @file
  */
 
-#ifndef PERF_H_
-#define PERF_H_
+#include <stdlib.h>
+#include "hbench.h"
 
-#include <stdbool.h>
+benchmark_t *benchmarks[] = {
+        &benchmark_dir_read,
+        &benchmark_fibril_mutex,
+        &benchmark_file_read,
+        &benchmark_malloc1,
+        &benchmark_malloc2,
+        &benchmark_ns_ping,
+        &benchmark_ping_pong
+};
 
-typedef const char *(*benchmark_entry_t)(void);
-
-typedef struct {
-        const char *name;
-        const char *desc;
-        benchmark_entry_t entry;
-} benchmark_t;
-
-extern const char *bench_malloc1(void);
-extern const char *bench_malloc2(void);
-extern const char *bench_ns_ping(void);
-extern const char *bench_ping_pong(void);
-
-extern benchmark_t benchmarks[];
-
-#endif
+size_t benchmark_count = sizeof(benchmarks) / sizeof(benchmarks[0]);
 
 /** @}