2015-11-09 10:55:13

by Taeung Song

Subject: [PATCH] perf tools: Correct typing errors about '-' or '_' in config variable.

To improve perf config usability, we should probably also recognize
underscores in perf config entries, i.e. the following variants
should both work: as suggested by Ingo Molnar

print_percent = 1
print-percent = 1

So, add functionality for it.
'annotate' section has variables that contain '_' underscores like:

hide_src_code
use_offset
jump_arrows
show_nr_jumps

However other sections has variables that contain a '-' dash
or neither it or underscore i.e.

ui.show-headers
call-graph.print-limit
tui.report

So, convert the characters if typing errors about underscores
or a dash when parsing the config file.

Cc: Namhyung Kim <[email protected]>
Cc: Jiri Olsa <[email protected]>
Signed-off-by: Taeung Song <[email protected]>
---
tools/perf/util/config.c | 8 ++++++++
1 file changed, 8 insertions(+)

diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
index 2e452ac..69db606 100644
--- a/tools/perf/util/config.c
+++ b/tools/perf/util/config.c
@@ -129,7 +129,10 @@ static int get_value(config_fn_t fn, void *data, char *name, unsigned int len)
{
int c;
char *value;
+ bool has_underscore = false;

+ if (prefixcmp(name, "annotate.") == 0)
+ has_underscore = true;
/* Get the full name */
for (;;) {
c = get_next_char();
@@ -137,6 +140,11 @@ static int get_value(config_fn_t fn, void *data, char *name, unsigned int len)
break;
if (!iskeychar(c))
break;
+ /* Correct typing errors about dash or underscore */
+ if (has_underscore && c == '-')
+ c = '_';
+ else if (!has_underscore && c == '_')
+ c = '-';
name[len++] = c;
if (len >= MAXNAME)
return -1;
--
1.9.1

2015-11-09 14:16:14

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH] perf tools: Correct typing errors about '-' or '_' in config variable.

Em Mon, Nov 09, 2015 at 07:54:35PM +0900, Taeung Song escreveu:
> To improve perf config usability, we should probably also recognize
> underscores in perf config entries, i.e. the following variants
> should both work: as suggested by Ingo Molnar
>
> print_percent = 1
> print-percent = 1
>
> So, add functionality for it.
> 'annotate' section has variables that contain '_' underscores like:
>
> hide_src_code
> use_offset
> jump_arrows
> show_nr_jumps
>
> However other sections has variables that contain a '-' dash
> or neither it or underscore i.e.
>
> ui.show-headers
> call-graph.print-limit
> tui.report

There is no need to single our a section just because nowadays it
contains underscores so that we would convert them to dashes, do it for
all sections, so that if in the future we get underscores in them, then
it wild be dash/underscore "insensitive".

In fact, this would be a strcasecmp_() routine, i.e. one that would, in
addition to being case insensitive, also consider - and _ the same
character.

- Arnaldo

> So, convert the characters if typing errors about underscores
> or a dash when parsing the config file.
>
> Cc: Namhyung Kim <[email protected]>
> Cc: Jiri Olsa <[email protected]>
> Signed-off-by: Taeung Song <[email protected]>
> ---
> tools/perf/util/config.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
> index 2e452ac..69db606 100644
> --- a/tools/perf/util/config.c
> +++ b/tools/perf/util/config.c
> @@ -129,7 +129,10 @@ static int get_value(config_fn_t fn, void *data, char *name, unsigned int len)
> {
> int c;
> char *value;
> + bool has_underscore = false;
>
> + if (prefixcmp(name, "annotate.") == 0)
> + has_underscore = true;
> /* Get the full name */
> for (;;) {
> c = get_next_char();
> @@ -137,6 +140,11 @@ static int get_value(config_fn_t fn, void *data, char *name, unsigned int len)
> break;
> if (!iskeychar(c))
> break;
> + /* Correct typing errors about dash or underscore */
> + if (has_underscore && c == '-')
> + c = '_';
> + else if (!has_underscore && c == '_')
> + c = '-';
> name[len++] = c;
> if (len >= MAXNAME)
> return -1;
> --
> 1.9.1