Re: [PATCH rt-tests v5 06/13] cyclicdeadline: Add JSON output feature

[John Kacur <jkacur@redhat.com>]

On Wed, 10 Feb 2021, Daniel Wagner wrote:

> Write the test results as JSON output to a file. This allows to
> simplifies any parsing later on.
> 
> Signed-off-by: Daniel Wagner <dwagner@suse.de>
> ---
>  src/sched_deadline/cyclicdeadline.c | 72 ++++++++++++++++++++++-------
>  1 file changed, 56 insertions(+), 16 deletions(-)
> 
> diff --git a/src/sched_deadline/cyclicdeadline.c b/src/sched_deadline/cyclicdeadline.c
> index 71cde5781499..ed3c960d9916 100644
> --- a/src/sched_deadline/cyclicdeadline.c
> +++ b/src/sched_deadline/cyclicdeadline.c
> @@ -18,6 +18,7 @@
>  #include <errno.h>
>  #include <signal.h>
>  #include <getopt.h>
> +#include <inttypes.h>
>  
>  #include <sys/syscall.h>
>  #include <sys/types.h>
> @@ -85,13 +86,11 @@ static pthread_barrier_t barrier;
>  
>  static int cpu_count;
>  static int all_cpus;
> -
>  static int nr_threads;
>  static int use_nsecs;
> -
>  static int mark_fd;
> -
>  static int quiet;
> +static char outfile[MAX_PATH];
>  
>  static int find_mount(const char *mount, char *debugfs)
>  {
> @@ -603,16 +602,17 @@ static void usage(int error)
>  	       "                           tasks on. An empty CPUSET runs on all CPUs a deadline\n"
>  	       "                           task.\n"
>  	       "                           on CPU 4, and thread #5 on CPU 5.\n"
> -	       "-D TIME     --duration     Specify a length for the test run.\n"
> +	       "-D TIME  --duration        Specify a length for the test run.\n"
>  	       "                           Append 'm', 'h', or 'd' to specify minutes, hours or\n"
>  	       "                           days\n"
> -	       "-h          --help         Show this help menu.\n"
> -	       "-i INTV     --interval     The shortest deadline for the tasks in us\n"
> +	       "-h       --help            Show this help menu.\n"
> +	       "-i INTV  --interval        The shortest deadline for the tasks in us\n"
>  	       "                           (default 1000us).\n"
> -	       "-s STEP     --step         The amount to increase the deadline for each task in us\n"
> +	       "         --output=FILENAME write final results into FILENAME, JSON formatted\n"
> +	       "-s STEP  --step            The amount to increase the deadline for each task in us\n"
>  	       "                           (default 500us).\n"
> -	       "-t NUM      --threads      The number of threads to run as deadline (default 1).\n"
> -	       "-q          --quiet        print a summary only on exit\n"
> +	       "-t NUM   --threads         The number of threads to run as deadline (default 1).\n"
> +	       "-q       --quiet           print a summary only on exit\n"
>  	       );
>  	exit(error);
>  }
> @@ -966,6 +966,32 @@ static void loop(struct sched_data *sched_data, int nr_threads)
>  	}
>  }
>  
> +static void write_stats(FILE *f, void *data)
> +{
> +	struct sched_data *sd = data;
> +	struct thread_stat *s;
> +	unsigned int i;
> +
> +	fprintf(f, "  \"num_threads\": %d,\n", nr_threads);
> +	fprintf(f, "  \"resolution_in_ns\": %u,\n", use_nsecs);
> +	fprintf(f, "  \"thread\": {\n");
> +	for (i = 0; i < nr_threads; i++) {
> +		s = &sd[i].stat;
> +		fprintf(f, "    \"%u\": {\n", 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, "    }%s\n", i == nr_threads - 1 ? "" : ",");
> +	}
> +	fprintf(f, "  }\n");
> +}
> +
> +enum options_valud {
> +	OPT_AFFINITY=1, OPT_DURATION, OPT_HELP, OPT_INTERVAL,
> +	OPT_OUTPUT, OPT_STEP, OPT_THREADS, OPT_QUIET
> +};
> +
>  int main(int argc, char **argv)
>  {
>  	struct sched_data *sched_data;
> @@ -992,19 +1018,21 @@ int main(int argc, char **argv)
>  
>  	for (;;) {
>  		static struct option options[] = {
> -			{ "affinity",	optional_argument,	NULL,	'a' },
> -			{ "duration",	required_argument,	NULL,	'D' },
> -			{ "help",	no_argument,		NULL,	'h' },
> -			{ "interval",	required_argument,	NULL,	'i' },
> -			{ "step",	required_argument,	NULL,	's' },
> -			{ "threads",	required_argument,	NULL,	't' },
> -			{ "quiet",	no_argument,		NULL,	'q' },
> +			{ "affinity",	optional_argument,	NULL,	OPT_AFFINITY },
> +			{ "duration",	required_argument,	NULL,	OPT_DURATION },
> +			{ "help",	no_argument,		NULL,	OPT_HELP },
> +			{ "interval",	required_argument,	NULL,	OPT_INTERVAL },
> +			{ "output",	required_argument,	NULL,	OPT_OUTPUT },
> +			{ "step",	required_argument,	NULL,	OPT_STEP },
> +			{ "threads",	required_argument,	NULL,	OPT_THREADS },
> +			{ "quiet",	no_argument,		NULL,	OPT_QUIET },
>  			{ NULL,		0,			NULL,	0   },
>  		};
>  		c = getopt_long(argc, argv, "a::c:D:hi:s:t:q", options, NULL);
>  		if (c == -1)
>  			break;
>  		switch (c) {
> +		case OPT_AFFINITY:
>  		case 'a':
>  		case 'c':
>  			if (!nr_threads)
> @@ -1016,21 +1044,30 @@ int main(int argc, char **argv)
>  			else
>  				all_cpus = 1;
>  			break;
> +		case OPT_INTERVAL:
>  		case 'i':
>  			interval = atoi(optarg);
>  			break;
> +		case OPT_OUTPUT:
> +			strncpy(outfile, optarg, strnlen(optarg, MAX_PATH-1));
> +			break;
> +		case OPT_STEP:
>  		case 's':
>  			step = atoi(optarg);
>  			break;
> +		case OPT_THREADS:
>  		case 't':
>  			nr_threads = atoi(optarg);
>  			break;
> +		case OPT_DURATION:
>  		case 'D':
>  			duration = parse_time_string(optarg);
>  			break;
> +		case OPT_QUIET:
>  		case 'q':
>  			quiet = 1;
>  			break;
> +		case OPT_HELP:
>  		case 'h':
>  			usage(0);
>  			break;
> @@ -1190,6 +1227,9 @@ int main(int argc, char **argv)
>  		}
>  	}
>  
> +	if (strlen(outfile) != 0)
> +		rt_write_json(outfile, argc, argv, write_stats, sched_data);
> +
>  	if (setcpu_buf)
>  		free(setcpu_buf);
>  	free(thread);
> -- 
> 2.30.0
> 
> 

Signed-off-by: John Kacur <jkacur@redhat.com>