| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <1300109386.9910.67.camel@gandalf.stny.rr.com>
Date: Mon, 14 Mar 2011 09:29:46 -0400
From: Steven Rostedt <rostedt@...dmis.org>
To: Lai Jiangshan <laijs@...fujitsu.com>
Cc: LKML <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH 3/3 V2] trace-cmd: fold option parsing
On Mon, 2011-03-14 at 10:42 +0800, Lai Jiangshan wrote:
> Signed-off-by: Lai Jiangshan <laijs@...fujitsu.com>
> ---
> trace-listen.c | 14 +++++++-------
> trace-read.c | 37 +++++++++++++++++--------------------
> trace-record.c | 16 +++++++---------
> trace-stack.c | 34 +++++++++++++++++-----------------
> 4 files changed, 48 insertions(+), 53 deletions(-)
Thanks Lai,
But I already applied your original changes, and then added a patch to
convert the defines into enums.
-- Steve
>
> diff --git a/trace-listen.c b/trace-listen.c
> index e60c96b..e1cf9ea 100644
> --- a/trace-listen.c
> +++ b/trace-listen.c
> @@ -647,6 +647,10 @@ static void start_daemon(void)
> die("starting daemon");
> }
>
> +enum {
> + OPT_debug = 128,
> +};
> +
> void trace_listen(int argc, char **argv)
> {
> char *logfile = NULL;
> @@ -666,7 +670,7 @@ void trace_listen(int argc, char **argv)
> static struct option long_options[] = {
> {"port", required_argument, NULL, 'p'},
> {"help", no_argument, NULL, '?'},
> - {"debug", no_argument, NULL, 0},
> + {"debug", no_argument, NULL, OPT_debug},
> {NULL, 0, NULL, 0}
> };
>
> @@ -696,12 +700,8 @@ void trace_listen(int argc, char **argv)
> case 'D':
> daemon = 1;
> break;
> - case 0:
> - switch (option_index) {
> - case 2:
> - debug = 1;
> - break;
> - }
> + case OPT_debug:
> + debug = 1;
> break;
> default:
> usage(argv);
> diff --git a/trace-read.c b/trace-read.c
> index 63e2940..dfd945e 100644
> --- a/trace-read.c
> +++ b/trace-read.c
> @@ -815,6 +815,12 @@ static void add_functions(struct pevent *pevent, const char *file)
> free(buf);
> }
>
> +enum {
> + OPT_cpu = 128,
> + OPT_events,
> + OPT_kallsyms,
> +};
> +
> void trace_report (int argc, char **argv)
> {
> struct tracecmd_input *handle;
> @@ -848,10 +854,10 @@ void trace_report (int argc, char **argv)
> for (;;) {
> int option_index = 0;
> static struct option long_options[] = {
> - {"cpu", required_argument, NULL, 0},
> - {"events", no_argument, NULL, 0},
> + {"cpu", required_argument, NULL, OPT_cpu},
> + {"events", no_argument, NULL, OPT_events},
> {"filter-test", no_argument, NULL, 'T'},
> - {"kallsyms", required_argument, NULL, 0},
> + {"kallsyms", required_argument, NULL, OPT_kallsyms},
> {"help", no_argument, NULL, '?'},
> {NULL, 0, NULL, 0}
> };
> @@ -920,23 +926,14 @@ void trace_report (int argc, char **argv)
> case 'q':
> silence_warnings = 1;
> break;
> - case 0:
> - switch(option_index) {
> - case 0: /* cpu */
> - parse_cpulist(optarg);
> - break;
> - case 1: /* events */
> - print_events = 1;
> - break;
> - case 2: /* filter-test */
> - test_filters = 1;
> - break;
> - case 3: /* kallsyms */
> - functions = optarg;
> - break;
> - default:
> - usage(argv);
> - }
> + case OPT_cpu:
> + parse_cpulist(optarg);
> + break;
> + case OPT_events:
> + print_events = 1;
> + break;
> + case OPT_kallsyms:
> + functions = optarg;
> break;
> default:
> usage(argv);
> diff --git a/trace-record.c b/trace-record.c
> index 2611bfa..dd1f18c 100644
> --- a/trace-record.c
> +++ b/trace-record.c
> @@ -1809,6 +1809,10 @@ static void record_all_events(void)
> listed_events = list;
> }
>
> +enum {
> + OPT_date = 128,
> +};
> +
> void trace_record (int argc, char **argv)
> {
> const char *plugin = NULL;
> @@ -1862,7 +1866,7 @@ void trace_record (int argc, char **argv)
> for (;;) {
> int option_index = 0;
> static struct option long_options[] = {
> - {"date", no_argument, NULL, 0},
> + {"date", no_argument, NULL, OPT_date},
> {"help", no_argument, NULL, '?'},
> {NULL, 0, NULL, 0}
> };
> @@ -2002,14 +2006,8 @@ void trace_record (int argc, char **argv)
> case 'i':
> ignore_event_not_found = 1;
> break;
> - case 0:
> - switch (option_index) {
> - case 0: /* date */
> - date = 1;
> - break;
> - default:
> - usage(argv);
> - }
> + case OPT_date:
> + date = 1;
> break;
> default:
> usage(argv);
> diff --git a/trace-stack.c b/trace-stack.c
> index 3d9f392..52c30de 100644
> --- a/trace-stack.c
> +++ b/trace-stack.c
> @@ -153,6 +153,12 @@ static void read_trace(void)
> fclose(fp);
> }
>
> +enum {
> + OPT_start = 128,
> + OPT_stop,
> + OPT_reset,
> +};
> +
> void trace_stack (int argc, char **argv)
> {
> enum stack_type trace_type = STACK_REPORT;
> @@ -167,9 +173,9 @@ void trace_stack (int argc, char **argv)
> for (;;) {
> int option_index = 0;
> static struct option long_options[] = {
> - {"start", no_argument, NULL, 0},
> - {"stop", no_argument, NULL, 0},
> - {"reset", no_argument, NULL, 0},
> + {"start", no_argument, NULL, OPT_start},
> + {"stop", no_argument, NULL, OPT_stop},
> + {"reset", no_argument, NULL, OPT_reset},
> {"help", no_argument, NULL, '?'},
> {NULL, 0, NULL, 0}
> };
> @@ -183,20 +189,14 @@ void trace_stack (int argc, char **argv)
> case 'h':
> usage(argv);
> break;
> - case 0:
> - switch(option_index) {
> - case 0:
> - trace_type = STACK_START;
> - break;
> - case 1:
> - trace_type = STACK_STOP;
> - break;
> - case 2:
> - trace_type = STACK_RESET;
> - break;
> - default:
> - usage(argv);
> - }
> + case OPT_start:
> + trace_type = STACK_START;
> + break;
> + case OPT_stop:
> + trace_type = STACK_STOP;
> + break;
> + case OPT_reset:
> + trace_type = STACK_RESET;
> break;
> default:
> usage(argv);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists