Index: uspace/app/perf/Makefile =================================================================== --- uspace/app/perf/Makefile (revision a362c166d0d57f9e8ef9b820030c62e68272a36e) +++ uspace/app/perf/Makefile (revision f85546d347319a2d243f7d2dfa121cd0c6ce35b1) @@ -36,4 +36,5 @@ benchlist.c \ csv.c \ + params.c \ perf.c \ ipc/ns_ping.c \ Index: uspace/app/perf/params.c =================================================================== --- uspace/app/perf/params.c (revision f85546d347319a2d243f7d2dfa121cd0c6ce35b1) +++ uspace/app/perf/params.c (revision f85546d347319a2d243f7d2dfa121cd0c6ce35b1) @@ -0,0 +1,146 @@ +/* + * 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 perf + * @{ + */ +/** + * @file + */ + +#include +#include +#include +#include +#include "params.h" + +typedef struct { + ht_link_t link; + + char *key; + char *value; +} param_t; + +static size_t param_hash(const ht_link_t *item) +{ + param_t *param = hash_table_get_inst(item, param_t, link); + return str_size(param->key); +} + +static size_t param_key_hash(void *key) +{ + char *key_str = key; + return str_size(key_str); +} + +static bool param_key_equal(void *key, const ht_link_t *item) +{ + param_t *param = hash_table_get_inst(item, param_t, link); + char *key_str = key; + + return str_cmp(param->key, key_str) == 0; +} + +static bool param_equal(const ht_link_t *link_a, const ht_link_t *link_b) +{ + param_t *a = hash_table_get_inst(link_a, param_t, link); + param_t *b = hash_table_get_inst(link_b, param_t, link); + + return str_cmp(a->key, b->key) == 0; +} + +static void param_remove(ht_link_t *item) +{ + param_t *param = hash_table_get_inst(item, param_t, link); + free(param->key); + free(param->value); +} + +static hash_table_ops_t param_hash_table_ops = { + .hash = param_hash, + .key_hash = param_key_hash, + .key_equal = param_key_equal, + .equal = param_equal, + .remove_callback = param_remove +}; + +/** Table of extra parameters (of param_t). */ +static hash_table_t param_hash_table; + +extern errno_t bench_param_init(void) +{ + bool ok = hash_table_create(¶m_hash_table, 0, 0, ¶m_hash_table_ops); + if (!ok) { + return ENOMEM; + } + + return EOK; +} + +extern void bench_param_cleanup(void) +{ + hash_table_destroy(¶m_hash_table); +} + +errno_t bench_param_set(const char *key, const char *value) +{ + param_t *param = malloc(sizeof(param_t)); + if (param == NULL) { + return ENOMEM; + } + + param->key = str_dup(key); + param->value = str_dup(value); + + if ((param->key == NULL) || (param->value == NULL)) { + free(param->key); + free(param->value); + free(param); + + return ENOMEM; + } + + hash_table_insert(¶m_hash_table, ¶m->link); + + return EOK; +} + +const char *bench_param_get(const char *key, const char *default_value) +{ + ht_link_t *item = hash_table_find(¶m_hash_table, (char *) key); + + if (item == NULL) { + return default_value; + } + + param_t *param = hash_table_get_inst(item, param_t, link); + return param->value; +} + +/** @} + */ Index: uspace/app/perf/params.h =================================================================== --- uspace/app/perf/params.h (revision f85546d347319a2d243f7d2dfa121cd0c6ce35b1) +++ uspace/app/perf/params.h (revision f85546d347319a2d243f7d2dfa121cd0c6ce35b1) @@ -0,0 +1,46 @@ +/* + * 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 perf + * @{ + */ +/** @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 + +/** @} + */ Index: uspace/app/perf/perf.c =================================================================== --- uspace/app/perf/perf.c (revision a362c166d0d57f9e8ef9b820030c62e68272a36e) +++ uspace/app/perf/perf.c (revision f85546d347319a2d243f7d2dfa121cd0c6ce35b1) @@ -49,4 +49,5 @@ #include "benchlist.h" #include "csv.h" +#include "params.h" #include "perf.h" @@ -299,13 +300,30 @@ printf("-o, --output filename.csv " "Store machine-readable data in filename.csv\n"); + printf("-p, --param KEY=VALUE " + "Additional parameters for the benchmark\n"); printf(" is one of the following:\n"); list_benchmarks(); } +static void handle_param_arg(char *arg) +{ + char *value = NULL; + char *key = str_tok(arg, "=", &value); + bench_param_set(key, value); +} + int main(int argc, char *argv[]) { - const char *short_options = "ho:"; + errno_t rc = bench_param_init(); + if (rc != EOK) { + fprintf(stderr, "Failed to initialize internal params structure: %s\n", + str_error(rc)); + return -5; + } + + const char *short_options = "ho:p:"; struct option long_options[] = { { "help", optional_argument, NULL, 'h' }, + { "param", required_argument, NULL, 'p' }, { "output", required_argument, NULL, 'o' }, { 0, 0, NULL, 0 } @@ -322,4 +340,7 @@ case 'o': csv_output_filename = optarg; + break; + case 'p': + handle_param_arg(optarg); break; case -1: @@ -366,4 +387,5 @@ csv_report_close(); + bench_param_cleanup(); return exit_code;