Refactoring with ltrim() and rtrim()
v2 cover Refactoring with ltrim() and rtrim()
Hi, :)
It is to simply refactor the code about stip strings with ltrim() and rtrim().
I'd appreciate some feedback on this PATCHset.
The code is avaiable at 'refactor-trim-v2' branch in
git://github.com/taeung/linux-perf
Thanks,
Taeung
v2:
- remove changes unrelated to the main purpose of PATCH (Arnaldo)
Taeung Song (5):
perf annotate: Refactor the code to parse disassemble lines with
{l,r}trim() perf annotate: Use stripped line instead of raw disassemble line perf ui browser: Refactor the code to parse color configs with ltrim() perf pmu: Refactor wordwrap() with ltrim()
perf tools: Refactor the code to strip command name with {l,r}trim()
tools/perf/ui/browser.c | 2 +- tools/perf/util/annotate.c | 46 +++++++++------------------------------------- tools/perf/util/event.c | 11 ++--------- tools/perf/util/pmu.c | 3 +-- 4 files changed, 13 insertions(+), 49 deletions(-)
Signature · 1 line
2.7.4
PATCH v2 1/5 perf annotate: Refactor the code to parse disassemble lines with {l,r}trim()
When parsing disassemble lines, use ltrim() and rtrim() to strip them, not using just while loop and isspace().
--- tools/perf/util/annotate.c | 42 +++++++----------------------------------- 1 file changed, 7 insertions(+), 35 deletions(-)
tools/perf/util/annotate.c +7 -35
@@ -379,9 +379,7 @@ static int mov__parse(struct arch *arch, struct ins_operands *ops, struct map *mif (comment ==NULL )return 0 ; -while (comment[0 ] !='\0' &&isspace (comment[0 ])) - ++comment; - + comment =ltrim (comment);comment__symbol (ops->source.raw, comment, &ops->source.addr, &ops->source.name);comment__symbol (ops->target.raw, comment, &ops->target.addr, &ops->target.name);
@@ -426,9 +424,7 @@ static int dec__parse(struct arch *arch __maybe_unused, struct ins_operands *opsif (comment ==NULL )return 0 ; -while (comment[0 ] !='\0' &&isspace (comment[0 ])) - ++comment; - + comment =ltrim (comment);comment__symbol (ops->target.raw, comment, &ops->target.addr, &ops->target.name);return 0 ;
@@ -777,10 +773,7 @@ static void disasm_line__init_ins(struct disasm_line *dl, struct arch *arch, strstatic int disasm_line__parse (char *line,const char **namep,char **rawp) { -char *name = line, tmp; - -while (isspace (name[0 ])) - ++name; +char tmp, *name =ltrim (line);if (name[0 ] =='\0' )return -1 ;
@@ -798,12 +791,7 @@ static int disasm_line__parse(char *line, const char **namep, char **rawp) goto out_free_name; (*rawp)[0 ] = tmp; - -if ((*rawp)[0 ] !='\0' ) { - (*rawp)++; -while (isspace ((*rawp)[0 ])) - ++(*rawp); - } + *rawp =ltrim (*rawp);return 0 ;
@@ -1148,7 +1136,7 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map, {struct annotation *notes =symbol__annotation (sym);struct disasm_line *dl; -char *line =NULL , *parsed_line, *tmp, *tmp2, *c; +char *line =NULL , *parsed_line, *tmp, *tmp2;size_t line_len;s64 line_ip, offset =-1 ;regmatch_t match[2 ];
@@ -1159,15 +1147,8 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map,if (!line)return -1 ; -while (line_len !=0 &&isspace (line[line_len -1 ])) - line[--line_len] ='\0' ; - - c =strchr (line,'\n' ); -if (c) - *c =0 ; - line_ip =-1 ; - parsed_line = line; + parsed_line =rtrim (line);/* /filename:linenr ? Save line number and ignore. */ if (regexec (&file_lineno, line,2 , match,0 ) ==0 ) {
@@ -1175,16 +1156,7 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map,return 0 ; } -/* -* Strip leading spaces: -*/ - tmp = line; -while (*tmp) { -if (*tmp !=' ' ) -break ; - tmp++; - } - + tmp =ltrim (parsed_line);if (*tmp) {/* * Parse hexa addresses followed by ':'
Signature · 1 line
2.7.4
tip-bot for Taeung Song
merge bot[tip:perf/core] perf annotate: Refactor the code to parse disassemble lines with {l,r}trim()
perf annotate: Refactor the code to parse disassemble lines with {l,r}trim()
Commit-ID: 4597cf0664d2fad785509dedfed22f8fe8951ebb Gitweb: http://git.kernel.org/tip/4597cf0664d2fad785509dedfed22f8fe8951ebb Author: Taeung Song <[email protected]> AuthorDate: Sat, 8 Apr 2017 09:52:24 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 11 Apr 2017 16:22:22 -0300
perf annotate: Refactor the code to parse disassemble lines with {l,r}trim()
When parsing disassemble lines, use ltrim() and rtrim() to strip them, not using just while loop and isspace().
--- tools/perf/util/annotate.c | 42 +++++++----------------------------------- 1 file changed, 7 insertions(+), 35 deletions(-)
tools/perf/util/annotate.c +7 -35
@@ -387,9 +387,7 @@ static int mov__parse(struct arch *arch, struct ins_operands *ops, struct map *mif (comment ==NULL )return 0 ; -while (comment[0 ] !='\0' &&isspace (comment[0 ])) - ++comment; - + comment =ltrim (comment);comment__symbol (ops->source.raw, comment, &ops->source.addr, &ops->source.name);comment__symbol (ops->target.raw, comment, &ops->target.addr, &ops->target.name);
@@ -434,9 +432,7 @@ static int dec__parse(struct arch *arch __maybe_unused, struct ins_operands *opsif (comment ==NULL )return 0 ; -while (comment[0 ] !='\0' &&isspace (comment[0 ])) - ++comment; - + comment =ltrim (comment);comment__symbol (ops->target.raw, comment, &ops->target.addr, &ops->target.name);return 0 ;
@@ -785,10 +781,7 @@ static void disasm_line__init_ins(struct disasm_line *dl, struct arch *arch, strstatic int disasm_line__parse (char *line,const char **namep,char **rawp) { -char *name = line, tmp; - -while (isspace (name[0 ])) - ++name; +char tmp, *name =ltrim (line);if (name[0 ] =='\0' )return -1 ;
@@ -806,12 +799,7 @@ static int disasm_line__parse(char *line, const char **namep, char **rawp) goto out_free_name; (*rawp)[0 ] = tmp; - -if ((*rawp)[0 ] !='\0' ) { - (*rawp)++; -while (isspace ((*rawp)[0 ])) - ++(*rawp); - } + *rawp =ltrim (*rawp);return 0 ;
@@ -1156,7 +1144,7 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map, {struct annotation *notes =symbol__annotation (sym);struct disasm_line *dl; -char *line =NULL , *parsed_line, *tmp, *tmp2, *c; +char *line =NULL , *parsed_line, *tmp, *tmp2;size_t line_len;s64 line_ip, offset =-1 ;regmatch_t match[2 ];
@@ -1167,15 +1155,8 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map,if (!line)return -1 ; -while (line_len !=0 &&isspace (line[line_len -1 ])) - line[--line_len] ='\0' ; - - c =strchr (line,'\n' ); -if (c) - *c =0 ; - line_ip =-1 ; - parsed_line = line; + parsed_line =rtrim (line);/* /filename:linenr ? Save line number and ignore. */ if (regexec (&file_lineno, line,2 , match,0 ) ==0 ) {
@@ -1183,16 +1164,7 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map,return 0 ; } -/* -* Strip leading spaces: -*/ - tmp = line; -while (*tmp) { -if (*tmp !=' ' ) -break ; - tmp++; - } - + tmp =ltrim (parsed_line);if (*tmp) {/* * Parse hexa addresses followed by ':'
PATCH v2 2/5 perf annotate: Use stripped line instead of raw disassemble line
In reply to Taeung SongWhen parsing disassemble lines for source line number, use a stripped line instead of raw line.
--- tools/perf/util/annotate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/annotate.c +2 -2
@@ -1151,8 +1151,8 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map, parsed_line =rtrim (line);/* /filename:linenr ? Save line number and ignore. */ -if (regexec (&file_lineno, line,2 , match,0 ) ==0 ) { - *line_nr =atoi (line + match[1 ].rm_so); +if (regexec (&file_lineno, parsed_line,2 , match,0 ) ==0 ) { + *line_nr =atoi (parsed_line + match[1 ].rm_so);return 0 ; }
Signature · 1 line
2.7.4
tip-bot for Taeung Song
merge bot[tip:perf/core] perf annotate: Use stripped line instead of raw disassemble line
perf annotate: Use stripped line instead of raw disassemble line
Commit-ID: 986a5bc028a84d487c354a529730b48682d1fb41 Gitweb: http://git.kernel.org/tip/986a5bc028a84d487c354a529730b48682d1fb41 Author: Taeung Song <[email protected]> AuthorDate: Sat, 8 Apr 2017 09:52:25 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 11 Apr 2017 16:22:23 -0300
perf annotate: Use stripped line instead of raw disassemble line
When parsing disassemble lines for source line number, use a stripped line instead of raw line.
--- tools/perf/util/annotate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/annotate.c +2 -2
@@ -1159,8 +1159,8 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map, parsed_line =rtrim (line);/* /filename:linenr ? Save line number and ignore. */ -if (regexec (&file_lineno, line,2 , match,0 ) ==0 ) { - *line_nr =atoi (line + match[1 ].rm_so); +if (regexec (&file_lineno, parsed_line,2 , match,0 ) ==0 ) { + *line_nr =atoi (parsed_line + match[1 ].rm_so);return 0 ; }
PATCH v2 3/5 perf ui browser: Refactor the code to parse color configs with ltrim()
In reply to Taeung SongWhen parsing {fore, back} ground color configs, use ltrim() instead of just while loop and isspace().
--- tools/perf/ui/browser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/ui/browser.c +1 -1
@@ -579,7 +579,7 @@ static int ui_browser__color_config(const char *var, const char *value,break ; *bg ='\0' ; -while (isspace (*++bg)); + bg =ltrim (++bg); ui_browser__colorsets[i].bg = bg; ui_browser__colorsets[i].fg = fg;return 0 ;
Signature · 1 line
2.7.4
PATCH v2 4/5 perf pmu: Refactor wordwrap() with ltrim()
In reply to Taeung Song--- tools/perf/util/pmu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
tools/perf/util/pmu.c +1 -2
@@ -1148,8 +1148,7 @@ static void wordwrap(char *s, int start, int max, int corr)break ; s += wlen; column += n; -while (isspace (*s)) - s++; + s =ltrim (s); } }
Signature · 1 line
2.7.4
PATCH v2 5/5 perf tools: Refactor the code to strip command name with {l,r}trim()
In reply to Taeung SongAfter reading command name from /proc/<pid>/status, use ltrim() and rtrim() to strip command name, not using just while loop, isspace() and etc.
--- tools/perf/util/event.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
tools/perf/util/event.c +2 -9
@@ -106,7 +106,7 @@ static int perf_event__get_comm_ids(pid_t pid, char *comm, size_t len,int fd;size_t size =0 ;ssize_t n; -char *nl, *name, *tgids, *ppids; +char *name, *tgids, *ppids; *tgid =-1 ; *ppid =-1 ;
@@ -134,14 +134,7 @@ static int perf_event__get_comm_ids(pid_t pid, char *comm, size_t len,if (name) { name +=5 ;/* strlen("Name:") */ - -while (*name &&isspace (*name)) - ++name; - - nl =strchr (name,'\n' ); -if (nl) - *nl ='\0' ; - + name =rtrim (ltrim (name)); size =strlen (name);if (size >= len) size = len -1 ;
Signature · 1 line
2.7.4
Re: [PATCH v2 5/5] perf tools: Refactor the code to strip command name with {l,r}trim()
Quoted 4 lines · Taeung Song
After reading command name from /proc/<pid>/status, use
ltrim()andrtrim()to strip command name, not using just while loop,isspace()and etc.
Quoted 9 lines
Cc David Ahern <[email protected]>Cc Don Zickus <[email protected]>Cc Jiri Olsa <[email protected]>Cc Namhyung Kim <[email protected]>Signed-off-by Taeung Song <[email protected]>--- tools/perf/util/event.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
Re: [PATCH v2 5/5] perf tools: Refactor the code to strip command name with {l,r}trim()
Hi David,
Quoted 15 lines · David Ahern
Quoted 4 lines · Taeung Song
After reading command name from /proc/<pid>/status, use
ltrim()andrtrim()to strip command name, not using just while loop,isspace()and etc.Quoted 9 lines
Cc David Ahern <[email protected]>Cc Don Zickus <[email protected]>Cc Jiri Olsa <[email protected]>Cc Namhyung Kim <[email protected]>Signed-off-by Taeung Song <[email protected]>--- tools/perf/util/event.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
Quoted 2 lines
Acked-by David Ahern <[email protected]>
Thank you!
- Taeung