Minor cleanups & fixes for perf-probe(1)
cover Minor cleanups & fixes for perf-probe(1)
From: Franck Bui-Huu <[email protected]>
Hi,
This small patchset is just some random cosmetic cleanups I did when starting to read perf-probe(1) stuffs.
The 3 last patches of this serie are minor fixes though.
---
Franck Bui-Huu (6):
perf-tools: make perf-probe -L display the absolute path of the dumped file
perf-probe: rewrite show_one_line() to make it simpler
perf-probe: clean up redundant tests in show_line_range()
perf-probe: Fix line range description since a single file is allowed
perf-probe: don't always consider EOF as an error when listing source code
perf-probe: handle gracefully some stupid and buggy line syntaxes
tools/perf/Documentation/perf-probe.txt | 2 +- tools/perf/util/probe-event.c | 190 +++++++++++++++++++------------ 2 files changed, 117 insertions(+), 75 deletions(-)
Signature · 1 line
1.7.3.2
PATCH 1/6 perf-tools: make perf-probe -L display the absolute path of the dumped file
From: Franck Bui-Huu <[email protected]>
The actual file used by 'perf probe -L sched.c' is reported in the ouput of the command.
But it's simply displayed as it has been given to the command (simply sched.c) which is too ambiguous to be really usefull since several sched.c files can be found into the same project and we also don't know which search path has been used.
--- tools/perf/util/probe-event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
tools/perf/util/probe-event.c +1 -1
@@ -381,7 +381,7 @@ int show_line_range(struct line_range *lr, const char *module)fprintf (stdout,"<%s:%d>\n" , lr->function, lr->start - lr->offset); else - fprintf(stdout, "<%s:%d>\n", lr->file, lr->start); + fprintf(stdout, "<%s:%d>\n", lr->path, lr->start); fp =fopen (lr->path,"r" );if (fp ==NULL ) {
Signature · 1 line
1.7.3.2
Re: [PATCH 1/6] perf-tools: make perf-probe -L display the absolute path of the dumped file
Quoted 9 lines · Franck Bui-Huu
From: Franck Bui-Huu <[email protected]>
The actual file used by 'perf probe -L
sched.c' is reported in the ouput of the command.But it's simply displayed as it has been given to the command (simply
sched.c) which is too ambiguous to be really usefull since severalsched.cfiles can be found into the same project and we also don't know which search path has been used.
It's enough reasonable for me.
Quoted 19 lines
Signed-off-by Franck Bui-Huu <[email protected]>--- tools/perf/util/probe-event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)tools/perf/util/probe-event.c +1
-1@@ -381,7 +381,7 @@ int show_line_range(struct line_range *lr, const char *module)fprintf (stdout,"<%s:%d>\n" , lr->function, lr->start - lr->offset); else - fprintf(stdout, "<%s:%d>\n", lr->file, lr->start); + fprintf(stdout, "<%s:%d>\n", lr->path, lr->start); fp =fopen (lr->path,"r" );if (fp ==NULL ) {
Signature · 4 lines
Masami HIRAMATSU 2nd Dept. Linux Technology Center Hitachi, Ltd., Systems Development Laboratory E-mail: [email protected]
[tip:perf/core] perf probe: Make -L display the absolute path of the dumped file
In reply to Franck Bui-HuuCommit-ID: 62c15fc49bd1b35d79b34ea96f132ab435e2215a Gitweb: http://git.kernel.org/tip/62c15fc49bd1b35d79b34ea96f132ab435e2215a Author: Franck Bui-Huu <[email protected]> AuthorDate: Mon, 20 Dec 2010 15:18:00 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 21 Dec 2010 16:20:11 -0200
perf probe: Make -L display the absolute path of the dumped file
The actual file used by 'perf probe -L sched.c' is reported in the ouput of the command.
But it's simply displayed as it has been given to the command (simply sched.c) which is too ambiguous to be really usefull since several sched.c files can be found into the same project and we also don't know which search path has been used.
LKML-Reference: <[email protected]>
--- tools/perf/util/probe-event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
tools/perf/util/probe-event.c +1 -1
@@ -371,7 +371,7 @@ int show_line_range(struct line_range *lr, const char *module)fprintf (stdout,"<%s:%d>\n" , lr->function, lr->start - lr->offset); else - fprintf(stdout, "<%s:%d>\n", lr->file, lr->start); + fprintf(stdout, "<%s:%d>\n", lr->path, lr->start); fp =fopen (lr->path,"r" );if (fp ==NULL ) {
PATCH 2/6 perf-probe: rewrite show_one_line() to make it simpler
In reply to Franck Bui-HuuFrom: Franck Bui-Huu <[email protected]>
--- tools/perf/util/probe-event.c | 29 +++++++++++------------------ 1 files changed, 11 insertions(+), 18 deletions(-)
tools/perf/util/probe-event.c +11 -18
@@ -300,28 +300,21 @@ static int get_real_path(const char *raw_path, const char *comp_dir,static int show_one_line (FILE *fp,int l,bool skip,bool show_num) {char buf[LINEBUF_SIZE ]; -const char *color =PERF_COLOR_BLUE ; +const char *color = show_num ?"" :PERF_COLOR_BLUE ; +const char *prefix =NULL ; -if (fgets (buf,LINEBUF_SIZE , fp) ==NULL ) - goto error; -if (!skip) { -if (show_num) -fprintf (stdout,"%7d %s" , l, buf); -else -color_fprintf (stdout, color," %s" , buf); - } - -while (strlen (buf) ==LINEBUF_SIZE -1 && - buf[LINEBUF_SIZE -2 ] !='\n' ) { +do {if (fgets (buf,LINEBUF_SIZE , fp) ==NULL ) goto error; -if (!skip) { -if (show_num) -fprintf (stdout,"%s" , buf); -else -color_fprintf (stdout, color,"%s" , buf); +if (skip) +continue ; +if (!prefix) { + prefix = show_num ?"%7d " :" " ; +fprintf (stdout, prefix, l); } - } +color_fprintf (stdout, color,"%s" , buf); + + }while (strchr (buf,'\n' ) ==NULL );return 0 ; error:
Signature · 1 line
1.7.3.2
Re: [PATCH 2/6] perf-probe: rewrite show_one_line() to make it simpler
Quoted 1 line · Franck Bui-Huu
From: Franck Bui-Huu <[email protected]>
Please explain what this patch will do...
Quoted 32 lines
Signed-off-by Franck Bui-Huu <[email protected]>--- tools/perf/util/probe-event.c | 29 +++++++++++------------------ 1 files changed, 11 insertions(+), 18 deletions(-)tools/perf/util/probe-event.c +3
-12@@ -300,28 +300,21 @@ static int get_real_path(const char *raw_path, const char *comp_dir,static int show_one_line (FILE *fp,int l,bool skip,bool show_num) {char buf[LINEBUF_SIZE ]; -const char *color =PERF_COLOR_BLUE ; +const char *color = show_num ?"" :PERF_COLOR_BLUE ; +const char *prefix =NULL ; -if (fgets (buf,LINEBUF_SIZE , fp) ==NULL ) - goto error; -if (!skip) { -if (show_num) -fprintf (stdout,"%7d %s" , l, buf); -else -color_fprintf (stdout, color," %s" , buf); - } - -while (strlen (buf) ==LINEBUF_SIZE -1 && - buf[LINEBUF_SIZE -2 ] !='\n' ) { + do { if (fgets(buf, LINEBUF_SIZE, fp) == NULL) goto error;
tools/perf/util/probe-event.c static int get_real_path(const char *raw_path, const char *comp_dir, · line 313
Quoted 10 lines
tools/perf/util/probe-event.c +5
-5-if (!skip) { -if (show_num) -fprintf (stdout,"%s" , buf); -else -color_fprintf (stdout, color,"%s" , buf); +if (skip) +continue ; +if (!prefix) { + prefix = show_num ?"%7d " :" " ; +fprintf (stdout, prefix, l);
Could you use color_fprintf() here too?
I know currently it's meaningless, but from the view of maintaining, it's better to use same function.
Thank you,
Quoted 8 lines
tools/perf/util/probe-event.c +3
-1} - } +color_fprintf (stdout, color,"%s" , buf); + + }while (strchr (buf,'\n' ) ==NULL );return 0 ; error:
Signature · 4 lines
Masami HIRAMATSU 2nd Dept. Linux Technology Center Hitachi, Ltd., Systems Development Laboratory E-mail: [email protected]
[tip:perf/core] perf probe: Rewrite show_one_line() to make it simpler
In reply to Franck Bui-HuuCommit-ID: befe341468f4e61ecaf337a0237f2aab76817437 Gitweb: http://git.kernel.org/tip/befe341468f4e61ecaf337a0237f2aab76817437 Author: Franck Bui-Huu <[email protected]> AuthorDate: Mon, 20 Dec 2010 15:18:01 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 21 Dec 2010 16:20:11 -0200
perf probe: Rewrite show_one_line() to make it simpler
Cc: Masami Hiramatsu <[email protected]>
LKML-Reference: <[email protected]>
--- tools/perf/util/probe-event.c | 29 +++++++++++------------------ 1 files changed, 11 insertions(+), 18 deletions(-)
tools/perf/util/probe-event.c +11 -18
@@ -290,28 +290,21 @@ static int get_real_path(const char *raw_path, const char *comp_dir,static int show_one_line (FILE *fp,int l,bool skip,bool show_num) {char buf[LINEBUF_SIZE ]; -const char *color =PERF_COLOR_BLUE ; +const char *color = show_num ?"" :PERF_COLOR_BLUE ; +const char *prefix =NULL ; -if (fgets (buf,LINEBUF_SIZE , fp) ==NULL ) - goto error; -if (!skip) { -if (show_num) -fprintf (stdout,"%7d %s" , l, buf); -else -color_fprintf (stdout, color," %s" , buf); - } - -while (strlen (buf) ==LINEBUF_SIZE -1 && - buf[LINEBUF_SIZE -2 ] !='\n' ) { +do {if (fgets (buf,LINEBUF_SIZE , fp) ==NULL ) goto error; -if (!skip) { -if (show_num) -fprintf (stdout,"%s" , buf); -else -color_fprintf (stdout, color,"%s" , buf); +if (skip) +continue ; +if (!prefix) { + prefix = show_num ?"%7d " :" " ; +color_fprintf (stdout, color, prefix, l); } - } +color_fprintf (stdout, color,"%s" , buf); + + }while (strchr (buf,'\n' ) ==NULL );return 0 ; error:
PATCH 3/6 perf-probe: clean up redundant tests in show_line_range()
In reply to Franck Bui-HuuFrom: Franck Bui-Huu <[email protected]>
It also removes some superflous parentheses.
--- tools/perf/util/probe-event.c | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-)
tools/perf/util/probe-event.c +15 -11
@@ -383,26 +383,30 @@ int show_line_range(struct line_range *lr, const char *module)return -errno; }/* Skip to starting line number */ -while (l < lr->start && ret >=0 ) +while (l < lr->start) { ret =show_one_line (fp, l++, true, false); -if (ret <0 ) - goto end; +if (ret <0 ) + goto end; + }list_for_each_entry (ln, &lr->line_list, list) { -while (ln->line > l && ret >=0 ) - ret =show_one_line (fp, (l++) - lr->offset, - false, false); -if (ret >=0 ) - ret =show_one_line (fp, (l++) - lr->offset, - false, true); +for (; ln->line > l; l++) { + ret =show_one_line (fp, l - lr->offset, false, false); +if (ret <0 ) + goto end; + } + ret =show_one_line (fp, l++ - lr->offset, false, true);if (ret <0 ) goto end; }if (lr->end ==INT_MAX ) lr->end = l +NR_ADDITIONAL_LINES ; -while (l <= lr->end && !feof (fp) && ret >=0 ) - ret =show_one_line (fp, (l++) - lr->offset, false, false); +while (l <= lr->end && !feof (fp)) { + ret =show_one_line (fp, l++ - lr->offset, false, false); +if (ret <0 ) +break ; + } end:fclose (fp);return ret;
Signature · 1 line
1.7.3.2
Re: [PATCH 3/6] perf-probe: clean up redundant tests in show_line_range()
Quoted 3 lines · Franck Bui-Huu
From: Franck Bui-Huu <[email protected]>
It also removes some superflous parentheses.
Oh, don't remove your superfluous comments too! ;-)
Quoted 52 lines
Signed-off-by Franck Bui-Huu <[email protected]>--- tools/perf/util/probe-event.c | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-)tools/perf/util/probe-event.c +15
-11@@ -383,26 +383,30 @@ int show_line_range(struct line_range *lr, const char *module)return -errno; }/* Skip to starting line number */ -while (l < lr->start && ret >=0 ) +while (l < lr->start) { ret =show_one_line (fp, l++, true, false); -if (ret <0 ) - goto end; +if (ret <0 ) + goto end; + }list_for_each_entry (ln, &lr->line_list, list) { -while (ln->line > l && ret >=0 ) - ret =show_one_line (fp, (l++) - lr->offset, - false, false); -if (ret >=0 ) - ret =show_one_line (fp, (l++) - lr->offset, - false, true); +for (; ln->line > l; l++) { + ret =show_one_line (fp, l - lr->offset, false, false); +if (ret <0 ) + goto end; + } + ret =show_one_line (fp, l++ - lr->offset, false, true);if (ret <0 ) goto end; }if (lr->end ==INT_MAX ) lr->end = l +NR_ADDITIONAL_LINES ; -while (l <= lr->end && !feof (fp) && ret >=0 ) - ret =show_one_line (fp, (l++) - lr->offset, false, false); +while (l <= lr->end && !feof (fp)) { + ret =show_one_line (fp, l++ - lr->offset, false, false); +if (ret <0 ) +break ; + } end:fclose (fp);return ret;
Signature · 4 lines
Masami HIRAMATSU 2nd Dept. Linux Technology Center Hitachi, Ltd., Systems Development Laboratory E-mail: [email protected]
[tip:perf/core] perf probe: Clean up redundant tests in show_line_range()
In reply to Franck Bui-HuuCommit-ID: 44b81e929b0c00e703a31a3d634b668bb27eb1c8 Gitweb: http://git.kernel.org/tip/44b81e929b0c00e703a31a3d634b668bb27eb1c8 Author: Franck Bui-Huu <[email protected]> AuthorDate: Mon, 20 Dec 2010 15:18:02 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 21 Dec 2010 16:20:12 -0200
perf probe: Clean up redundant tests in show_line_range()
It also removes some superflous parentheses.
Cc: Masami Hiramatsu <[email protected]>
LKML-Reference: <[email protected]>
--- tools/perf/util/probe-event.c | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-)
tools/perf/util/probe-event.c +15 -11
@@ -373,26 +373,30 @@ int show_line_range(struct line_range *lr, const char *module)return -errno; }/* Skip to starting line number */ -while (l < lr->start && ret >=0 ) +while (l < lr->start) { ret =show_one_line (fp, l++, true, false); -if (ret <0 ) - goto end; +if (ret <0 ) + goto end; + }list_for_each_entry (ln, &lr->line_list, list) { -while (ln->line > l && ret >=0 ) - ret =show_one_line (fp, (l++) - lr->offset, - false, false); -if (ret >=0 ) - ret =show_one_line (fp, (l++) - lr->offset, - false, true); +for (; ln->line > l; l++) { + ret =show_one_line (fp, l - lr->offset, false, false); +if (ret <0 ) + goto end; + } + ret =show_one_line (fp, l++ - lr->offset, false, true);if (ret <0 ) goto end; }if (lr->end ==INT_MAX ) lr->end = l +NR_ADDITIONAL_LINES ; -while (l <= lr->end && !feof (fp) && ret >=0 ) - ret =show_one_line (fp, (l++) - lr->offset, false, false); +while (l <= lr->end && !feof (fp)) { + ret =show_one_line (fp, l++ - lr->offset, false, false); +if (ret <0 ) +break ; + } end:fclose (fp);return ret;
PATCH 4/6 perf-probe: Fix line range description since a single file is allowed
In reply to Franck Bui-HuuFrom: Franck Bui-Huu <[email protected]>
$ perf-probe -L sched.c
is currently allowed but not documented.
--- tools/perf/Documentation/perf-probe.txt | 2 +- tools/perf/util/probe-event.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-)
tools/perf/Documentation/perf-probe.txt +1 -1
@@ -117,7 +117,7 @@ LINE SYNTAX ----------- Line range is descripted by following syntax. - "FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]" + "FUNC[:RLN[+NUM|-RLN2]]|SRC[:ALN[+NUM|-ALN2]]" FUNC specifies the function name of showing lines. 'RLN' is the start line number from function entry line, and 'RLN2' is the end line number. As same as
tools/perf/util/probe-event.c +8 -5
@@ -525,15 +525,18 @@ int show_available_vars(struct perf_probe_event *pevs __unused, }#endif +/* +* Stuff 'lr' according to the line range described by 'arg'. +* The line range syntax is described by: +* +* SRC[:SLN[+NUM|-ELN]] +* FNC[:SLN[+NUM|-ELN]] +*/ int parse_line_range_desc (const char *arg,struct line_range *lr) {const char *ptr;char *tmp; -/* -* <Syntax> -* SRC:SLN[+NUM|-ELN] -* FUNC[:SLN[+NUM|-ELN]] -*/ + ptr =strchr (arg,':' );if (ptr) { lr->start = (int )strtoul (ptr +1 , &tmp,0 );
Signature · 1 line
1.7.3.2
[tip:perf/core] perf probe: Fix line range description since a single file is allowed
Commit-ID: 9d95b580a8d64ef4d1660a21a9de0658fe29f041 Gitweb: http://git.kernel.org/tip/9d95b580a8d64ef4d1660a21a9de0658fe29f041 Author: Franck Bui-Huu <[email protected]> AuthorDate: Mon, 20 Dec 2010 15:18:03 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 21 Dec 2010 16:20:12 -0200
perf probe: Fix line range description since a single file is allowed
$ perf-probe -L sched.c
is currently allowed but not documented.
Cc: Masami Hiramatsu <[email protected]>
LKML-Reference: <[email protected]>
--- tools/perf/Documentation/perf-probe.txt | 2 +- tools/perf/util/probe-event.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-)
tools/perf/Documentation/perf-probe.txt +1 -1
@@ -117,7 +117,7 @@ LINE SYNTAX ----------- Line range is described by following syntax. - "FUNC[:RLN[+NUM|-RLN2]]|SRC:ALN[+NUM|-ALN2]" + "FUNC[:RLN[+NUM|-RLN2]]|SRC[:ALN[+NUM|-ALN2]]" FUNC specifies the function name of showing lines. 'RLN' is the start line number from function entry line, and 'RLN2' is the end line number. As same as
tools/perf/util/probe-event.c +8 -5
@@ -515,15 +515,18 @@ int show_available_vars(struct perf_probe_event *pevs __unused, }#endif +/* +* Stuff 'lr' according to the line range described by 'arg'. +* The line range syntax is described by: +* +* SRC[:SLN[+NUM|-ELN]] +* FNC[:SLN[+NUM|-ELN]] +*/ int parse_line_range_desc (const char *arg,struct line_range *lr) {const char *ptr;char *tmp; -/* -* <Syntax> -* SRC:SLN[+NUM|-ELN] -* FUNC[:SLN[+NUM|-ELN]] -*/ + ptr =strchr (arg,':' );if (ptr) { lr->start = (int )strtoul (ptr +1 , &tmp,0 );
PATCH 5/6 perf-probe: don't always consider EOF as an error when listing source code
In reply to Franck Bui-HuuFrom: Franck Bui-Huu <[email protected]>
When listing a whole file or a function which is located at the end, perf-probe -L output wrongly: "Source file is shorter than expected.".
This is because show_one_line() always consider EOF as an error.
This patch fixes this by not considering EOF as an error when dumping the trailing lines. Otherwise it's still an error and perf-probe still outputs its warning.
--- tools/perf/util/probe-event.c | 38 ++++++++++++++++++++++++++------------ 1 files changed, 26 insertions(+), 12 deletions(-)
tools/perf/util/probe-event.c +26 -12
@@ -297,7 +297,7 @@ static int get_real_path(const char *raw_path, const char *comp_dir,#define LINEBUF_SIZE 256#define NR_ADDITIONAL_LINES 2 -static int show_one_line (FILE *fp,int l,bool skip,bool show_num) +static int __show_one_line (FILE *fp,int l,bool skip,bool show_num) {char buf[LINEBUF_SIZE ];const char *color = show_num ?"" :PERF_COLOR_BLUE ;
@@ -316,16 +316,30 @@ static int show_one_line(FILE *fp, int l, bool skip, bool show_num) }while (strchr (buf,'\n' ) ==NULL ); -return 0 ; +return 1 ; error: -if (feof (fp)) +if (ferror (fp)) {pr_warning ("Source file is shorter than expected.\n" ); -else -pr_warning ("File read error: %s\n" ,strerror (errno)); +return -1 ; + } +return 0 ; +} -return -1 ; +static int _show_one_line (FILE *fp,int l,bool skip,bool show_num) +{ +int rv =__show_one_line (fp, l, skip, show_num); +if (rv ==0 ) { +pr_warning ("Source file is shorter than expected.\n" ); + rv =-1 ; + } +return rv; } +#define show_one_line_with_num (f,l) _show_one_line(f,l,false,true) +#define show_one_line (f,l) _show_one_line(f,l,false,false) +#define skip_one_line (f,l) _show_one_line(f,l,true,false) +#define show_one_line_or_eof (f,l) __show_one_line(f,l,false,false) +/* * Show line-range always requires debuginfo to find source file and * line number.
@@ -384,27 +398,27 @@ int show_line_range(struct line_range *lr, const char *module) }/* Skip to starting line number */ while (l < lr->start) { - ret =show_one_line (fp, l++, true, false); + ret =skip_one_line (fp, l++);if (ret <0 ) goto end; }list_for_each_entry (ln, &lr->line_list, list) {for (; ln->line > l; l++) { - ret =show_one_line (fp, l - lr->offset, false, false); + ret =show_one_line (fp, l - lr->offset);if (ret <0 ) goto end; } - ret =show_one_line (fp, l++ - lr->offset, false, true); + ret =show_one_line_with_num (fp, l++ - lr->offset);if (ret <0 ) goto end; }if (lr->end ==INT_MAX ) lr->end = l +NR_ADDITIONAL_LINES ; -while (l <= lr->end && !feof (fp)) { - ret =show_one_line (fp, l++ - lr->offset, false, false); -if (ret <0 ) +while (l <= lr->end) { + ret =show_one_line_or_eof (fp, l++ - lr->offset); +if (ret <=0 )break ; } end:
Signature · 1 line
1.7.3.2
Re: [PATCH 5/6] perf-probe: don't always consider EOF as an error when listing source code
Quoted 6 lines · Franck Bui-Huu
From: Franck Bui-Huu <[email protected]>
When listing a whole file or a function which is located at the end, perf-probe -L output wrongly: "Source file is shorter than expected.".
This is because
show_one_line()always consider EOF as an error.
Right, that was a wrong behavior.
Quoted 4 lines
This patch fixes this by not considering EOF as an error when dumping the trailing lines. Otherwise it's still an error and perf-probe still outputs its warning.
Thank you for fixing the bug! :)
Quoted 89 lines
Signed-off-by Franck Bui-Huu <[email protected]>--- tools/perf/util/probe-event.c | 38 ++++++++++++++++++++++++++------------ 1 files changed, 26 insertions(+), 12 deletions(-)tools/perf/util/probe-event.c +26
-12@@ -297,7 +297,7 @@ static int get_real_path(const char *raw_path, const char *comp_dir,#define LINEBUF_SIZE 256#define NR_ADDITIONAL_LINES 2 -static int show_one_line (FILE *fp,int l,bool skip,bool show_num) +static int __show_one_line (FILE *fp,int l,bool skip,bool show_num) {char buf[LINEBUF_SIZE ];const char *color = show_num ?"" :PERF_COLOR_BLUE ;@@ -316,16 +316,30 @@ static int show_one_line(FILE *fp, int l, bool skip, bool show_num) }while (strchr (buf,'\n' ) ==NULL ); -return 0 ; +return 1 ; error: -if (feof (fp)) +if (ferror (fp)) {pr_warning ("Source file is shorter than expected.\n" ); -else -pr_warning ("File read error: %s\n" ,strerror (errno)); +return -1 ; + } +return 0 ; +} -return -1 ; +static int _show_one_line (FILE *fp,int l,bool skip,bool show_num) +{ +int rv =__show_one_line (fp, l, skip, show_num); +if (rv ==0 ) { +pr_warning ("Source file is shorter than expected.\n" ); + rv =-1 ; + } +return rv; } +#define show_one_line_with_num (f,l) _show_one_line(f,l,false,true) +#define show_one_line (f,l) _show_one_line(f,l,false,false) +#define skip_one_line (f,l) _show_one_line(f,l,true,false) +#define show_one_line_or_eof (f,l) __show_one_line(f,l,false,false) +/* * Show line-range always requires debuginfo to find source file and * line number. @@ -384,27 +398,27 @@ int show_line_range(struct line_range *lr, const char *module) }/* Skip to starting line number */ while (l < lr->start) { - ret =show_one_line (fp, l++, true, false); + ret =skip_one_line (fp, l++);if (ret <0 ) goto end; }list_for_each_entry (ln, &lr->line_list, list) {for (; ln->line > l; l++) { - ret =show_one_line (fp, l - lr->offset, false, false); + ret =show_one_line (fp, l - lr->offset);if (ret <0 ) goto end; } - ret =show_one_line (fp, l++ - lr->offset, false, true); + ret =show_one_line_with_num (fp, l++ - lr->offset);if (ret <0 ) goto end; }if (lr->end ==INT_MAX ) lr->end = l +NR_ADDITIONAL_LINES ; -while (l <= lr->end && !feof (fp)) { - ret =show_one_line (fp, l++ - lr->offset, false, false); -if (ret <0 ) +while (l <= lr->end) { + ret =show_one_line_or_eof (fp, l++ - lr->offset); +if (ret <=0 )break ; } end:
Signature · 4 lines
Masami HIRAMATSU 2nd Dept. Linux Technology Center Hitachi, Ltd., Systems Development Laboratory E-mail: [email protected]
[tip:perf/core] perf probe: Don't always consider EOF as an error when listing source code
In reply to Franck Bui-HuuCommit-ID: fde52dbd7f71934aba4e150f3d1d51e826a08850 Gitweb: http://git.kernel.org/tip/fde52dbd7f71934aba4e150f3d1d51e826a08850 Author: Franck Bui-Huu <[email protected]> AuthorDate: Mon, 20 Dec 2010 15:18:04 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 21 Dec 2010 16:20:12 -0200
perf probe: Don't always consider EOF as an error when listing source code
When listing a whole file or a function which is located at the end, perf-probe -L output wrongly: "Source file is shorter than expected.".
This is because show_one_line() always consider EOF as an error.
This patch fixes this by not considering EOF as an error when dumping the trailing lines. Otherwise it's still an error and perf-probe still outputs its warning.
LKML-Reference: <[email protected]>
--- tools/perf/util/probe-event.c | 38 ++++++++++++++++++++++++++------------ 1 files changed, 26 insertions(+), 12 deletions(-)
tools/perf/util/probe-event.c +26 -12
@@ -287,7 +287,7 @@ static int get_real_path(const char *raw_path, const char *comp_dir,#define LINEBUF_SIZE 256#define NR_ADDITIONAL_LINES 2 -static int show_one_line (FILE *fp,int l,bool skip,bool show_num) +static int __show_one_line (FILE *fp,int l,bool skip,bool show_num) {char buf[LINEBUF_SIZE ];const char *color = show_num ?"" :PERF_COLOR_BLUE ;
@@ -306,16 +306,30 @@ static int show_one_line(FILE *fp, int l, bool skip, bool show_num) }while (strchr (buf,'\n' ) ==NULL ); -return 0 ; +return 1 ; error: -if (feof (fp)) +if (ferror (fp)) {pr_warning ("Source file is shorter than expected.\n" ); -else -pr_warning ("File read error: %s\n" ,strerror (errno)); +return -1 ; + } +return 0 ; +} -return -1 ; +static int _show_one_line (FILE *fp,int l,bool skip,bool show_num) +{ +int rv =__show_one_line (fp, l, skip, show_num); +if (rv ==0 ) { +pr_warning ("Source file is shorter than expected.\n" ); + rv =-1 ; + } +return rv; } +#define show_one_line_with_num (f,l) _show_one_line(f,l,false,true) +#define show_one_line (f,l) _show_one_line(f,l,false,false) +#define skip_one_line (f,l) _show_one_line(f,l,true,false) +#define show_one_line_or_eof (f,l) __show_one_line(f,l,false,false) +/* * Show line-range always requires debuginfo to find source file and * line number.
@@ -374,27 +388,27 @@ int show_line_range(struct line_range *lr, const char *module) }/* Skip to starting line number */ while (l < lr->start) { - ret =show_one_line (fp, l++, true, false); + ret =skip_one_line (fp, l++);if (ret <0 ) goto end; }list_for_each_entry (ln, &lr->line_list, list) {for (; ln->line > l; l++) { - ret =show_one_line (fp, l - lr->offset, false, false); + ret =show_one_line (fp, l - lr->offset);if (ret <0 ) goto end; } - ret =show_one_line (fp, l++ - lr->offset, false, true); + ret =show_one_line_with_num (fp, l++ - lr->offset);if (ret <0 ) goto end; }if (lr->end ==INT_MAX ) lr->end = l +NR_ADDITIONAL_LINES ; -while (l <= lr->end && !feof (fp)) { - ret =show_one_line (fp, l++ - lr->offset, false, false); -if (ret <0 ) +while (l <= lr->end) { + ret =show_one_line_or_eof (fp, l++ - lr->offset); +if (ret <=0 )break ; } end:
Re: [tip:perf/core] perf probe: Don't always consider EOF as an error when listing source code
tip-bot for Franck Bui-Huu <[email protected]> writes:
[...]
Quoted 16 lines
tools/perf/util/probe-event.c +1
-1@@ -287,7 +287,7 @@ static int get_real_path(const char *raw_path, const char *comp_dir,#define LINEBUF_SIZE 256#define NR_ADDITIONAL_LINES 2 -static int show_one_line (FILE *fp,int l,bool skip,bool show_num) +static int __show_one_line (FILE *fp,int l,bool skip,bool show_num) {char buf[LINEBUF_SIZE ];const char *color = show_num ?"" :PERF_COLOR_BLUE ;@@ -306,16 +306,30 @@ static int show_one_line(FILE *fp, int l, bool skip, bool show_num) }while (strchr (buf,'\n' ) ==NULL );
tools/perf/util/probe-event.c static int show_one_line(FILE *fp, int l, bool skip, bool show_num) · line 313
Quoted 10 lines
tools/perf/util/probe-event.c +3
-4-return 0 ; +return 1 ; error: -if (feof (fp)) +if (ferror (fp)) {pr_warning ("Source file is shorter than expected.\n" ); -else -pr_warning ("File read error: %s\n" ,strerror (errno)); +return -1 ;
Argh, something wrong here.
The warning left here, is the wrong one, I should have left the other one.
Sorry for the mistake.
Should I send a patch to fix that ?
Signature · 1 line
Franck
Re: [tip:perf/core] perf probe: Don't always consider EOF as an error when listing source code
Em Wed, Dec 22, 2010 at 02:14:43PM +0100, Franck Bui-Huu escreveu:
Quoted 11 lines
tools/perf/util/probe-event.c static int show_one_line(FILE *fp, int l, bool skip, bool show_num) · line 313
Quoted 7 lines · tip-bot for Franck Bui-Huu
error:
tools/perf/util/probe-event.c +2
-3-if (feof (fp)) +if (ferror (fp)) {pr_warning ("Source file is shorter than expected.\n" ); -else -pr_warning ("File read error: %s\n" ,strerror (errno)); +return -1 ;Argh, something wrong here.
Quoted 6 lines
The warning left here, is the wrong one, I should have left the other one.
Sorry for the mistake.
Should I send a patch to fix that ?
Please.
- Arnaldo
Re: [tip:perf/core] perf probe: Don't always consider EOF as an error when listing source code
Quoted 13 lines · Arnaldo Carvalho de Melo
Em Wed, Dec 22, 2010 at 02:14:43PM +0100, Franck Bui-Huu escreveu:
Quoted 12 lines
Review
Quoted 8 lines · tip-bot for Franck Bui-Huu
error:
(quoted diff) +2
-3- if (feof(fp)) + if (ferror(fp)) { pr_warning("Source file is shorter than expected.\n"); - else - pr_warning("File read error: %s\n", strerror(errno)); + return -1;Argh, something wrong here.
Quoted 9 lines
Quoted 6 lines
The warning left here, is the wrong one, I should have left the other one.
Sorry for the mistake.
Should I send a patch to fix that ?
Please.
[PATCH] perf-probe: Fix wrong warning in __show_one_line() if read(1) errors happen
From: Franck Bui-Huu <[email protected]>
This was introduced by commit fde52dbd7f71934aba4e150f3d1d51e826a08850.
--- tools/perf/util/probe-event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
tools/perf/util/probe-event.c +1 -1
@@ -319,7 +319,7 @@ static int __show_one_line(FILE *fp, int l, bool skip, bool show_num)return 1 ; error:if (ferror (fp)) { -pr_warning ("Source file is shorter than expected.\n" ); +pr_warning ("File read error: %s\n" ,strerror (errno));return -1 ; }return 0 ;
Signature · 6 lines
1.7.3.2 -- Franck
[tip:perf/core] perf probe: Fix wrong warning in __show_one_line() if read(1) errors happen
Commit-ID: 32b2b6ec57a3adb3ab7215fbf36ec61c15de06ee Gitweb: http://git.kernel.org/tip/32b2b6ec57a3adb3ab7215fbf36ec61c15de06ee Author: Franck Bui-Huu <[email protected]> AuthorDate: Wed, 22 Dec 2010 17:37:13 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 22 Dec 2010 20:32:08 -0200
perf probe: Fix wrong warning in __show_one_line() if read(1) errors happen
This was introduced by commit fde52dbd7f71934aba4e150f3d1d51e826a08850.
Cc: H. Peter Anvin <[email protected]>
Cc: Masami Hiramatsu <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Thomas Gleixner <[email protected]>
LKML-Reference: <[email protected]>
--- tools/perf/util/probe-event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
tools/perf/util/probe-event.c +1 -1
@@ -309,7 +309,7 @@ static int __show_one_line(FILE *fp, int l, bool skip, bool show_num)return 1 ; error:if (ferror (fp)) { -pr_warning ("Source file is shorter than expected.\n" ); +pr_warning ("File read error: %s\n" ,strerror (errno));return -1 ; }return 0 ;
Masami Hiramatsu
Acked-byRe: [tip:perf/core] perf probe: Fix wrong warning in __show_one_line() if read(1) errors happen
Quoted 11 lines · tip-bot for Franck Bui-Huu
Commit-ID: 32b2b6ec57a3adb3ab7215fbf36ec61c15de06ee Gitweb: http://git.kernel.org/tip/32b2b6ec57a3adb3ab7215fbf36ec61c15de06ee Author: Franck Bui-Huu <[email protected]> AuthorDate: Wed, 22 Dec 2010 17:37:13 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 22 Dec 2010 20:32:08 -0200perf probe: Fix wrong warning in
__show_one_line()if read(1) errors happenThis was introduced by commit
fde52dbd7f71934aba4e150f3d1d51e826a08850.
It's a good fix for me.
Quoted 29 lines
Cc: H. Peter Anvin <[email protected]>
Cc: Masami Hiramatsu <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Thomas Gleixner <[email protected]>
LKML-Reference: <[email protected]>Signed-off-by Franck Bui-Huu <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>--- tools/perf/util/probe-event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)tools/perf/util/probe-event.c +1
-2@@ -309,7 +309,7 @@ static int __show_one_line(FILE *fp, int l, bool skip, bool show_num)return 1 ; error:if (ferror (fp)) { -pr_warning ("Source file is shorter than expected.\n" ); +pr_warning ("File read error: %s\n" ,strerror (errno));return -1 ; }return 0 ; --To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Signature · 4 lines
Masami HIRAMATSU 2nd Dept. Linux Technology Center Hitachi, Ltd., Systems Development Laboratory E-mail: [email protected]
PATCH 6/6 perf-probe: handle gracefully some stupid and buggy line syntaxes
In reply to Franck Bui-HuuFrom: Franck Bui-Huu <[email protected]>
Currently perf-probe doesn't handle those incorrect syntaxes
$ perf probe -L sched.c:++13 $ perf probe -L sched.c:-+13 $ perf probe -L sched.c:10000000000000000000000000000+13
This patches rewrites parse_line_range_desc() to handle them.
As a bonus side, it reports more usefull error messages instead of:
"Tailing with invalid character...".
--- tools/perf/util/probe-event.c | 92 ++++++++++++++++++++++++++-------------- 1 files changed, 60 insertions(+), 32 deletions(-)
tools/perf/util/probe-event.c +60 -32
@@ -539,6 +539,19 @@ int show_available_vars(struct perf_probe_event *pevs __unused, }#endif +static int parse_line_num (char **ptr,int *val,const char *what) +{ +const char *start = *ptr; + + errno =0 ; + *val =strtol (*ptr, ptr,0 ); +if (errno || *ptr == start) { +semantic_error ("'%s' is not a valid number.\n" , what); +return -EINVAL ; + } +return 0 ; +} +/* * Stuff 'lr' according to the line range described by 'arg'. * The line range syntax is described by:
@@ -548,50 +561,65 @@ int show_available_vars(struct perf_probe_event *pevs __unused,*/ int parse_line_range_desc (const char *arg,struct line_range *lr) { -const char *ptr; -char *tmp; +char *range, *name =strdup (arg); +int err; + +if (!name) +return -ENOMEM ; + + lr->start =0 ; + lr->end =INT_MAX ; + + range =strchr (name,':' ); +if (range) { + *range++ ='\0' ; + + err =parse_line_num (&range, &lr->start,"start line" ); +if (err) + goto err; + +if (*range =='+' || *range =='-' ) { +const char c = *range++; + + err =parse_line_num (&range, &lr->end,"end line" ); +if (err) + goto err; + +if (c =='+' ) { + lr->end += lr->start; +/* +* Adjust the number of lines here. +* If the number of lines == 1, the +* the end of line should be equal to +* the start of line. +*/ + lr->end--; + } + } - ptr =strchr (arg,':' ); -if (ptr) { - lr->start = (int )strtoul (ptr +1 , &tmp,0 ); -if (*tmp =='+' ) { - lr->end = lr->start + (int )strtoul (tmp +1 , &tmp,0 ); - lr->end--;/* -* Adjust the number of lines here. -* If the number of lines == 1, the -* the end of line should be equal to -* the start of line. -*/ - }else if (*tmp =='-' ) - lr->end = (int )strtoul (tmp +1 , &tmp,0 ); -else - lr->end =INT_MAX ;pr_debug ("Line range is %d to %d\n" , lr->start, lr->end); + + err = -EINVAL ;if (lr->start > lr->end) {semantic_error ("Start line must be smaller" " than end line.\n" ); -return -EINVAL ; + goto err; } -if (*tmp !='\0' ) { -semantic_error ("Tailing with invalid character '%d'.\n" , - *tmp); -return -EINVAL ; +if (*range !='\0' ) { +semantic_error ("Tailing with invalid str '%s'.\n" , range); + goto err; } - tmp =strndup (arg, (ptr - arg)); - }else { - tmp =strdup (arg); - lr->end =INT_MAX ; } -if (tmp ==NULL ) -return -ENOMEM ; - -if (strchr (tmp,'.' )) - lr->file = tmp; +if (strchr (name,'.' )) + lr->file = name;else - lr->function = tmp; + lr->function = name;return 0 ; +err: +free (name); +return err; }/* Check the name is good for event/group */
Signature · 1 line
1.7.3.2
Re: [PATCH 6/6] perf-probe: handle gracefully some stupid and buggy line syntaxes
Quoted 9 lines · Franck Bui-Huu
From: Franck Bui-Huu <[email protected]>
Currently perf-probe doesn't handle those incorrect syntaxes
$ perf probe -L sched.c:++13 $ perf probe -L sched.c:-+13 $ perf probe -L sched.c:10000000000000000000000000000+13This patches rewrites
parse_line_range_desc()to handle them.
OK, without this patch, perf probe accepted that as "0+13". With this, perf probe rejects it as an invalid input.
Thank you!
Quoted 5 lines
As a bonus side, it reports more usefull error messages instead of:
"Tailing with invalid character...".Signed-off-by Franck Bui-Huu <[email protected]>
Quoted 126 lines
--- tools/perf/util/probe-event.c | 92 ++++++++++++++++++++++++++-------------- 1 files changed, 60 insertions(+), 32 deletions(-)tools/perf/util/probe-event.c +60
-32@@ -539,6 +539,19 @@ int show_available_vars(struct perf_probe_event *pevs __unused, }#endif +static int parse_line_num (char **ptr,int *val,const char *what) +{ +const char *start = *ptr; + + errno =0 ; + *val =strtol (*ptr, ptr,0 ); +if (errno || *ptr == start) { +semantic_error ("'%s' is not a valid number.\n" , what); +return -EINVAL ; + } +return 0 ; +} +/* * Stuff 'lr' according to the line range described by 'arg'. * The line range syntax is described by: @@ -548,50 +561,65 @@ int show_available_vars(struct perf_probe_event *pevs __unused,*/ int parse_line_range_desc (const char *arg,struct line_range *lr) { -const char *ptr; -char *tmp; +char *range, *name =strdup (arg); +int err; + +if (!name) +return -ENOMEM ; + + lr->start =0 ; + lr->end =INT_MAX ; + + range =strchr (name,':' ); +if (range) { + *range++ ='\0' ; + + err =parse_line_num (&range, &lr->start,"start line" ); +if (err) + goto err; + +if (*range =='+' || *range =='-' ) { +const char c = *range++; + + err =parse_line_num (&range, &lr->end,"end line" ); +if (err) + goto err; + +if (c =='+' ) { + lr->end += lr->start; +/* +* Adjust the number of lines here. +* If the number of lines == 1, the +* the end of line should be equal to +* the start of line. +*/ + lr->end--; + } + } - ptr =strchr (arg,':' ); -if (ptr) { - lr->start = (int )strtoul (ptr +1 , &tmp,0 ); -if (*tmp =='+' ) { - lr->end = lr->start + (int )strtoul (tmp +1 , &tmp,0 ); - lr->end--;/* -* Adjust the number of lines here. -* If the number of lines == 1, the -* the end of line should be equal to -* the start of line. -*/ - }else if (*tmp =='-' ) - lr->end = (int )strtoul (tmp +1 , &tmp,0 ); -else - lr->end =INT_MAX ;pr_debug ("Line range is %d to %d\n" , lr->start, lr->end); + + err = -EINVAL ;if (lr->start > lr->end) {semantic_error ("Start line must be smaller" " than end line.\n" ); -return -EINVAL ; + goto err; } -if (*tmp !='\0' ) { -semantic_error ("Tailing with invalid character '%d'.\n" , - *tmp); -return -EINVAL ; +if (*range !='\0' ) { +semantic_error ("Tailing with invalid str '%s'.\n" , range); + goto err; } - tmp =strndup (arg, (ptr - arg)); - }else { - tmp =strdup (arg); - lr->end =INT_MAX ; } -if (tmp ==NULL ) -return -ENOMEM ; - -if (strchr (tmp,'.' )) - lr->file = tmp; +if (strchr (name,'.' )) + lr->file = name;else - lr->function = tmp; + lr->function = name;return 0 ; +err: +free (name); +return err; }/* Check the name is good for event/group */
Signature · 4 lines
Masami HIRAMATSU 2nd Dept. Linux Technology Center Hitachi, Ltd., Systems Development Laboratory E-mail: [email protected]
[tip:perf/core] perf probe: Handle gracefully some stupid and buggy line syntaxes
In reply to Franck Bui-HuuCommit-ID: 21dd9ae5a4e9f717f3957ec934dd3158129436b8 Gitweb: http://git.kernel.org/tip/21dd9ae5a4e9f717f3957ec934dd3158129436b8 Author: Franck Bui-Huu <[email protected]> AuthorDate: Mon, 20 Dec 2010 15:18:05 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 21 Dec 2010 17:20:13 -0200
perf probe: Handle gracefully some stupid and buggy line syntaxes
Currently perf probe doesn't handle those incorrect syntaxes:
$ perf probe -L sched.c:++13 $ perf probe -L sched.c:-+13 $ perf probe -L sched.c:10000000000000000000000000000+13
This patches rewrites parse_line_range_desc() to handle them.
As a bonus, it reports more useful error messages instead of: "Tailing with invalid character...".
LKML-Reference: <[email protected]>
--- tools/perf/util/probe-event.c | 92 ++++++++++++++++++++++++++-------------- 1 files changed, 60 insertions(+), 32 deletions(-)
tools/perf/util/probe-event.c +60 -32
@@ -529,6 +529,19 @@ int show_available_vars(struct perf_probe_event *pevs __unused, }#endif +static int parse_line_num (char **ptr,int *val,const char *what) +{ +const char *start = *ptr; + + errno =0 ; + *val =strtol (*ptr, ptr,0 ); +if (errno || *ptr == start) { +semantic_error ("'%s' is not a valid number.\n" , what); +return -EINVAL ; + } +return 0 ; +} +/* * Stuff 'lr' according to the line range described by 'arg'. * The line range syntax is described by:
@@ -538,50 +551,65 @@ int show_available_vars(struct perf_probe_event *pevs __unused,*/ int parse_line_range_desc (const char *arg,struct line_range *lr) { -const char *ptr; -char *tmp; +char *range, *name =strdup (arg); +int err; + +if (!name) +return -ENOMEM ; + + lr->start =0 ; + lr->end =INT_MAX ; + + range =strchr (name,':' ); +if (range) { + *range++ ='\0' ; + + err =parse_line_num (&range, &lr->start,"start line" ); +if (err) + goto err; + +if (*range =='+' || *range =='-' ) { +const char c = *range++; + + err =parse_line_num (&range, &lr->end,"end line" ); +if (err) + goto err; + +if (c =='+' ) { + lr->end += lr->start; +/* +* Adjust the number of lines here. +* If the number of lines == 1, the +* the end of line should be equal to +* the start of line. +*/ + lr->end--; + } + } - ptr =strchr (arg,':' ); -if (ptr) { - lr->start = (int )strtoul (ptr +1 , &tmp,0 ); -if (*tmp =='+' ) { - lr->end = lr->start + (int )strtoul (tmp +1 , &tmp,0 ); - lr->end--;/* -* Adjust the number of lines here. -* If the number of lines == 1, the -* the end of line should be equal to -* the start of line. -*/ - }else if (*tmp =='-' ) - lr->end = (int )strtoul (tmp +1 , &tmp,0 ); -else - lr->end =INT_MAX ;pr_debug ("Line range is %d to %d\n" , lr->start, lr->end); + + err = -EINVAL ;if (lr->start > lr->end) {semantic_error ("Start line must be smaller" " than end line.\n" ); -return -EINVAL ; + goto err; } -if (*tmp !='\0' ) { -semantic_error ("Tailing with invalid character '%d'.\n" , - *tmp); -return -EINVAL ; +if (*range !='\0' ) { +semantic_error ("Tailing with invalid str '%s'.\n" , range); + goto err; } - tmp =strndup (arg, (ptr - arg)); - }else { - tmp =strdup (arg); - lr->end =INT_MAX ; } -if (tmp ==NULL ) -return -ENOMEM ; - -if (strchr (tmp,'.' )) - lr->file = tmp; +if (strchr (name,'.' )) + lr->file = name;else - lr->function = tmp; + lr->function = name;return 0 ; +err: +free (name); +return err; }/* Check the name is good for event/group */
Quoted 6 lines · Franck Bui-Huu
From: Franck Bui-Huu <[email protected]>
Hi,
This small patchset is just some random cosmetic cleanups I did when starting to read perf-probe(1) stuffs.
Hi Franck,
Basically the contains of this series are good to me. (I've sent my comments)
however, it's less comments on each patch. Please explain what you did in each patch! (not only on the subject line:-))
Thank you,
Quoted 17 lines
The 3 last patches of this serie are minor fixes though.
---
Franck Bui-Huu (6):
perf-tools: make perf-probe -L display the absolute path of the dumped file
perf-probe: rewriteshow_one_line()to make it simpler
perf-probe: clean up redundant tests inshow_line_range()
perf-probe: Fix line range description since a single file is allowed
perf-probe: don't always consider EOF as an error when listing source code
perf-probe: handle gracefully some stupid and buggy line syntaxestools/perf/Documentation/perf-probe.txt | 2 +- tools/perf/util/probe-event.c | 190 +++++++++++++++++++------------ 2 files changed, 117 insertions(+), 75 deletions(-)
Signature · 4 lines
Masami HIRAMATSU 2nd Dept. Linux Technology Center Hitachi, Ltd., Systems Development Laboratory E-mail: [email protected]
Quoted 9 lines · Masami Hiramatsu
Quoted 3 lines · Franck Bui-Huu
This small patchset is just some random cosmetic cleanups I did when starting to read perf-probe(1) stuffs.
Basically the contains of this series are good to me. (I've sent my comments)
however, it's less comments on each patch. Please explain what you did in each patch! (not only on the subject line:-))
Ok. I thought those changes in this serie was obvious enough.
Quoted 1 line
Thank you,
You're welcome.
Signature · 1 line
Franck
Em Tue, Dec 21, 2010 at 07:01:06PM +0100, Franck Bui-Huu escreveu:
Quoted 9 lines
Quoted 7 lines · Masami Hiramatsu
Quoted 2 lines · Franck Bui-Huu
This small patchset is just some random cosmetic cleanups I did when starting to read perf-probe(1) stuffs.
Basically the contains of this series are good to me. (I've sent my comments) however, it's less comments on each patch. Please explain what you did in each patch! (not only on the subject line:-))
Quoted 5 lines
Ok. I thought those changes in this serie was obvious enough.
Quoted 1 line
Thank you,
You're welcome.
I did just that s/fprintf/color_fprintf/g change Masami asked and stashed everything in my perf/core branch.
Thanks,
- Arnaldo
Arnaldo Carvalho de Melo <[email protected]> writes:
[...]
Quoted 3 lines
I did just that s/fprintf/color_fprintf/g change Masami asked and stashed everything in my perf/core branch.
Thanks.
Should I still send some details about what patches do ?
Signature · 1 line
Franck
Quoted 5 lines · Franck Bui-Huu
Arnaldo Carvalho de Melo <[email protected]> writes:
[...]
Quoted 1 line
Quoted 7 lines
Quoted 2 lines
I did just that s/fprintf/color_fprintf/g change Masami asked and stashed everything in my perf/core branch.
Thanks.
Should I still send some details about what patches do ?
No, it seems that Arnaldo has already fixed it in his tree.
Thank you,
Signature · 4 lines
Masami HIRAMATSU 2nd Dept. Linux Technology Center Hitachi, Ltd., Systems Development Laboratory E-mail: [email protected]