On Wed, 7 Oct 2020, Daniel Wagner wrote:
> Signed-off-by: Daniel Wagner <dwagner@xxxxxxx>
> ---
> src/oslat/oslat.8 | 2 +-
> src/oslat/oslat.c | 78 ++++++++++++++++++++++-------------------------
> 2 files changed, 38 insertions(+), 42 deletions(-)
>
> diff --git a/src/oslat/oslat.8 b/src/oslat/oslat.8
> index 85f2c5bcdf5c..b481d8d82783 100644
> --- a/src/oslat/oslat.8
> +++ b/src/oslat/oslat.8
> @@ -36,7 +36,7 @@ Total memory usage will be this value multiplies 2*N,
> because there will be src/dst buffers for each thread, and
> N is the number of processors for testing.
> .TP
> -.B \-t, \-\-runtime=SEC
> +.B \-D, \-\-duration=TIME
> Specify test duration, e.g., 60, 20m, 2H (m/M: minutes, h/H: hours, d/D: days).
> By default the unit is s/second.
> .TP
> diff --git a/src/oslat/oslat.c b/src/oslat/oslat.c
> index f1a82f2367d2..fafbdd694326 100644
> --- a/src/oslat/oslat.c
> +++ b/src/oslat/oslat.c
> @@ -507,42 +507,37 @@ static void handle_alarm(int code)
> g.cmd = STOP;
> }
>
> -const char *helpmsg =
> -"Usage: %s [options]\n"
> -"\n"
> -"This is an OS latency detector by running busy loops on specified cores.\n"
> -"Please run this tool using root.\n"
> -"\n"
> -"Available options:\n"
> -"\n"
> -" -b, --bucket-size Specify the number of the buckets (4-1024)\n"
> -" -B, --bias Add a bias to all the buckets using the estimated mininum\n"
> -" -c, --cpu-list Specify CPUs to run on, e.g. '1,3,5,7-15'\n"
> -" -C, --cpu-main-thread Specify which CPU the main thread runs on. Default is cpu0.\n"
> -" -f, --rtprio Using SCHED_FIFO priority (1-99)\n"
> -" -m, --workload-mem Size of the memory to use for the workload (e.g., 4K, 1M).\n"
> -" Total memory usage will be this value multiplies 2*N,\n"
> -" because there will be src/dst buffers for each thread, and\n"
> -" N is the number of processors for testing.\n"
> -" -s, --single-preheat Use a single thread when measuring latency at preheat stage\n"
> -" NOTE: please make sure the CPU frequency on all testing cores\n"
> -" are locked before using this parmater. If you don't know how\n"
> -" to lock the freq then please don't use this parameter.\n"
> -" -t, --runtime Specify test duration, e.g., 60, 20m, 2H\n"
> -" (m/M: minutes, h/H: hours, d/D: days)\n"
> -" -T, --trace-threshold Stop the test when threshold triggered (in us),\n"
> -" print a marker in ftrace and stop ftrace too.\n"
> -" -v, --version Display the version of the software.\n"
> -" -w, --workload Specify a kind of workload, default is no workload\n"
> -" (options: no, memmove)\n"
> -" -z, --zero-omit Don't display buckets in the output histogram if all zeros.\n"
> -"\n"
> -;
> -
> -static void usage(void)
> +static void usage(int error)
> {
> - printf(helpmsg, g.app_name);
> - exit(1);
> + printf("oslat V %1.2f\n", VERSION);
> + printf("Usage:\n"
> + "oslat <options>\n\n"
> + "This is an OS latency detector by running busy loops on specified cores.\n"
> + "Please run this tool using root.\n\n"
> + "Available options:\n\n"
> + "-b, --bucket-size Specify the number of the buckets (4-1024)\n"
> + "-B, --bias Add a bias to all the buckets using the estimated mininum\n"
> + "-c, --cpu-list Specify CPUs to run on, e.g. '1,3,5,7-15'\n"
> + "-C, --cpu-main-thread Specify which CPU the main thread runs on. Default is cpu0.\n"
> + "-D, --duration Specify test duration, e.g., 60, 20m, 2H\n"
> + " (m/M: minutes, h/H: hours, d/D: days)\n"
> + "-f, --rtprio Using SCHED_FIFO priority (1-99)\n"
> + "-m, --workload-mem Size of the memory to use for the workload (e.g., 4K, 1M).\n"
> + " Total memory usage will be this value multiplies 2*N,\n"
> + " because there will be src/dst buffers for each thread, and\n"
> + " N is the number of processors for testing.\n"
> + "-s, --single-preheat Use a single thread when measuring latency at preheat stage\n"
> + " NOTE: please make sure the CPU frequency on all testing cores\n"
> + " are locked before using this parmater. If you don't know how\n"
> + " to lock the freq then please don't use this parameter.\n"
> + "-T, --trace-threshold Stop the test when threshold triggered (in us),\n"
> + " print a marker in ftrace and stop ftrace too.\n"
> + "-v, --version Display the version of the software.\n"
> + "-w, --workload Specify a kind of workload, default is no workload\n"
> + " (options: no, memmove)\n"
> + "-z, --zero-omit Don't display buckets in the output histogram if all zeros.\n"
> + );
> + exit(error);
> }
>
> /* TODO: use libnuma? */
> @@ -661,7 +656,7 @@ static void parse_options(int argc, char *argv[])
> { "bucket-size", required_argument, NULL, 'b' },
> { "cpu-list", required_argument, NULL, 'c' },
> { "cpu-main-thread", required_argument, NULL, 'C'},
> - { "runtime", required_argument, NULL, 't' },
> + { "duration", required_argument, NULL, 'D' },
> { "rtprio", required_argument, NULL, 'f' },
> { "help", no_argument, NULL, 'h' },
> { "trace-threshold", required_argument, NULL, 'T' },
> @@ -673,7 +668,7 @@ static void parse_options(int argc, char *argv[])
> { "version", no_argument, NULL, 'v'},
> { NULL, 0, NULL, 0 },
> };
> - int i, c = getopt_long(argc, argv, "b:Bc:C:f:hm:st:w:T:vz",
> + int i, c = getopt_long(argc, argv, "b:Bc:C:D:f:hm:sw:T:vz",
> options, NULL);
> long ncores;
>
> @@ -704,7 +699,7 @@ static void parse_options(int argc, char *argv[])
> exit(1);
> }
> break;
> - case 't':
> + case 'D':
> g.runtime = parse_runtime(optarg);
> if (!g.runtime) {
> printf("Illegal runtime: %s\n", optarg);
> @@ -761,8 +756,11 @@ static void parse_options(int argc, char *argv[])
> case 'z':
> g.output_omit_zero_buckets = 1;
> break;
> + case 'h':
> + usage(0);
> + break;
> default:
> - usage();
> + usage(1);
> break;
> }
> }
> @@ -821,8 +819,6 @@ int main(int argc, char *argv[])
> /* Run the main thread on cpu0 by default */
> g.cpu_main_thread = 0;
>
> - printf("\nVersion: %1.2f\n\n", VERSION);
> -
> parse_options(argc, argv);
>
> TEST(mlockall(MCL_CURRENT | MCL_FUTURE) == 0);
> --
> 2.28.0
>
>
Signed-off-by: John Kacur <jkacur@xxxxxxxxxx>
Thanks
In the future at least put one line in the text though, not just a title.
