From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 43ADDC433E0 for ; Mon, 11 Jan 2021 17:36:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 08A6F22A83 for ; Mon, 11 Jan 2021 17:36:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389665AbhAKRfW (ORCPT ); Mon, 11 Jan 2021 12:35:22 -0500 Received: from mx2.suse.de ([195.135.220.15]:51204 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388070AbhAKRfV (ORCPT ); Mon, 11 Jan 2021 12:35:21 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 4B3C7AE63; Mon, 11 Jan 2021 17:34:00 +0000 (UTC) From: Daniel Wagner To: Clark Williams , John Kacur Cc: linux-rt-users@vger.kernel.org, Daniel Wagner Subject: [RFC v2 6/6] signaltest: Add JSON output feature Date: Mon, 11 Jan 2021 18:33:51 +0100 Message-Id: <20210111173351.4971-7-dwagner@suse.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210111173351.4971-1-dwagner@suse.de> References: <20210111173351.4971-1-dwagner@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-rt-users@vger.kernel.org Write the test results as JSON output to a file. This allows to simplifies any parsing later on. Reviewed-by: Daniel Wagner --- src/signaltest/signaltest.c | 113 +++++++++++++++++++++++++++++------- 1 file changed, 92 insertions(+), 21 deletions(-) diff --git a/src/signaltest/signaltest.c b/src/signaltest/signaltest.c index dd5633d5fc51..9f725ef91ad7 100644 --- a/src/signaltest/signaltest.c +++ b/src/signaltest/signaltest.c @@ -22,6 +22,7 @@ #include #include #include +#include #include @@ -205,6 +206,14 @@ static int verbose; static int quiet; static int lockall; static struct bitmask *affinity_mask = NULL; +static char outfile[MAX_PATH]; + +enum option_values { + OPT_AFFINITY=1, OPT_BREAKTRACE, + OPT_DURATION, OPT_HELP, OPT_LOOPS, + OPT_MLOCKALL, OPT_OUTPUT, OPT_PRIORITY, + OPT_QUIET, OPT_SMP, OPT_THREADS, OPT_VERBOSE +}; /* Process commandline options */ static void process_options(int argc, char *argv[]) @@ -216,17 +225,18 @@ static void process_options(int argc, char *argv[]) int option_index = 0; /** Options for getopt */ static struct option long_options[] = { - {"affinity", optional_argument, NULL, 'a'}, - {"breaktrace", required_argument, NULL, 'b'}, - {"duration", required_argument, NULL, 'D'}, - {"help", no_argument, NULL, 'h'}, - {"loops", required_argument, NULL, 'l'}, - {"mlockall", no_argument, NULL, 'm'}, - {"priority", required_argument, NULL, 'p'}, - {"quiet", no_argument, NULL, 'q'}, - {"smp", no_argument, NULL, 'S'}, - {"threads", required_argument, NULL, 't'}, - {"verbose", no_argument, NULL, 'v'}, + {"affinity", optional_argument, NULL, OPT_AFFINITY}, + {"breaktrace", required_argument, NULL, OPT_BREAKTRACE}, + {"duration", required_argument, NULL, OPT_DURATION}, + {"help", no_argument, NULL, OPT_HELP}, + {"loops", required_argument, NULL, OPT_LOOPS}, + {"mlockall", no_argument, NULL, OPT_MLOCKALL}, + {"output", required_argument, NULL, OPT_OUTPUT}, + {"priority", required_argument, NULL, OPT_PRIORITY}, + {"quiet", no_argument, NULL, OPT_QUIET}, + {"smp", no_argument, NULL, OPT_SMP}, + {"threads", required_argument, NULL, OPT_THREADS}, + {"verbose", no_argument, NULL, OPT_VERBOSE}, {NULL, 0, NULL, 0} }; int c = getopt_long(argc, argv, "a::b:D:hl:mp:qSt:v", @@ -234,6 +244,7 @@ static void process_options(int argc, char *argv[]) if (c == -1) break; switch (c) { + case OPT_AFFINITY: case 'a': if (optarg) { parse_cpumask(optarg, &affinity_mask); @@ -248,17 +259,49 @@ static void process_options(int argc, char *argv[]) printf("Using %u cpus.\n", numa_bitmask_weight(affinity_mask)); break; - case 'b': tracelimit = atoi(optarg); break; - case 'D': duration = parse_time_string(optarg); break; + case OPT_BREAKTRACE: + case 'b': + tracelimit = atoi(optarg); + break; + case OPT_DURATION: + case 'D': + duration = parse_time_string(optarg); + break; + case OPT_HELP: case '?': - case 'h': display_help(0); break; - case 'l': max_cycles = atoi(optarg); break; - case 'm': lockall = 1; break; - case 'p': priority = atoi(optarg); break; - case 'q': quiet = 1; break; - case 'S': smp = 1; break; - case 't': num_threads = atoi(optarg); break; - case 'v': verbose = 1; break; + case 'h': + display_help(0); + break; + case OPT_LOOPS: + case 'l': + max_cycles = atoi(optarg); + break; + case OPT_MLOCKALL: + case 'm': + lockall = 1; + break; + case OPT_OUTPUT: + strncpy(outfile, optarg, strnlen(optarg, MAX_PATH-1)); + break; + case OPT_PRIORITY: + case 'p': + priority = atoi(optarg); + break; + case OPT_QUIET: + case 'q': + quiet = 1; + break; + case OPT_SMP: + case 'S': + smp = 1; + break; + case OPT_THREADS: + case 't': + num_threads = atoi(optarg); + break; + case OPT_VERBOSE: + case 'v': verbose = 1; + break; } } @@ -312,6 +355,27 @@ static void print_stat(struct thread_param *par, int index, int verbose) } } +static void write_stats(FILE *f, void *data) +{ + struct thread_param *par = data; + struct thread_stat *s; + unsigned int i; + + fprintf(f, " \"thread\": {\n"); + for (i = 0; i < num_threads; i++) { + fprintf(f, " \"%u\": {\n", i); + s = &par->stats[i]; + fprintf(f, " \"cycles\": %" PRIu64 ",\n", s->cycles); + fprintf(f, " \"min\": %" PRIu64 ",\n", s->min); + fprintf(f, " \"max\": %" PRIu64 ",\n", s->max); + fprintf(f, " \"avg\": %.2f,\n", s->avg/s->cycles); + fprintf(f, " \"cpu\": %d,\n", par->cpu); + fprintf(f, " }%s\n", i == num_threads - 1 ? "" : ","); + + } + fprintf(f, " }\n"); +} + int main(int argc, char **argv) { sigset_t sigset; @@ -454,6 +518,13 @@ int main(int argc, char **argv) if (stat[i].values) free(stat[i].values); } + if (strlen(outfile) != 0) { + FILE *f = fopen(outfile, "w"); + if (!f) + err_exit(errno, "Failed to open output file '%s'", outfile); + rt_write_json(f, argc, argv, write_stats, par); + fclose(f); + } free(stat); outpar: free(par); -- 2.29.2