From patchwork Fri Mar 5 07:34:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 394011 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, 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 2F8C8C43381 for ; Fri, 5 Mar 2021 07:35:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EE9EA65011 for ; Fri, 5 Mar 2021 07:35:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229575AbhCEHfH (ORCPT ); Fri, 5 Mar 2021 02:35:07 -0500 Received: from mx2.suse.de ([195.135.220.15]:43706 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229538AbhCEHfG (ORCPT ); Fri, 5 Mar 2021 02:35:06 -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 587C7AE85; Fri, 5 Mar 2021 07:35:05 +0000 (UTC) From: Daniel Wagner To: Clark Williams , John Kacur Cc: linux-rt-users@vger.kernel.org, Daniel Wagner Subject: [PATCH rt-tests v2 03/14] signaltest: Add missing --output usage info Date: Fri, 5 Mar 2021 08:34:49 +0100 Message-Id: <20210305073500.17926-4-dwagner@suse.de> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210305073500.17926-1-dwagner@suse.de> References: <20210305073500.17926-1-dwagner@suse.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rt-users@vger.kernel.org Signed-off-by: Daniel Wagner --- src/signaltest/signaltest.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/signaltest/signaltest.c b/src/signaltest/signaltest.c index b1a7e1db8302..e2ffc0bb8693 100644 --- a/src/signaltest/signaltest.c +++ b/src/signaltest/signaltest.c @@ -189,6 +189,7 @@ static void display_help(int error) "-h --help display usage information\n" "-l LOOPS --loops=LOOPS number of loops: default=0(endless)\n" "-m --mlockall lock current and future memory allocations\n" + " --output=FILENAME write final results into FILENAME, JSON formatted\n" "-p PRIO --prio=PRIO priority of highest prio thread\n" "-q --quiet print a summary only on exit\n" "-t NUM --threads=NUM number of threads: default=2\n" From patchwork Fri Mar 5 07:34:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 394010 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 9C9E7C4332B for ; Fri, 5 Mar 2021 07:35:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6FD9B64FE6 for ; Fri, 5 Mar 2021 07:35:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229580AbhCEHfH (ORCPT ); Fri, 5 Mar 2021 02:35:07 -0500 Received: from mx2.suse.de ([195.135.220.15]:43718 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229558AbhCEHfG (ORCPT ); Fri, 5 Mar 2021 02:35:06 -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 A1FB0AE89; Fri, 5 Mar 2021 07:35:05 +0000 (UTC) From: Daniel Wagner To: Clark Williams , John Kacur Cc: linux-rt-users@vger.kernel.org, Daniel Wagner Subject: [PATCH rt-tests v2 04/14] rt-util: Copy command line before getopt_long() is called Date: Fri, 5 Mar 2021 08:34:50 +0100 Message-Id: <20210305073500.17926-5-dwagner@suse.de> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210305073500.17926-1-dwagner@suse.de> References: <20210305073500.17926-1-dwagner@suse.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rt-users@vger.kernel.org By default, getopt_long() permutes the contents of argv as it scans, so that eventually all the nonoptions are at the end. This is confusing in the JSON output, thus copy the command line before we call getopt_long(). Introduce a rt_init() which copies the command line. This makes also rt_write_json() function arguments a bit cleaner. Signed-off-by: Daniel Wagner --- src/cyclictest/cyclictest.c | 3 +- src/include/rt-utils.h | 7 +++-- src/lib/rt-utils.c | 45 ++++++++++++--------------- src/oslat/oslat.c | 5 +-- src/pmqtest/pmqtest.c | 3 +- src/ptsematest/ptsematest.c | 3 +- src/rt-migrate-test/rt-migrate-test.c | 3 +- src/sched_deadline/cyclicdeadline.c | 4 ++- src/signaltest/signaltest.c | 3 +- src/sigwaittest/sigwaittest.c | 3 +- src/svsematest/svsematest.c | 3 +- 11 files changed, 44 insertions(+), 38 deletions(-) diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c index c43dd7cbbd64..3f3b91bab53b 100644 --- a/src/cyclictest/cyclictest.c +++ b/src/cyclictest/cyclictest.c @@ -1778,6 +1778,7 @@ int main(int argc, char **argv) int i, ret = -1; int status; + rt_init(argc, argv); process_options(argc, argv, max_cpus); if (check_privs()) @@ -2133,7 +2134,7 @@ int main(int argc, char **argv) printf("\033[%dB", num_threads + 2); if (strlen(outfile) != 0) - rt_write_json(outfile, argc, argv, write_stats, NULL); + rt_write_json(outfile, write_stats, NULL); if (quiet) quiet = 2; diff --git a/src/include/rt-utils.h b/src/include/rt-utils.h index 36af92b170df..11d69ea7e49a 100644 --- a/src/include/rt-utils.h +++ b/src/include/rt-utils.h @@ -80,8 +80,9 @@ static inline int64_t calctime(struct timespec t) return time; } -void rt_write_json(const char *filename, int argc, char *argv[], - void (*cb)(FILE *, void *), - void *data); +void rt_init(int argc, char *argv[]); + +void rt_write_json(const char *filename, + void (*cb)(FILE *, void *), void *data); #endif /* __RT_UTILS.H */ diff --git a/src/lib/rt-utils.c b/src/lib/rt-utils.c index 00907c573d6a..9c9d0dee3255 100644 --- a/src/lib/rt-utils.c +++ b/src/lib/rt-utils.c @@ -29,12 +29,14 @@ #include "rt-error.h" #define TRACEBUFSIZ 1024 +#define MAX_COMMAND_LINE 4096 static char debugfileprefix[MAX_PATH]; static char *fileprefix; static int trace_fd = -1; static int tracemark_fd = -1; static __thread char tracebuf[TRACEBUFSIZ]; +static char cmdline[MAX_COMMAND_LINE]; /* * Finds the tracing directory in a mounted debugfs @@ -486,40 +488,40 @@ void disable_trace_mark(void) close_tracemark_fd(); } -static char *get_cmdline(int argc, char *argv[]) +void rt_init(int argc, char *argv[]) { - char *cmdline; + int offset = 0; int len, i; - len = 0; - for (i = 0; i < argc; i++) - len += strlen(argv[i]) + 1; + cmdline[0] = '\0'; - cmdline = malloc(len); - if (!cmdline) - err_exit(ENOMEM, "Could not copy cmdline"); - - memset(cmdline, 0, len); + /* + * getopt_long() permutes the contents of argv as it scans, so + * that eventually all the nonoptions are at the end. Make a + * copy before calling getopt_long(). + */ for (i = 0; i < argc;) { - cmdline = strcat(cmdline, argv[i]); + len = strlen(argv[i]); + if (offset + len + 1 >= MAX_COMMAND_LINE) + break; + + strcat(cmdline, argv[i]); i++; if (i < argc) - cmdline = strcat(cmdline, " "); - } + strcat(cmdline, " "); - return cmdline; + offset += len + 1; + } } -void rt_write_json(const char *filename, int argc, char *argv[], - void (*cb)(FILE *, void *), - void *data) +void rt_write_json(const char *filename, + void (*cb)(FILE *, void *), void *data) { unsigned char buf[1]; struct utsname uts; struct timeval tv; char tsbuf[64]; struct tm *tm; - char *cmdline; FILE *f, *s; time_t t; size_t n; @@ -533,11 +535,6 @@ void rt_write_json(const char *filename, int argc, char *argv[], err_exit(errno, "Failed to open '%s'\n", filename); } - cmdline = get_cmdline(argc, argv); - if (!cmdline) - err_exit(ENOMEM, "get_cmdline()"); - - gettimeofday(&tv, NULL); t = tv.tv_sec; tm = localtime(&t); @@ -573,8 +570,6 @@ void rt_write_json(const char *filename, int argc, char *argv[], fprintf(f, "}\n"); - free(cmdline); - if (!filename || strcmp("-", filename)) fclose(f); } diff --git a/src/oslat/oslat.c b/src/oslat/oslat.c index 465a694cdd1d..ac54d05697ef 100644 --- a/src/oslat/oslat.c +++ b/src/oslat/oslat.c @@ -796,6 +796,8 @@ int main(int argc, char *argv[]) exit(1); } + rt_init(argc, argv); + g.app_name = argv[0]; g.rtprio = 0; g.bucket_size = BUCKET_SIZE; @@ -860,8 +862,7 @@ int main(int argc, char *argv[]) write_summary(threads); if (strlen(g.outfile) != 0) - rt_write_json(g.outfile, argc, argv, - write_summary_json, threads); + rt_write_json(g.outfile, write_summary_json, threads); if (g.cpu_list) { free(g.cpu_list); diff --git a/src/pmqtest/pmqtest.c b/src/pmqtest/pmqtest.c index e1f59836ea07..f96b3d0bf400 100644 --- a/src/pmqtest/pmqtest.c +++ b/src/pmqtest/pmqtest.c @@ -502,6 +502,7 @@ int main(int argc, char *argv[]) mqstat.mq_msgsize = 8; mqstat.mq_flags = 0; + rt_init(argc, argv); process_options(argc, argv); if (check_privs()) @@ -650,7 +651,7 @@ int main(int argc, char *argv[]) .receiver = receiver, .sender = sender, }; - rt_write_json(outfile, argc, argv, write_stats, &ps); + rt_write_json(outfile, write_stats, &ps); } nomem: diff --git a/src/ptsematest/ptsematest.c b/src/ptsematest/ptsematest.c index 2755bfde5210..a32bfc1698f0 100644 --- a/src/ptsematest/ptsematest.c +++ b/src/ptsematest/ptsematest.c @@ -401,6 +401,7 @@ int main(int argc, char *argv[]) sigset_t sigset; struct timespec maindelay; + rt_init(argc, argv); process_options(argc, argv); if (check_privs()) @@ -518,7 +519,7 @@ int main(int argc, char *argv[]) .receiver = receiver, .sender = sender, }; - rt_write_json(outfile, argc, argv, write_stats, &ps); + rt_write_json(outfile, write_stats, &ps); } nomem: diff --git a/src/rt-migrate-test/rt-migrate-test.c b/src/rt-migrate-test/rt-migrate-test.c index 56b7b66ccdf4..cdfbfafb200b 100644 --- a/src/rt-migrate-test/rt-migrate-test.c +++ b/src/rt-migrate-test/rt-migrate-test.c @@ -535,6 +535,7 @@ int main (int argc, char **argv) struct timespec intv; struct sched_param param; + rt_init(argc, argv); parse_options(argc, argv); signal(SIGINT, stop_log); @@ -662,7 +663,7 @@ int main (int argc, char **argv) print_results(); if (strlen(outfile) != 0) - rt_write_json(outfile, argc, argv, write_stats, NULL); + rt_write_json(outfile, write_stats, NULL); if (stop) { /* diff --git a/src/sched_deadline/cyclicdeadline.c b/src/sched_deadline/cyclicdeadline.c index d7aa9bb5d269..e6811838b62d 100644 --- a/src/sched_deadline/cyclicdeadline.c +++ b/src/sched_deadline/cyclicdeadline.c @@ -1009,6 +1009,8 @@ int main(int argc, char **argv) int i; int c; + rt_init(argc, argv); + cpu_count = sysconf(_SC_NPROCESSORS_CONF); if (cpu_count < 1) err_quit("Can not calculate number of CPUS\n"); @@ -1225,7 +1227,7 @@ int main(int argc, char **argv) } if (strlen(outfile) != 0) - rt_write_json(outfile, argc, argv, write_stats, sched_data); + rt_write_json(outfile, write_stats, sched_data); if (setcpu_buf) free(setcpu_buf); diff --git a/src/signaltest/signaltest.c b/src/signaltest/signaltest.c index e2ffc0bb8693..6abf38b7821c 100644 --- a/src/signaltest/signaltest.c +++ b/src/signaltest/signaltest.c @@ -414,6 +414,7 @@ int main(int argc, char **argv) int status, cpu; int max_cpus = sysconf(_SC_NPROCESSORS_ONLN); + rt_init(argc, argv); process_options(argc, argv, max_cpus); if (check_privs()) @@ -557,7 +558,7 @@ int main(int argc, char **argv) free(stat[i].values); } if (strlen(outfile) != 0) - rt_write_json(outfile, argc, argv, write_stats, par); + rt_write_json(outfile, write_stats, par); free(stat); outpar: diff --git a/src/sigwaittest/sigwaittest.c b/src/sigwaittest/sigwaittest.c index 0cdf30a6a769..142419f9e315 100644 --- a/src/sigwaittest/sigwaittest.c +++ b/src/sigwaittest/sigwaittest.c @@ -473,6 +473,7 @@ int main(int argc, char *argv[]) char f_opt[14]; struct timespec launchdelay, maindelay; + rt_init(argc, argv); process_options(argc, argv); if (check_privs()) @@ -705,7 +706,7 @@ int main(int argc, char *argv[]) .receiver = receiver, .sender = sender, }; - rt_write_json(outfile, argc, argv, write_stats, &ps); + rt_write_json(outfile, write_stats, &ps); } nomem: diff --git a/src/svsematest/svsematest.c b/src/svsematest/svsematest.c index 23f84bcbd3dc..7c9d21edbab2 100644 --- a/src/svsematest/svsematest.c +++ b/src/svsematest/svsematest.c @@ -514,6 +514,7 @@ int main(int argc, char *argv[]) if (myfile == NULL) myfile = argv[0]; + rt_init(argc, argv); process_options(argc, argv); if (check_privs()) @@ -777,7 +778,7 @@ int main(int argc, char *argv[]) .receiver = receiver, .sender = sender, }; - rt_write_json(outfile, argc, argv, write_stats, &ps); + rt_write_json(outfile, write_stats, &ps); } nosem: From patchwork Fri Mar 5 07:34:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 394008 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, 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 248F4C433E9 for ; Fri, 5 Mar 2021 07:35:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F22D464FE6 for ; Fri, 5 Mar 2021 07:35:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229608AbhCEHfJ (ORCPT ); Fri, 5 Mar 2021 02:35:09 -0500 Received: from mx2.suse.de ([195.135.220.15]:43734 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229559AbhCEHfH (ORCPT ); Fri, 5 Mar 2021 02:35:07 -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 2E879AEB3; Fri, 5 Mar 2021 07:35:06 +0000 (UTC) From: Daniel Wagner To: Clark Williams , John Kacur Cc: linux-rt-users@vger.kernel.org, Daniel Wagner Subject: [PATCH rt-tests v2 05/14] rt-util: Add start time of test execution for JSON output Date: Fri, 5 Mar 2021 08:34:51 +0100 Message-Id: <20210305073500.17926-6-dwagner@suse.de> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210305073500.17926-1-dwagner@suse.de> References: <20210305073500.17926-1-dwagner@suse.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rt-users@vger.kernel.org Store the start time when the test starts to execute in the JSON output. Signed-off-by: Daniel Wagner --- src/cyclictest/cyclictest.c | 1 + src/include/rt-utils.h | 2 ++ src/lib/rt-utils.c | 34 +++++++++++++++++++-------- src/oslat/oslat.c | 1 + src/pmqtest/pmqtest.c | 1 + src/ptsematest/ptsematest.c | 1 + src/rt-migrate-test/rt-migrate-test.c | 1 + src/sched_deadline/cyclicdeadline.c | 1 + src/signaltest/signaltest.c | 1 + src/sigwaittest/sigwaittest.c | 1 + src/svsematest/svsematest.c | 1 + 11 files changed, 35 insertions(+), 10 deletions(-) diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c index 3f3b91bab53b..033b95a3a19a 100644 --- a/src/cyclictest/cyclictest.c +++ b/src/cyclictest/cyclictest.c @@ -615,6 +615,7 @@ static void *timerthread(void *param) setitimer(ITIMER_REAL, &itimer, NULL); } + rt_test_start(); stat->threadstarted++; while (!shutdown) { diff --git a/src/include/rt-utils.h b/src/include/rt-utils.h index 11d69ea7e49a..d83f11930998 100644 --- a/src/include/rt-utils.h +++ b/src/include/rt-utils.h @@ -82,6 +82,8 @@ static inline int64_t calctime(struct timespec t) void rt_init(int argc, char *argv[]); +void rt_test_start(void); + void rt_write_json(const char *filename, void (*cb)(FILE *, void *), void *data); diff --git a/src/lib/rt-utils.c b/src/lib/rt-utils.c index 9c9d0dee3255..09d79170c371 100644 --- a/src/lib/rt-utils.c +++ b/src/lib/rt-utils.c @@ -30,6 +30,7 @@ #define TRACEBUFSIZ 1024 #define MAX_COMMAND_LINE 4096 +#define MAX_TS_SIZE 64 static char debugfileprefix[MAX_PATH]; static char *fileprefix; @@ -37,6 +38,7 @@ static int trace_fd = -1; static int tracemark_fd = -1; static __thread char tracebuf[TRACEBUFSIZ]; static char cmdline[MAX_COMMAND_LINE]; +static char ts_start[MAX_TS_SIZE]; /* * Finds the tracing directory in a mounted debugfs @@ -514,16 +516,31 @@ void rt_init(int argc, char *argv[]) } } +static void get_timestamp(char *tsbuf) +{ + struct timeval tv; + struct tm *tm; + time_t t; + + gettimeofday(&tv, NULL); + t = tv.tv_sec; + tm = localtime(&t); + /* RFC 2822-compliant date format */ + strftime(tsbuf, MAX_TS_SIZE, "%a, %d %b %Y %T %z", tm); +} + +void rt_test_start(void) +{ + get_timestamp(ts_start); +} + void rt_write_json(const char *filename, void (*cb)(FILE *, void *), void *data) { unsigned char buf[1]; struct utsname uts; - struct timeval tv; - char tsbuf[64]; - struct tm *tm; + char ts_end[MAX_TS_SIZE]; FILE *f, *s; - time_t t; size_t n; int rt = 0; @@ -535,11 +552,7 @@ void rt_write_json(const char *filename, err_exit(errno, "Failed to open '%s'\n", filename); } - gettimeofday(&tv, NULL); - t = tv.tv_sec; - tm = localtime(&t); - /* RFC 2822-compliant date format */ - strftime(tsbuf, sizeof(tsbuf), "%a, %d %b %Y %T %z", tm); + get_timestamp(ts_end); s = fopen("/sys/kernel/realtime", "r"); if (s) { @@ -556,7 +569,8 @@ void rt_write_json(const char *filename, fprintf(f, " \"file_version\": 1,\n"); fprintf(f, " \"cmdline:\": \"%s\",\n", cmdline); fprintf(f, " \"rt_test_version:\": \"%1.2f\",\n", VERSION); - fprintf(f, " \"finished\": \"%s\",\n", tsbuf); + fprintf(f, " \"start_time\": \"%s\",\n", ts_start); + fprintf(f, " \"end_time\": \"%s\",\n", ts_end); fprintf(f, " \"sysinfo\": {\n"); fprintf(f, " \"sysname\": \"%s\",\n", uts.sysname); fprintf(f, " \"nodename\": \"%s\",\n", uts.nodename); diff --git a/src/oslat/oslat.c b/src/oslat/oslat.c index ac54d05697ef..2f02f5399405 100644 --- a/src/oslat/oslat.c +++ b/src/oslat/oslat.c @@ -854,6 +854,7 @@ int main(int argc, char *argv[]) printf("Test starts...\n"); /* Reset n_threads to always run on all the cores */ g.n_threads = g.n_threads_total; + rt_test_start(); run_expt(threads, g.runtime); if (!g.quiet) diff --git a/src/pmqtest/pmqtest.c b/src/pmqtest/pmqtest.c index f96b3d0bf400..adf72c10ce83 100644 --- a/src/pmqtest/pmqtest.c +++ b/src/pmqtest/pmqtest.c @@ -583,6 +583,7 @@ int main(int argc, char *argv[]) sigemptyset(&sigset); pthread_sigmask(SIG_SETMASK, &sigset, NULL); + rt_test_start(); do { int newsamples = 0, newtimeoutcount = 0; int minsamples = INT_MAX; diff --git a/src/ptsematest/ptsematest.c b/src/ptsematest/ptsematest.c index a32bfc1698f0..471f1b307c14 100644 --- a/src/ptsematest/ptsematest.c +++ b/src/ptsematest/ptsematest.c @@ -468,6 +468,7 @@ int main(int argc, char *argv[]) maindelay.tv_sec = 0; maindelay.tv_nsec = 50000000; /* 50 ms */ + rt_test_start(); while (!shutdown) { for (i = 0; i < num_threads; i++) shutdown |= receiver[i].shutdown | sender[i].shutdown; diff --git a/src/rt-migrate-test/rt-migrate-test.c b/src/rt-migrate-test/rt-migrate-test.c index cdfbfafb200b..8f628d347a23 100644 --- a/src/rt-migrate-test/rt-migrate-test.c +++ b/src/rt-migrate-test/rt-migrate-test.c @@ -621,6 +621,7 @@ int main (int argc, char **argv) setup_ftrace_marker(); + rt_test_start(); for (loop=0; loop < nr_runs; loop++) { unsigned long long end; diff --git a/src/sched_deadline/cyclicdeadline.c b/src/sched_deadline/cyclicdeadline.c index e6811838b62d..a649e5a0fe5e 100644 --- a/src/sched_deadline/cyclicdeadline.c +++ b/src/sched_deadline/cyclicdeadline.c @@ -1213,6 +1213,7 @@ int main(int argc, char **argv) if (duration) alarm(duration); + rt_test_start(); loop(sched_data, nr_threads); for (i = 0; i < nr_threads; i++) { diff --git a/src/signaltest/signaltest.c b/src/signaltest/signaltest.c index 6abf38b7821c..7327d0d0144d 100644 --- a/src/signaltest/signaltest.c +++ b/src/signaltest/signaltest.c @@ -500,6 +500,7 @@ int main(int argc, char **argv) strerror(status)); } + rt_test_start(); while (!shutdown) { int allstarted = 1; diff --git a/src/sigwaittest/sigwaittest.c b/src/sigwaittest/sigwaittest.c index 142419f9e315..6e8bc7b50d5f 100644 --- a/src/sigwaittest/sigwaittest.c +++ b/src/sigwaittest/sigwaittest.c @@ -652,6 +652,7 @@ int main(int argc, char *argv[]) &sender[i]); } + rt_test_start(); while (!mustshutdown) { for (i = 0; i < num_threads; i++) mustshutdown |= receiver[i].shutdown | diff --git a/src/svsematest/svsematest.c b/src/svsematest/svsematest.c index 7c9d21edbab2..7533b1b569cc 100644 --- a/src/svsematest/svsematest.c +++ b/src/svsematest/svsematest.c @@ -724,6 +724,7 @@ int main(int argc, char *argv[]) &sender[i]); } + rt_test_start(); while (!mustshutdown) { for (i = 0; i < num_threads; i++) mustshutdown |= receiver[i].shutdown | From patchwork Fri Mar 5 07:34:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 394009 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 C89AFC433E6 for ; Fri, 5 Mar 2021 07:35:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 95F7864F59 for ; Fri, 5 Mar 2021 07:35:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229601AbhCEHfI (ORCPT ); Fri, 5 Mar 2021 02:35:08 -0500 Received: from mx2.suse.de ([195.135.220.15]:43740 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229562AbhCEHfH (ORCPT ); Fri, 5 Mar 2021 02:35:07 -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 45C31AEC2; Fri, 5 Mar 2021 07:35:06 +0000 (UTC) From: Daniel Wagner To: Clark Williams , John Kacur Cc: linux-rt-users@vger.kernel.org, Daniel Wagner Subject: [PATCH rt-tests v2 06/14] rt-util: Add return_code to common section of JSON output Date: Fri, 5 Mar 2021 08:34:52 +0100 Message-Id: <20210305073500.17926-7-dwagner@suse.de> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210305073500.17926-1-dwagner@suse.de> References: <20210305073500.17926-1-dwagner@suse.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rt-users@vger.kernel.org Many rt-tests return an error code if the test fails. Let's add this information to the common section. Signed-off-by: Daniel Wagner --- src/cyclictest/cyclictest.c | 2 +- src/include/rt-utils.h | 2 +- src/lib/rt-utils.c | 11 ++++++++--- src/oslat/oslat.c | 2 +- src/pmqtest/pmqtest.c | 2 +- src/ptsematest/ptsematest.c | 2 +- src/rt-migrate-test/rt-migrate-test.c | 2 +- src/sched_deadline/cyclicdeadline.c | 2 +- src/signaltest/signaltest.c | 2 +- src/sigwaittest/sigwaittest.c | 2 +- src/svsematest/svsematest.c | 2 +- 11 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c index 033b95a3a19a..59dda1973b1a 100644 --- a/src/cyclictest/cyclictest.c +++ b/src/cyclictest/cyclictest.c @@ -2135,7 +2135,7 @@ int main(int argc, char **argv) printf("\033[%dB", num_threads + 2); if (strlen(outfile) != 0) - rt_write_json(outfile, write_stats, NULL); + rt_write_json(outfile, ret, write_stats, NULL); if (quiet) quiet = 2; diff --git a/src/include/rt-utils.h b/src/include/rt-utils.h index d83f11930998..5194c239d648 100644 --- a/src/include/rt-utils.h +++ b/src/include/rt-utils.h @@ -84,7 +84,7 @@ void rt_init(int argc, char *argv[]); void rt_test_start(void); -void rt_write_json(const char *filename, +void rt_write_json(const char *filename, int return_code, void (*cb)(FILE *, void *), void *data); #endif /* __RT_UTILS.H */ diff --git a/src/lib/rt-utils.c b/src/lib/rt-utils.c index 09d79170c371..69f3b4669c9b 100644 --- a/src/lib/rt-utils.c +++ b/src/lib/rt-utils.c @@ -534,7 +534,7 @@ void rt_test_start(void) get_timestamp(ts_start); } -void rt_write_json(const char *filename, +void rt_write_json(const char *filename, int return_code, void (*cb)(FILE *, void *), void *data) { unsigned char buf[1]; @@ -571,6 +571,7 @@ void rt_write_json(const char *filename, fprintf(f, " \"rt_test_version:\": \"%1.2f\",\n", VERSION); fprintf(f, " \"start_time\": \"%s\",\n", ts_start); fprintf(f, " \"end_time\": \"%s\",\n", ts_end); + fprintf(f, " \"return_code\": %d,\n", return_code); fprintf(f, " \"sysinfo\": {\n"); fprintf(f, " \"sysname\": \"%s\",\n", uts.sysname); fprintf(f, " \"nodename\": \"%s\",\n", uts.nodename); @@ -578,9 +579,13 @@ void rt_write_json(const char *filename, fprintf(f, " \"version\": \"%s\",\n", uts.version); fprintf(f, " \"machine\": \"%s\",\n", uts.machine); fprintf(f, " \"realtime\": %d\n", rt); - fprintf(f, " },\n"); - (cb)(f, data); + if (cb) { + fprintf(f, " },\n"); + (cb)(f, data); + } else { + fprintf(f, " }\n"); + } fprintf(f, "}\n"); diff --git a/src/oslat/oslat.c b/src/oslat/oslat.c index 2f02f5399405..37d528f0f7ff 100644 --- a/src/oslat/oslat.c +++ b/src/oslat/oslat.c @@ -863,7 +863,7 @@ int main(int argc, char *argv[]) write_summary(threads); if (strlen(g.outfile) != 0) - rt_write_json(g.outfile, write_summary_json, threads); + rt_write_json(g.outfile, 0, write_summary_json, threads); if (g.cpu_list) { free(g.cpu_list); diff --git a/src/pmqtest/pmqtest.c b/src/pmqtest/pmqtest.c index adf72c10ce83..af10b416600c 100644 --- a/src/pmqtest/pmqtest.c +++ b/src/pmqtest/pmqtest.c @@ -652,7 +652,7 @@ int main(int argc, char *argv[]) .receiver = receiver, .sender = sender, }; - rt_write_json(outfile, write_stats, &ps); + rt_write_json(outfile, 0, write_stats, &ps); } nomem: diff --git a/src/ptsematest/ptsematest.c b/src/ptsematest/ptsematest.c index 471f1b307c14..70eb79e89635 100644 --- a/src/ptsematest/ptsematest.c +++ b/src/ptsematest/ptsematest.c @@ -520,7 +520,7 @@ int main(int argc, char *argv[]) .receiver = receiver, .sender = sender, }; - rt_write_json(outfile, write_stats, &ps); + rt_write_json(outfile, 0, write_stats, &ps); } nomem: diff --git a/src/rt-migrate-test/rt-migrate-test.c b/src/rt-migrate-test/rt-migrate-test.c index 8f628d347a23..1e0abdd6c0fa 100644 --- a/src/rt-migrate-test/rt-migrate-test.c +++ b/src/rt-migrate-test/rt-migrate-test.c @@ -664,7 +664,7 @@ int main (int argc, char **argv) print_results(); if (strlen(outfile) != 0) - rt_write_json(outfile, write_stats, NULL); + rt_write_json(outfile, check < 0, write_stats, NULL); if (stop) { /* diff --git a/src/sched_deadline/cyclicdeadline.c b/src/sched_deadline/cyclicdeadline.c index a649e5a0fe5e..8d801b4c154a 100644 --- a/src/sched_deadline/cyclicdeadline.c +++ b/src/sched_deadline/cyclicdeadline.c @@ -1228,7 +1228,7 @@ int main(int argc, char **argv) } if (strlen(outfile) != 0) - rt_write_json(outfile, write_stats, sched_data); + rt_write_json(outfile, 0, write_stats, sched_data); if (setcpu_buf) free(setcpu_buf); diff --git a/src/signaltest/signaltest.c b/src/signaltest/signaltest.c index 7327d0d0144d..f43920e1a853 100644 --- a/src/signaltest/signaltest.c +++ b/src/signaltest/signaltest.c @@ -559,7 +559,7 @@ int main(int argc, char **argv) free(stat[i].values); } if (strlen(outfile) != 0) - rt_write_json(outfile, write_stats, par); + rt_write_json(outfile, ret, write_stats, par); free(stat); outpar: diff --git a/src/sigwaittest/sigwaittest.c b/src/sigwaittest/sigwaittest.c index 6e8bc7b50d5f..fda44724dd62 100644 --- a/src/sigwaittest/sigwaittest.c +++ b/src/sigwaittest/sigwaittest.c @@ -707,7 +707,7 @@ int main(int argc, char *argv[]) .receiver = receiver, .sender = sender, }; - rt_write_json(outfile, write_stats, &ps); + rt_write_json(outfile, 0, write_stats, &ps); } nomem: diff --git a/src/svsematest/svsematest.c b/src/svsematest/svsematest.c index 7533b1b569cc..9485ab6d95c8 100644 --- a/src/svsematest/svsematest.c +++ b/src/svsematest/svsematest.c @@ -779,7 +779,7 @@ int main(int argc, char *argv[]) .receiver = receiver, .sender = sender, }; - rt_write_json(outfile, write_stats, &ps); + rt_write_json(outfile, 0, write_stats, &ps); } nosem: From patchwork Fri Mar 5 07:34:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 394007 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 673D5C433E0 for ; Fri, 5 Mar 2021 07:35:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2CA3964F59 for ; Fri, 5 Mar 2021 07:35:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229604AbhCEHfK (ORCPT ); Fri, 5 Mar 2021 02:35:10 -0500 Received: from mx2.suse.de ([195.135.220.15]:43814 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229582AbhCEHfI (ORCPT ); Fri, 5 Mar 2021 02:35:08 -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 7856AAE72; Fri, 5 Mar 2021 07:35:07 +0000 (UTC) From: Daniel Wagner To: Clark Williams , John Kacur Cc: linux-rt-users@vger.kernel.org, Daniel Wagner Subject: [PATCH rt-tests v2 10/14] pip_stress: Add JSON output feature Date: Fri, 5 Mar 2021 08:34:56 +0100 Message-Id: <20210305073500.17926-11-dwagner@suse.de> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210305073500.17926-1-dwagner@suse.de> References: <20210305073500.17926-1-dwagner@suse.de> MIME-Version: 1.0 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. Signed-off-by: Daniel Wagner --- src/pi_tests/pip_stress.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/pi_tests/pip_stress.c b/src/pi_tests/pip_stress.c index 0831f698ff1d..f6096a2de273 100644 --- a/src/pi_tests/pip_stress.c +++ b/src/pi_tests/pip_stress.c @@ -67,18 +67,21 @@ struct State *statep; const int policy = SCHED_FIFO; static int prio_min; /* Initialized for the minimum priority of policy */ +static char outfile[MAX_PATH]; + static void usage(int error) { printf("pip_stress V %1.2f\n", VERSION); printf("Usage:\n" "pip_stress \n"\ - "-h --help Show this help menu.\n" + "-h --help Show this help menu.\n" + " --output=FILENAME write final results into FILENAME, JSON formatted\n" ); exit(error); } enum option_values { - OPT_HELP=1 + OPT_HELP=1, OPT_OUTPUT, }; int main(int argc, char *argv[]) @@ -89,9 +92,11 @@ int main(int argc, char *argv[]) int res; int *minimum_priority = (int*)&prio_min; + rt_init(argc, argv); for (;;) { struct option long_options[] = { {"help", no_argument, NULL, OPT_HELP}, + {"output", required_argument, NULL, OPT_OUTPUT }, {NULL, 0, NULL, 0} }; @@ -103,6 +108,9 @@ int main(int argc, char *argv[]) case 'h': usage(0); break; + case OPT_OUTPUT: + strncpy(outfile, optarg, strnlen(optarg, MAX_PATH-1)); + break; default: usage(1); break; @@ -145,6 +153,7 @@ int main(int argc, char *argv[]) err_exit(err, NULL); } + rt_test_start(); pid1 = fork(); if (pid1 == -1) { perror("fork"); @@ -165,6 +174,9 @@ int main(int argc, char *argv[]) } } + if (strlen(outfile) != 0) + rt_write_json(outfile, !statep->inversion, NULL, NULL); + if (!statep->inversion) { printf("No inversion incurred\n"); exit(1); From patchwork Fri Mar 5 07:34:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 394006 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 1F6C5C4332D for ; Fri, 5 Mar 2021 07:35:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E440164FFD for ; Fri, 5 Mar 2021 07:35:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229615AbhCEHfL (ORCPT ); Fri, 5 Mar 2021 02:35:11 -0500 Received: from mx2.suse.de ([195.135.220.15]:43740 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229592AbhCEHfJ (ORCPT ); Fri, 5 Mar 2021 02:35:09 -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 1C67AAE89; Fri, 5 Mar 2021 07:35:08 +0000 (UTC) From: Daniel Wagner To: Clark Williams , John Kacur Cc: linux-rt-users@vger.kernel.org, Daniel Wagner Subject: [PATCH rt-tests v2 12/14] pi_stress: Add JSON output feature Date: Fri, 5 Mar 2021 08:34:58 +0100 Message-Id: <20210305073500.17926-13-dwagner@suse.de> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210305073500.17926-1-dwagner@suse.de> References: <20210305073500.17926-1-dwagner@suse.de> MIME-Version: 1.0 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. Signed-off-by: Daniel Wagner --- src/pi_tests/pi_stress.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/pi_tests/pi_stress.c b/src/pi_tests/pi_stress.c index 73f0e6a402e3..3f93d4aadd53 100644 --- a/src/pi_tests/pi_stress.c +++ b/src/pi_tests/pi_stress.c @@ -99,6 +99,9 @@ int debugging = 0; int quiet = 0; /* turn off all prints, default = 0 (off) */ +/* filename for JSON output */ +char outfile[MAX_PATH]; + /* prompt to start test */ int prompt = 0; @@ -209,6 +212,7 @@ int create_group(struct group_parameters *group); unsigned long total_inversions(void); void banner(void); void summary(void); +void write_stats(FILE *f, void *data); void wait_for_termination(void); int barrier_init(pthread_barrier_t *b, const pthread_barrierattr_t *attr, unsigned int count, const char *name); @@ -235,6 +239,7 @@ int main(int argc, char **argv) /* process command line arguments */ + rt_init(argc, argv); process_command_line(argc, argv); /* set default sched attributes */ @@ -299,6 +304,7 @@ int main(int argc, char **argv) } /* report */ banner(); + rt_test_start(); start = time(NULL); /* turn loose the threads */ @@ -335,6 +341,10 @@ int main(int argc, char **argv) kill(0, SIGTERM); finish = time(NULL); summary(); + + if (strlen(outfile) != 0) + rt_write_json(outfile, retval, write_stats, NULL); + if (lockall) munlockall(); exit(retval); @@ -983,6 +993,7 @@ void usage(int error) "-h --help print this message\n" "-i INV --inversions=INV number of inversions per group (default is infinite)\n" "-m --mlockall lock current and future memory\n" + " --output=FILENAME write final results into FILENAME, JSON formatted\n" "-p --prompt prompt before starting the test\n" "-q --quiet suppress running output\n" "-r --rr use SCHED_RR for test threads [SCHED_FIFO]\n" @@ -1276,7 +1287,7 @@ int process_sched_line(const char *arg) enum option_values { OPT_DEBUG=1, OPT_DURATION, OPT_GROUPS, OPT_HELP, OPT_INVERSIONS, - OPT_MLOCKALL, OPT_PROMPT, OPT_QUIET, OPT_RR, OPT_SCHED, + OPT_MLOCKALL, OPT_OUTPUT, OPT_PROMPT, OPT_QUIET, OPT_RR, OPT_SCHED, OPT_UNIPROCESSOR, OPT_VERBOSE, OPT_VERSION, }; @@ -1290,6 +1301,7 @@ void process_command_line(int argc, char **argv) {"help", no_argument, NULL, OPT_HELP}, {"inversions", required_argument, NULL, OPT_INVERSIONS}, {"mlockall", no_argument, NULL, OPT_MLOCKALL}, + {"output", required_argument, NULL, OPT_OUTPUT}, {"prompt", no_argument, NULL, OPT_PROMPT}, {"quiet", no_argument, NULL, OPT_QUIET}, {"rr", no_argument, NULL, OPT_RR}, @@ -1336,6 +1348,9 @@ void process_command_line(int argc, char **argv) case 'm': lockall = 1; break; + case OPT_OUTPUT: + strncpy(outfile, optarg, strnlen(optarg, MAX_PATH-1)); + break; case OPT_PROMPT: case 'p': prompt = 1; @@ -1439,6 +1454,11 @@ void summary(void) t->tm_yday, t->tm_hour, t->tm_min, t->tm_sec); } +void write_stats(FILE *f, void *data) +{ + fprintf(f, " \"inversion\": %lu\n", total_inversions()); +} + int barrier_init(pthread_barrier_t *b, const pthread_barrierattr_t *attr, unsigned int count, const char *name) From patchwork Fri Mar 5 07:35:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 394005 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 C5344C4332B for ; Fri, 5 Mar 2021 07:35:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8860A65015 for ; Fri, 5 Mar 2021 07:35:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229631AbhCEHfM (ORCPT ); Fri, 5 Mar 2021 02:35:12 -0500 Received: from mx2.suse.de ([195.135.220.15]:43782 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229602AbhCEHfJ (ORCPT ); Fri, 5 Mar 2021 02:35:09 -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 AED40AD72; Fri, 5 Mar 2021 07:35:08 +0000 (UTC) From: Daniel Wagner To: Clark Williams , John Kacur Cc: linux-rt-users@vger.kernel.org, Daniel Wagner Subject: [PATCH rt-tests v2 14/14] ssdd: Add JSON output feature Date: Fri, 5 Mar 2021 08:35:00 +0100 Message-Id: <20210305073500.17926-15-dwagner@suse.de> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210305073500.17926-1-dwagner@suse.de> References: <20210305073500.17926-1-dwagner@suse.de> MIME-Version: 1.0 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. Signed-off-by: Daniel Wagner --- src/ssdd/ssdd.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/ssdd/ssdd.c b/src/ssdd/ssdd.c index 50bec824b2e8..3ead14d0127e 100644 --- a/src/ssdd/ssdd.c +++ b/src/ssdd/ssdd.c @@ -36,6 +36,8 @@ #include #include +#include "rt-utils.h" + /* do_wait return values */ #define STATE_EXITED 1 #define STATE_STOPPED 2 @@ -65,10 +67,11 @@ static const char *get_state_name(int state) #define unused __attribute__((unused)) static int quiet; +static char outfile[MAX_PATH]; static int got_sigchld; -enum option_value { OPT_NFORKS=1, OPT_NITERS, OPT_HELP, OPT_QUIET }; +enum option_value { OPT_NFORKS=1, OPT_NITERS, OPT_HELP, OPT_OUTPUT, OPT_QUIET }; static void usage(int error) { @@ -77,6 +80,7 @@ static void usage(int error) "ssdd \n\n" "-f --forks=NUM number of forks\n" "-h --help print this message\n" + " --output=FILENAME write final results into FILENAME, JSON formatted\n" "-q --quiet suppress running output\n" "-i --iters=NUM number of iterations\n" ); @@ -295,12 +299,14 @@ int main(int argc, char **argv) setbuf(stdout, NULL); + rt_init(argc, argv); for (;;) { int option_index = 0; static struct option long_options[] = { {"forks", required_argument, NULL, OPT_NFORKS}, {"help", no_argument, NULL, OPT_HELP}, + {"output", required_argument, NULL, OPT_OUTPUT}, {"quiet", no_argument, NULL, OPT_QUIET}, {"iters", required_argument, NULL, OPT_NITERS}, {NULL, 0, NULL, 0}, @@ -317,6 +323,9 @@ int main(int argc, char **argv) case OPT_HELP: usage(0); break; + case OPT_OUTPUT: + strncpy(outfile, optarg, strnlen(optarg, MAX_PATH-1)); + break; case OPT_QUIET: case 'q': quiet = 1; @@ -348,6 +357,7 @@ int main(int argc, char **argv) forktests(i); } + rt_test_start(); for (i = 0; i < nforks; i++) { status = do_wait(&wait_pid, &ret_sig); if (status != STATE_EXITED) { @@ -363,5 +373,9 @@ int main(int argc, char **argv) printf("%s.\n", error ? "One or more tests FAILED" : "All tests PASSED"); + + if (strlen(outfile) != 0) + rt_write_json(outfile, error, NULL, NULL); + exit(error); }