| Message ID | 20220826184500.1940077-3-vipinsh@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | dirty_log_perf_test cpu pinning and some goodies | expand |
On Fri, Aug 26, 2022 at 11:44:58AM -0700, Vipin Sharma wrote: > There are 13 command line options and they are not in any order. Put > them in alphabetical order to make it easy to add new options. Arguably it's actually easiest to insert into an unsorted list, but kvm selftests loves alphabetical order (I'm looking at you Makefile and .gitignore). Uh oh, I did just look at those files and they're full of violations! Oh well... Let's see how long these command lines options stay ordered :-) Thanks, drew > > No functional change intended. > > Signed-off-by: Vipin Sharma <vipinsh@google.com> > --- > .../selftests/kvm/dirty_log_perf_test.c | 36 ++++++++++--------- > 1 file changed, 19 insertions(+), 17 deletions(-) > > diff --git a/tools/testing/selftests/kvm/dirty_log_perf_test.c b/tools/testing/selftests/kvm/dirty_log_perf_test.c > index a03db7f9f4c0..acf8b80c91d1 100644 > --- a/tools/testing/selftests/kvm/dirty_log_perf_test.c > +++ b/tools/testing/selftests/kvm/dirty_log_perf_test.c > @@ -406,51 +406,53 @@ int main(int argc, char *argv[]) > > guest_modes_append_default(); > > - while ((opt = getopt(argc, argv, "eghi:p:m:nb:f:v:os:x:")) != -1) { > + while ((opt = getopt(argc, argv, "b:ef:ghi:m:nop:s:v:x:")) != -1) { > switch (opt) { > + case 'b': > + guest_percpu_mem_size = parse_size(optarg); > + break; > case 'e': > /* 'e' is for evil. */ > run_vcpus_while_disabling_dirty_logging = true; > dirty_log_manual_caps = 0; > break; > + case 'f': > + p.wr_fract = atoi(optarg); > + TEST_ASSERT(p.wr_fract >= 1, > + "Write fraction cannot be less than one"); > + break; > case 'g': > dirty_log_manual_caps = 0; > break; > + case 'h': > + help(argv[0]); > + break; > case 'i': > p.iterations = atoi(optarg); > break; > - case 'p': > - p.phys_offset = strtoull(optarg, NULL, 0); > - break; > case 'm': > guest_modes_cmdline(optarg); > break; > case 'n': > perf_test_args.nested = true; > break; > - case 'b': > - guest_percpu_mem_size = parse_size(optarg); > + case 'o': > + p.partition_vcpu_memory_access = false; > break; > - case 'f': > - p.wr_fract = atoi(optarg); > - TEST_ASSERT(p.wr_fract >= 1, > - "Write fraction cannot be less than one"); > + case 'p': > + p.phys_offset = strtoull(optarg, NULL, 0); > + break; > + case 's': > + p.backing_src = parse_backing_src_type(optarg); > break; > case 'v': > nr_vcpus = atoi(optarg); > TEST_ASSERT(nr_vcpus > 0 && nr_vcpus <= max_vcpus, > "Invalid number of vcpus, must be between 1 and %d", max_vcpus); > break; > - case 'o': > - p.partition_vcpu_memory_access = false; > - break; > - case 's': > - p.backing_src = parse_backing_src_type(optarg); > - break; > case 'x': > p.slots = atoi(optarg); > break; > - case 'h': > default: > help(argv[0]); > break; > -- > 2.37.2.672.g94769d06f0-goog >
diff --git a/tools/testing/selftests/kvm/dirty_log_perf_test.c b/tools/testing/selftests/kvm/dirty_log_perf_test.c index a03db7f9f4c0..acf8b80c91d1 100644 --- a/tools/testing/selftests/kvm/dirty_log_perf_test.c +++ b/tools/testing/selftests/kvm/dirty_log_perf_test.c @@ -406,51 +406,53 @@ int main(int argc, char *argv[]) guest_modes_append_default(); - while ((opt = getopt(argc, argv, "eghi:p:m:nb:f:v:os:x:")) != -1) { + while ((opt = getopt(argc, argv, "b:ef:ghi:m:nop:s:v:x:")) != -1) { switch (opt) { + case 'b': + guest_percpu_mem_size = parse_size(optarg); + break; case 'e': /* 'e' is for evil. */ run_vcpus_while_disabling_dirty_logging = true; dirty_log_manual_caps = 0; break; + case 'f': + p.wr_fract = atoi(optarg); + TEST_ASSERT(p.wr_fract >= 1, + "Write fraction cannot be less than one"); + break; case 'g': dirty_log_manual_caps = 0; break; + case 'h': + help(argv[0]); + break; case 'i': p.iterations = atoi(optarg); break; - case 'p': - p.phys_offset = strtoull(optarg, NULL, 0); - break; case 'm': guest_modes_cmdline(optarg); break; case 'n': perf_test_args.nested = true; break; - case 'b': - guest_percpu_mem_size = parse_size(optarg); + case 'o': + p.partition_vcpu_memory_access = false; break; - case 'f': - p.wr_fract = atoi(optarg); - TEST_ASSERT(p.wr_fract >= 1, - "Write fraction cannot be less than one"); + case 'p': + p.phys_offset = strtoull(optarg, NULL, 0); + break; + case 's': + p.backing_src = parse_backing_src_type(optarg); break; case 'v': nr_vcpus = atoi(optarg); TEST_ASSERT(nr_vcpus > 0 && nr_vcpus <= max_vcpus, "Invalid number of vcpus, must be between 1 and %d", max_vcpus); break; - case 'o': - p.partition_vcpu_memory_access = false; - break; - case 's': - p.backing_src = parse_backing_src_type(optarg); - break; case 'x': p.slots = atoi(optarg); break; - case 'h': default: help(argv[0]); break;
There are 13 command line options and they are not in any order. Put them in alphabetical order to make it easy to add new options. No functional change intended. Signed-off-by: Vipin Sharma <vipinsh@google.com> --- .../selftests/kvm/dirty_log_perf_test.c | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-)