Index: uspace/app/hbench/benchlist.c =================================================================== --- uspace/app/hbench/benchlist.c (revision fe656783f1136cc632328ef6c088aad3cb650fdd) +++ uspace/app/hbench/benchlist.c (revision d926f42290098ea1a79424b041c085f21f0bf62e) @@ -36,5 +36,5 @@ #include -#include "benchlist.h" +#include "hbench.h" benchmark_t *benchmarks[] = { Index: uspace/app/hbench/benchlist.h =================================================================== --- uspace/app/hbench/benchlist.h (revision fe656783f1136cc632328ef6c088aad3cb650fdd) +++ (revision ) @@ -1,54 +1,0 @@ -/* - * Copyright (c) 2018 Jiri Svoboda - * Copyright (c) 2019 Vojtech Horky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup hbench - * @{ - */ -/** @file - */ - -#ifndef BENCHLIST_H_ -#define BENCHLIST_H_ - -#include "hbench.h" - -extern benchmark_t bench_dir_read; -extern benchmark_t bench_file_read; -extern benchmark_t bench_malloc1; -extern benchmark_t bench_malloc2; -extern benchmark_t bench_ns_ping; -extern benchmark_t bench_ping_pong; - -extern benchmark_t *benchmarks[]; -extern size_t benchmark_count; - -#endif - -/** @} - */ Index: uspace/app/hbench/csv.c =================================================================== --- uspace/app/hbench/csv.c (revision fe656783f1136cc632328ef6c088aad3cb650fdd) +++ uspace/app/hbench/csv.c (revision d926f42290098ea1a79424b041c085f21f0bf62e) @@ -35,5 +35,6 @@ #include -#include "csv.h" +#include +#include "hbench.h" static FILE *csv_output = NULL; Index: uspace/app/hbench/csv.h =================================================================== --- uspace/app/hbench/csv.h (revision fe656783f1136cc632328ef6c088aad3cb650fdd) +++ (revision ) @@ -1,50 +1,0 @@ -/* - * Copyright (c) 2019 Vojtech Horky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup hbench - * @{ - */ -/** @file - */ - -#ifndef CSV_H_ -#define CSV_H_ - -#include -#include -#include -#include "hbench.h" - -extern errno_t csv_report_open(const char *); -extern void csv_report_add_entry(stopwatch_t *, int, benchmark_t *, uint64_t); -extern void csv_report_close(void); - -#endif - -/** @} - */ Index: uspace/app/hbench/fs/dirread.c =================================================================== --- uspace/app/hbench/fs/dirread.c (revision fe656783f1136cc632328ef6c088aad3cb650fdd) +++ uspace/app/hbench/fs/dirread.c (revision d926f42290098ea1a79424b041c085f21f0bf62e) @@ -36,7 +36,5 @@ #include #include -#include "../benchlist.h" #include "../hbench.h" -#include "../params.h" /* Index: uspace/app/hbench/fs/fileread.c =================================================================== --- uspace/app/hbench/fs/fileread.c (revision fe656783f1136cc632328ef6c088aad3cb650fdd) +++ uspace/app/hbench/fs/fileread.c (revision d926f42290098ea1a79424b041c085f21f0bf62e) @@ -35,7 +35,5 @@ #include #include -#include "../benchlist.h" #include "../hbench.h" -#include "../params.h" #define BUFFER_SIZE 4096 Index: uspace/app/hbench/hbench.h =================================================================== --- uspace/app/hbench/hbench.h (revision fe656783f1136cc632328ef6c088aad3cb650fdd) +++ uspace/app/hbench/hbench.h (revision d926f42290098ea1a79424b041c085f21f0bf62e) @@ -1,4 +1,5 @@ /* * Copyright (c) 2018 Jiri Svoboda + * Copyright (c) 2019 Vojtech Horky * All rights reserved. * @@ -36,4 +37,5 @@ #define HBENCH_H_ +#include #include #include @@ -51,4 +53,24 @@ } benchmark_t; +extern benchmark_t *benchmarks[]; +extern size_t benchmark_count; + +extern errno_t csv_report_open(const char *); +extern void csv_report_add_entry(stopwatch_t *, int, benchmark_t *, uint64_t); +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); + +/* Put your benchmark descriptors here (and also to benchlist.c). */ +extern benchmark_t bench_dir_read; +extern benchmark_t bench_file_read; +extern benchmark_t bench_malloc1; +extern benchmark_t bench_malloc2; +extern benchmark_t bench_ns_ping; +extern benchmark_t bench_ping_pong; + #endif Index: uspace/app/hbench/ipc/ns_ping.c =================================================================== --- uspace/app/hbench/ipc/ns_ping.c (revision fe656783f1136cc632328ef6c088aad3cb650fdd) +++ uspace/app/hbench/ipc/ns_ping.c (revision d926f42290098ea1a79424b041c085f21f0bf62e) @@ -32,5 +32,4 @@ #include #include -#include "../benchlist.h" #include "../hbench.h" Index: uspace/app/hbench/ipc/ping_pong.c =================================================================== --- uspace/app/hbench/ipc/ping_pong.c (revision fe656783f1136cc632328ef6c088aad3cb650fdd) +++ uspace/app/hbench/ipc/ping_pong.c (revision d926f42290098ea1a79424b041c085f21f0bf62e) @@ -32,5 +32,4 @@ #include #include -#include "../benchlist.h" #include "../hbench.h" Index: uspace/app/hbench/main.c =================================================================== --- uspace/app/hbench/main.c (revision fe656783f1136cc632328ef6c088aad3cb650fdd) +++ uspace/app/hbench/main.c (revision d926f42290098ea1a79424b041c085f21f0bf62e) @@ -47,8 +47,5 @@ #include #include -#include "benchlist.h" -#include "csv.h" #include "hbench.h" -#include "params.h" #define MIN_DURATION_SECS 10 Index: uspace/app/hbench/malloc/malloc1.c =================================================================== --- uspace/app/hbench/malloc/malloc1.c (revision fe656783f1136cc632328ef6c088aad3cb650fdd) +++ uspace/app/hbench/malloc/malloc1.c (revision d926f42290098ea1a79424b041c085f21f0bf62e) @@ -30,5 +30,4 @@ #include #include -#include "../benchlist.h" #include "../hbench.h" Index: uspace/app/hbench/malloc/malloc2.c =================================================================== --- uspace/app/hbench/malloc/malloc2.c (revision fe656783f1136cc632328ef6c088aad3cb650fdd) +++ uspace/app/hbench/malloc/malloc2.c (revision d926f42290098ea1a79424b041c085f21f0bf62e) @@ -29,5 +29,4 @@ #include #include -#include "../benchlist.h" #include "../hbench.h" Index: uspace/app/hbench/params.c =================================================================== --- uspace/app/hbench/params.c (revision fe656783f1136cc632328ef6c088aad3cb650fdd) +++ uspace/app/hbench/params.c (revision d926f42290098ea1a79424b041c085f21f0bf62e) @@ -38,5 +38,5 @@ #include #include -#include "params.h" +#include "hbench.h" typedef struct { Index: uspace/app/hbench/params.h =================================================================== --- uspace/app/hbench/params.h (revision fe656783f1136cc632328ef6c088aad3cb650fdd) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2019 Vojtech Horky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup hbench - * @{ - */ -/** @file - */ - -#ifndef PARAMS_H_ -#define PARAMS_H_ - -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); - -#endif - -/** @} - */