perf tools: cleanups, fixes, updates
v2 cover perf tools: cleanups, fixes, updates
The patch set contains some cleanups, fixes and updates I found worth to implement during code review. Some patches can be applied independently.
v2:
* Rebased version to latest tip/perf/core.
* Removed patches #1 and #2 as they are already applied.
* Dropping patch "perf report: Setup browser if stdout is a pipe", the patch did not properly handle ^C to terminate profiling.
* perf record throws an error now if buildids may not be generated, which can be disabled with the --no-buildid option.
* Prevent potential null pointer access to input_name in builtin-report.c. Needed due to removal of patch "perf report: Setup browser if stdout is a pipe"
Robert Richter (7):
perf tools: Continue processing header on unknown features perf tools: Fix out-of-bound access to struct perf_session perf tool: Moving code in some files
perf report: Accept fifos as input file
perf tool: Unify handling of features when writing feature section perf tools: Improve macros for struct feature_ops
perf tools: Use for_each_set_bit() to iterate over feature flags
tools/perf/Documentation/perf-annotate.txt | 2 +- tools/perf/Documentation/perf-buildid-list.txt | 2 +- tools/perf/Documentation/perf-evlist.txt | 2 +- tools/perf/Documentation/perf-kmem.txt | 2 +- tools/perf/Documentation/perf-lock.txt | 2 +- tools/perf/Documentation/perf-report.txt | 2 +- tools/perf/Documentation/perf-sched.txt | 2 +- tools/perf/Documentation/perf-script.txt | 2 +- tools/perf/Documentation/perf-timechart.txt | 2 +- tools/perf/builtin-annotate.c | 3 +- tools/perf/builtin-buildid-list.c | 53 +- tools/perf/builtin-evlist.c | 2 +- tools/perf/builtin-kmem.c | 2 +- tools/perf/builtin-lock.c | 2 +- tools/perf/builtin-record.c | 7 + tools/perf/builtin-report.c | 13 +- tools/perf/builtin-sched.c | 2 +- tools/perf/builtin-script.c | 4 +- tools/perf/builtin-timechart.c | 4 +- tools/perf/util/header.c | 663 +++++++++++------------- tools/perf/util/header.h | 6 +- tools/perf/util/include/linux/bitops.h | 118 +++++ tools/perf/util/session.c | 15 +- tools/perf/util/session.h | 2 +- 24 files changed, 496 insertions(+), 418 deletions(-)
Signature · 1 line
1.7.7
PATCH v2 1/7 perf tools: Continue processing header on unknown features
A feature may be unknown if perf.data is created and parsed on different perf tool versions. This should not stop the header to be processed, instead continue processing it.
--- tools/perf/util/header.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
tools/perf/util/header.c +1 -1
@@ -1105,7 +1105,7 @@ static int perf_file_section__fprintf_info(struct perf_file_section *section, }if (feat <HEADER_TRACE_INFO || feat >=HEADER_LAST_FEATURE ) {pr_warning ("unknown feature %d\n" , feat); -return -1 ; +return 0 ; }if (!feat_ops[feat].print)return 0 ;
Signature · 1 line
1.7.7
[tip:perf/core] perf tools: Continue processing header on unknown features
Commit-ID: f7a8a1336416883dc0ccd96c17c604e34de61c25 Gitweb: http://git.kernel.org/tip/f7a8a1336416883dc0ccd96c17c604e34de61c25 Author: Robert Richter <[email protected]> AuthorDate: Wed, 7 Dec 2011 10:02:51 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 23 Dec 2011 16:57:09 -0200
perf tools: Continue processing header on unknown features
A feature may be unknown if perf.data is created and parsed on different perf tool versions. This should not stop the header to be processed, instead continue processing it.
--- tools/perf/util/header.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
tools/perf/util/header.c +1 -1
@@ -1109,7 +1109,7 @@ static int perf_file_section__fprintf_info(struct perf_file_section *section, }if (feat <HEADER_TRACE_INFO || feat >=HEADER_LAST_FEATURE ) {pr_warning ("unknown feature %d\n" , feat); -return -1 ; +return 0 ; }if (!feat_ops[feat].print)return 0 ;
PATCH v2 2/7 perf tools: Fix out-of-bound access to struct perf_session
In reply to Robert RichterIf filename is NULL there is an out-of-bound access to struct perf_session if it would be used with perf_session__open(). Shouldn't actually happen in current implementation as filename is always !NULL. Fixing this by always null-terminating filename.
--- tools/perf/util/session.c | 2 +- tools/perf/util/session.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/session.c +1 -1
@@ -107,7 +107,7 @@ struct perf_session *perf_session__new(const char *filename, int mode, bool force, bool repipe, struct perf_tool *tool) { - size_t len = filename ? strlen(filename) + 1 : 0; + size_t len = filename ? strlen(filename) : 0;struct perf_session *self =zalloc (sizeof (*self) + len);if (self ==NULL )
tools/perf/util/session.h +1 -1
@@ -50,7 +50,7 @@ struct perf_session {int cwdlen;char *cwd;struct ordered_samples ordered_samples; -char filename[0 ]; +char filename[1 ]; };struct perf_tool ;
Signature · 1 line
1.7.7
[tip:perf/core] perf tools: Fix out-of-bound access to struct perf_session
Commit-ID: 002c4fd92d772becf8745b9cbcebe5c95fe6dad0 Gitweb: http://git.kernel.org/tip/002c4fd92d772becf8745b9cbcebe5c95fe6dad0 Author: Robert Richter <[email protected]> AuthorDate: Wed, 7 Dec 2011 10:02:52 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 23 Dec 2011 16:57:41 -0200
perf tools: Fix out-of-bound access to struct perf_session
If filename is NULL there is an out-of-bound access to struct perf_session if it would be used with perf_session__open(). Shouldn't actually happen in current implementation as filename is always !NULL. Fixing this by always null-terminating filename.
--- tools/perf/util/session.c | 2 +- tools/perf/util/session.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/session.c +1 -1
@@ -107,7 +107,7 @@ struct perf_session *perf_session__new(const char *filename, int mode, bool force, bool repipe, struct perf_tool *tool) { - size_t len = filename ? strlen(filename) + 1 : 0; + size_t len = filename ? strlen(filename) : 0;struct perf_session *self =zalloc (sizeof (*self) + len);if (self ==NULL )
tools/perf/util/session.h +1 -1
@@ -50,7 +50,7 @@ struct perf_session {int cwdlen;char *cwd;struct ordered_samples ordered_samples; -char filename[0 ]; +char filename[1 ]; };struct perf_tool ;
PATCH v2 3/7 perf tool: Moving code in some files
In reply to Robert RichterNeeded for later changes. No modified functionality.
--- tools/perf/builtin-buildid-list.c | 36 ++-- tools/perf/util/header.c | 495 ++++++++++++++++++------------------- 2 files changed, 264 insertions(+), 267 deletions(-)
tools/perf/builtin-buildid-list.c +18 -18
@@ -39,24 +39,6 @@ static const struct option options[] = { OPT_END() }; -static int perf_session__list_build_ids (void ) -{ -struct perf_session *session; - - session =perf_session__new (input_name,O_RDONLY , force, false, - &build_id__mark_dso_hit_ops); -if (session ==NULL ) -return -1 ; - -if (with_hits) -perf_session__process_events (session, &build_id__mark_dso_hit_ops); - -perf_session__fprintf_dsos_buildid (session, stdout, with_hits); - -perf_session__delete (session); -return 0 ; -} -static int sysfs__fprintf_build_id (FILE *fp) {u8 kallsyms_build_id[BUILD_ID_SIZE ];
@@ -85,6 +67,24 @@ static int filename__fprintf_build_id(const char *name, FILE *fp)return fprintf (fp,"%s\n" , sbuild_id); } +static int perf_session__list_build_ids (void ) +{ +struct perf_session *session; + + session =perf_session__new (input_name,O_RDONLY , force, false, + &build_id__mark_dso_hit_ops); +if (session ==NULL ) +return -1 ; + +if (with_hits) +perf_session__process_events (session, &build_id__mark_dso_hit_ops); + +perf_session__fprintf_dsos_buildid (session, stdout, with_hits); + +perf_session__delete (session); +return 0 ; +} +static int __cmd_buildid_list (void ) {if (show_kernel)
tools/perf/util/header.c +246 -249
513 lines not on this page · raw message
Signature · 1 line
1.7.7
[tip:perf/core] perf tools: Moving code in some files
Commit-ID: 1b5495043d5bc058def21f9b66fd8feaa794eb44 Gitweb: http://git.kernel.org/tip/1b5495043d5bc058def21f9b66fd8feaa794eb44 Author: Robert Richter <[email protected]> AuthorDate: Wed, 7 Dec 2011 10:02:53 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 23 Dec 2011 16:58:22 -0200
perf tools: Moving code in some files
Needed for later changes. No modified functionality.
--- tools/perf/builtin-buildid-list.c | 36 ++-- tools/perf/util/header.c | 495 ++++++++++++++++++------------------- 2 files changed, 264 insertions(+), 267 deletions(-)
tools/perf/builtin-buildid-list.c +18 -18
@@ -39,24 +39,6 @@ static const struct option options[] = { OPT_END() }; -static int perf_session__list_build_ids (void ) -{ -struct perf_session *session; - - session =perf_session__new (input_name,O_RDONLY , force, false, - &build_id__mark_dso_hit_ops); -if (session ==NULL ) -return -1 ; - -if (with_hits) -perf_session__process_events (session, &build_id__mark_dso_hit_ops); - -perf_session__fprintf_dsos_buildid (session, stdout, with_hits); - -perf_session__delete (session); -return 0 ; -} -static int sysfs__fprintf_build_id (FILE *fp) {u8 kallsyms_build_id[BUILD_ID_SIZE ];
@@ -85,6 +67,24 @@ static int filename__fprintf_build_id(const char *name, FILE *fp)return fprintf (fp,"%s\n" , sbuild_id); } +static int perf_session__list_build_ids (void ) +{ +struct perf_session *session; + + session =perf_session__new (input_name,O_RDONLY , force, false, + &build_id__mark_dso_hit_ops); +if (session ==NULL ) +return -1 ; + +if (with_hits) +perf_session__process_events (session, &build_id__mark_dso_hit_ops); + +perf_session__fprintf_dsos_buildid (session, stdout, with_hits); + +perf_session__delete (session); +return 0 ; +} +static int __cmd_buildid_list (void ) {if (show_kernel)
tools/perf/util/header.c +246 -249
513 lines not on this page · raw message
PATCH v2 4/7 perf report: Accept fifos as input file
In reply to Robert RichterThe default input file for perf report is not handled the same way as perf record does it for its output file. This leads to unexpected behavior of perf report, etc. E.g.:
# perf record -a -e cpu-cycles sleep 2 | perf report | cat failed to open perf.data: No such file or directory (try 'perf record' first)
While perf record writes to a fifo, perf report expects perf.data to be read. This patch changes this to accept fifos as input file.
Applies to the following commands:
perf annotate
perf buildid-list
perf evlist
perf kmem
perf lock
perf report
perf sched
perf script
perf timechart
Also fixes char const* -> const char* type declaration for filename strings.
v2:
* Prevent potential null pointer access to input_name in builtin-report.c. Needed due to removal of patch "perf report: Setup browser if stdout is a pipe"
--- tools/perf/Documentation/perf-annotate.txt | 2 +- tools/perf/Documentation/perf-buildid-list.txt | 2 +- tools/perf/Documentation/perf-evlist.txt | 2 +- tools/perf/Documentation/perf-kmem.txt | 2 +- tools/perf/Documentation/perf-lock.txt | 2 +- tools/perf/Documentation/perf-report.txt | 2 +- tools/perf/Documentation/perf-sched.txt | 2 +- tools/perf/Documentation/perf-script.txt | 2 +- tools/perf/Documentation/perf-timechart.txt | 2 +- tools/perf/builtin-annotate.c | 3 +-- tools/perf/builtin-buildid-list.c | 19 ++++++++++--------- tools/perf/builtin-evlist.c | 2 +- tools/perf/builtin-kmem.c | 2 +- tools/perf/builtin-lock.c | 2 +- tools/perf/builtin-report.c | 13 ++++++++++--- tools/perf/builtin-sched.c | 2 +- tools/perf/builtin-script.c | 4 ++-- tools/perf/builtin-timechart.c | 4 ++-- tools/perf/util/session.c | 15 +++++++++++++-- 19 files changed, 51 insertions(+), 33 deletions(-)
tools/perf/Documentation/perf-annotate.txt +1 -1
@@ -22,7 +22,7 @@ OPTIONS ------- -i:: --input=:: - Input file name. (default: perf.data) + Input file name. (default: perf.data unless stdin is a fifo) -d:: --dsos=<dso[,dso...]>::
tools/perf/Documentation/perf-buildid-list.txt +1 -1
@@ -26,7 +26,7 @@ OPTIONS Show only DSOs with hits. -i:: --input=:: - Input file name. (default: perf.data) + Input file name. (default: perf.data unless stdin is a fifo) -f:: --force:: Don't do ownership validation.
tools/perf/Documentation/perf-evlist.txt +1 -1
@@ -18,7 +18,7 @@ OPTIONS ------- -i:: --input=:: - Input file name. (default: perf.data) + Input file name. (default: perf.data unless stdin is a fifo) SEE ALSO --------
tools/perf/Documentation/perf-kmem.txt +1 -1
@@ -23,7 +23,7 @@ OPTIONS ------- -i <file>:: --input=<file>:: - Select the input file (default: perf.data) + Select the input file (default: perf.data unless stdin is a fifo) --caller:: Show per-callsite statistics
tools/perf/Documentation/perf-lock.txt +1 -1
@@ -29,7 +29,7 @@ COMMON OPTIONS -i:: --input=<file>:: - Input file name. + Input file name. (default: perf.data unless stdin is a fifo) -v:: --verbose::
tools/perf/Documentation/perf-report.txt +1 -1
@@ -19,7 +19,7 @@ OPTIONS ------- -i:: --input=:: - Input file name. (default: perf.data) + Input file name. (default: perf.data unless stdin is a fifo) -v:: --verbose::
tools/perf/Documentation/perf-sched.txt +1 -1
@@ -40,7 +40,7 @@ OPTIONS ------- -i:: --input=<file>:: - Input file name. (default: perf.data) + Input file name. (default: perf.data unless stdin is a fifo) -v:: --verbose::
tools/perf/Documentation/perf-script.txt +1 -1
@@ -106,7 +106,7 @@ OPTIONS -i:: --input=:: - Input file name. + Input file name. (default: perf.data unless stdin is a fifo) -d:: --debug-mode::
tools/perf/Documentation/perf-timechart.txt +1 -1
@@ -27,7 +27,7 @@ OPTIONS Select the output file (default: output.svg) -i:: --input=:: - Select the input file (default: perf.data) + Select the input file (default: perf.data unless stdin is a fifo) -w:: --width=:: Select the width of the SVG file (default: 1000)
tools/perf/builtin-annotate.c +1 -2
@@ -215,7 +215,7 @@ static int __cmd_annotate(struct perf_annotate *ann) }if (total_nr_samples ==0 ) { -ui__warning ("The %s file has no samples!\n" , ann->input_name); +ui__warning ("The %s file has no samples!\n" , session->filename); goto out_delete; } out_delete:
@@ -250,7 +250,6 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __used) .ordered_samples = true, .ordering_requires_timestamps = true, }, - .input_name = "perf.data", };const struct option options[] = { OPT_STRING('i', "input", &annotate.input_name, "file",
tools/perf/builtin-buildid-list.c +10 -9
@@ -18,7 +18,7 @@#include <libelf.h> -static char const *input_name ="perf.data" ; +static const char *input_name;static bool force;static bool show_kernel;static bool with_hits;
@@ -71,16 +71,24 @@ static int perf_session__list_build_ids(void) {struct perf_session *session; +elf_version (EV_CURRENT ); + session =perf_session__new (input_name,O_RDONLY , force, false, &build_id__mark_dso_hit_ops);if (session ==NULL )return -1 ; +/* +* See if this is an ELF file first: +*/ +if (filename__fprintf_build_id (session->filename, stdout)) + goto out; +if (with_hits)perf_session__process_events (session, &build_id__mark_dso_hit_ops);perf_session__fprintf_dsos_buildid (session, stdout, with_hits); - +out:perf_session__delete (session);return 0 ; }
@@ -90,13 +98,6 @@ static int __cmd_buildid_list(void)if (show_kernel)return sysfs__fprintf_build_id (stdout); -elf_version (EV_CURRENT ); -/* -* See if this is an ELF file first: -*/ -if (filename__fprintf_build_id (input_name, stdout)) -return 0 ; -return perf_session__list_build_ids (); }
tools/perf/builtin-evlist.c +1 -1
@@ -15,7 +15,7 @@#include "util/parse-options.h" #include "util/session.h" -static char const *input_name ="perf.data" ; +static const char *input_name;static int __cmd_evlist (void ) {
tools/perf/builtin-kmem.c +1 -1
@@ -19,7 +19,7 @@struct alloc_stat ;typedef int (*sort_fn_t )(struct alloc_stat *,struct alloc_stat *); -static char const *input_name ="perf.data" ; +static const char *input_name;static int alloc_flag;static int caller_flag;
tools/perf/builtin-lock.c +1 -1
@@ -326,7 +326,7 @@ alloc_failed:die ("memory allocation failed\n" ); } -static char const *input_name ="perf.data" ; +static const char *input_name;struct raw_event_sample {u32 size;
tools/perf/builtin-report.c +10 -3
@@ -321,8 +321,7 @@ static int __cmd_report(struct perf_report *rep) }if (nr_samples ==0 ) { -ui__warning ("The %s file has no samples!\n" , - rep->input_name); +ui__warning ("The %s file has no samples!\n" , session->filename); goto out_delete; }
@@ -430,6 +429,7 @@ setup:int cmd_report (int argc,const char **argv,const char *prefix__used ) { +struct stat st;char callchain_default_opt[] ="fractal,0.5,callee" ;const char *const report_usage[] = {"perf report [<options>] <command>" ,
@@ -451,7 +451,6 @@ int cmd_report(int argc, const char **argv, const char *prefix __used) .ordered_samples = true, .ordering_requires_timestamps = true, }, - .input_name = "perf.data", .pretty_printing_style = "normal", }; const struct option options[] = {
@@ -531,10 +530,18 @@ int cmd_report(int argc, const char **argv, const char *prefix __used)if (report.inverted_callchain) callchain_param.order =ORDER_CALLER ; +if (!report.input_name || !strlen (report.input_name)) { +if (!fstat (STDIN_FILENO , &st) &&S_ISFIFO (st.st_mode)) + report.input_name ="-" ; +else + report.input_name ="perf.data" ; + } +if (strcmp (report.input_name,"-" ) !=0 )setup_browser (true);else use_browser =0 ; +/* * Only in the newt browser we are doing integrated annotation, * so don't allocate extra space that won't be used in the stdio
tools/perf/builtin-sched.c +1 -1
@@ -22,7 +22,7 @@#include <pthread.h> #include <math.h> -static char const *input_name ="perf.data" ; +static const char *input_name;static char default_sort_order[] ="avg, max, switch, runtime" ;static const char *sort_order = default_sort_order;
tools/perf/builtin-script.c +2 -2
@@ -434,7 +434,7 @@ static int cleanup_scripting(void)return scripting_ops->stop_script (); } -static char const *input_name ="perf.data" ; +static const char *input_name; static int process_sample_event(struct perf_tool *tool __used, union perf_event *event,
@@ -1316,7 +1316,7 @@ int cmd_script(int argc, const char **argv, const char *prefix __used)return -1 ; } - input =open (input_name,O_RDONLY ); + input =open (session->filename,O_RDONLY );/* input_name */ if (input <0 ) {perror ("failed to open file" );exit (-1 );
tools/perf/builtin-timechart.c +2 -2
@@ -38,8 +38,8 @@#define PWR_EVENT_EXIT -1 -static char const *input_name ="perf.data" ; -static char const *output_name ="output.svg" ; +static const char *input_name; +static const char *output_name ="output.svg" ;static unsigned int numcpus;static u64 min_freq;/* Lowest CPU frequency seen */
tools/perf/util/session.c +13 -2
@@ -107,8 +107,19 @@ struct perf_session *perf_session__new(const char *filename, int mode, bool force, bool repipe, struct perf_tool *tool) { - size_t len = filename ? strlen(filename) : 0; -struct perf_session *self =zalloc (sizeof (*self) + len); + struct perf_session *self; +struct stat st; +size_t len; + +if (!filename || !strlen (filename)) { +if (!fstat (STDIN_FILENO , &st) &&S_ISFIFO (st.st_mode)) + filename ="-" ; +else + filename ="perf.data" ; + } + + len =strlen (filename); + self =zalloc (sizeof (*self) + len);if (self ==NULL ) goto out;
Signature · 1 line
1.7.7
[tip:perf/core] perf report: Accept fifos as input file
Commit-ID: efad14150a0b4429f37da7245001a8096ef7ee38 Gitweb: http://git.kernel.org/tip/efad14150a0b4429f37da7245001a8096ef7ee38 Author: Robert Richter <[email protected]> AuthorDate: Wed, 7 Dec 2011 10:02:54 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 23 Dec 2011 17:01:03 -0200
perf report: Accept fifos as input file
The default input file for perf report is not handled the same way as perf record does it for its output file. This leads to unexpected behavior of perf report, etc. E.g.:
# perf record -a -e cpu-cycles sleep 2 | perf report | cat failed to open perf.data: No such file or directory (try 'perf record' first)
While perf record writes to a fifo, perf report expects perf.data to be read. This patch changes this to accept fifos as input file.
Applies to the following commands:
perf annotate
perf buildid-list
perf evlist
perf kmem
perf lock
perf report
perf sched
perf script
perf timechart
Also fixes char const* -> const char* type declaration for filename strings.
v2:
* Prevent potential null pointer access to input_name in builtin-report.c. Needed due to removal of patch "perf report: Setup browser if stdout is a pipe"
--- tools/perf/Documentation/perf-annotate.txt | 2 +- tools/perf/Documentation/perf-buildid-list.txt | 2 +- tools/perf/Documentation/perf-evlist.txt | 2 +- tools/perf/Documentation/perf-kmem.txt | 2 +- tools/perf/Documentation/perf-lock.txt | 2 +- tools/perf/Documentation/perf-report.txt | 2 +- tools/perf/Documentation/perf-sched.txt | 2 +- tools/perf/Documentation/perf-script.txt | 2 +- tools/perf/Documentation/perf-timechart.txt | 2 +- tools/perf/builtin-annotate.c | 3 +-- tools/perf/builtin-buildid-list.c | 19 ++++++++++--------- tools/perf/builtin-evlist.c | 2 +- tools/perf/builtin-kmem.c | 2 +- tools/perf/builtin-lock.c | 2 +- tools/perf/builtin-report.c | 13 ++++++++++--- tools/perf/builtin-sched.c | 2 +- tools/perf/builtin-script.c | 4 ++-- tools/perf/builtin-timechart.c | 4 ++-- tools/perf/util/session.c | 15 +++++++++++++-- 19 files changed, 51 insertions(+), 33 deletions(-)
tools/perf/Documentation/perf-annotate.txt +1 -1
@@ -22,7 +22,7 @@ OPTIONS ------- -i:: --input=:: - Input file name. (default: perf.data) + Input file name. (default: perf.data unless stdin is a fifo) -d:: --dsos=<dso[,dso...]>::
tools/perf/Documentation/perf-buildid-list.txt +1 -1
@@ -26,7 +26,7 @@ OPTIONS Show only DSOs with hits. -i:: --input=:: - Input file name. (default: perf.data) + Input file name. (default: perf.data unless stdin is a fifo) -f:: --force:: Don't do ownership validation.
tools/perf/Documentation/perf-evlist.txt +1 -1
@@ -18,7 +18,7 @@ OPTIONS ------- -i:: --input=:: - Input file name. (default: perf.data) + Input file name. (default: perf.data unless stdin is a fifo) SEE ALSO --------
tools/perf/Documentation/perf-kmem.txt +1 -1
@@ -23,7 +23,7 @@ OPTIONS ------- -i <file>:: --input=<file>:: - Select the input file (default: perf.data) + Select the input file (default: perf.data unless stdin is a fifo) --caller:: Show per-callsite statistics
tools/perf/Documentation/perf-lock.txt +1 -1
@@ -29,7 +29,7 @@ COMMON OPTIONS -i:: --input=<file>:: - Input file name. + Input file name. (default: perf.data unless stdin is a fifo) -v:: --verbose::
tools/perf/Documentation/perf-report.txt +1 -1
@@ -19,7 +19,7 @@ OPTIONS ------- -i:: --input=:: - Input file name. (default: perf.data) + Input file name. (default: perf.data unless stdin is a fifo) -v:: --verbose::
tools/perf/Documentation/perf-sched.txt +1 -1
@@ -40,7 +40,7 @@ OPTIONS ------- -i:: --input=<file>:: - Input file name. (default: perf.data) + Input file name. (default: perf.data unless stdin is a fifo) -v:: --verbose::
tools/perf/Documentation/perf-script.txt +1 -1
@@ -106,7 +106,7 @@ OPTIONS -i:: --input=:: - Input file name. + Input file name. (default: perf.data unless stdin is a fifo) -d:: --debug-mode::
tools/perf/Documentation/perf-timechart.txt +1 -1
@@ -27,7 +27,7 @@ OPTIONS Select the output file (default: output.svg) -i:: --input=:: - Select the input file (default: perf.data) + Select the input file (default: perf.data unless stdin is a fifo) -w:: --width=:: Select the width of the SVG file (default: 1000)
tools/perf/builtin-annotate.c +1 -2
@@ -215,7 +215,7 @@ static int __cmd_annotate(struct perf_annotate *ann) }if (total_nr_samples ==0 ) { -ui__warning ("The %s file has no samples!\n" , ann->input_name); +ui__warning ("The %s file has no samples!\n" , session->filename); goto out_delete; } out_delete:
@@ -250,7 +250,6 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __used) .ordered_samples = true, .ordering_requires_timestamps = true, }, - .input_name = "perf.data", };const struct option options[] = { OPT_STRING('i', "input", &annotate.input_name, "file",
tools/perf/builtin-buildid-list.c +10 -9
@@ -18,7 +18,7 @@#include <libelf.h> -static char const *input_name ="perf.data" ; +static const char *input_name;static bool force;static bool show_kernel;static bool with_hits;
@@ -71,16 +71,24 @@ static int perf_session__list_build_ids(void) {struct perf_session *session; +elf_version (EV_CURRENT ); + session =perf_session__new (input_name,O_RDONLY , force, false, &build_id__mark_dso_hit_ops);if (session ==NULL )return -1 ; +/* +* See if this is an ELF file first: +*/ +if (filename__fprintf_build_id (session->filename, stdout)) + goto out; +if (with_hits)perf_session__process_events (session, &build_id__mark_dso_hit_ops);perf_session__fprintf_dsos_buildid (session, stdout, with_hits); - +out:perf_session__delete (session);return 0 ; }
@@ -90,13 +98,6 @@ static int __cmd_buildid_list(void)if (show_kernel)return sysfs__fprintf_build_id (stdout); -elf_version (EV_CURRENT ); -/* -* See if this is an ELF file first: -*/ -if (filename__fprintf_build_id (input_name, stdout)) -return 0 ; -return perf_session__list_build_ids (); }
tools/perf/builtin-evlist.c +1 -1
@@ -15,7 +15,7 @@#include "util/parse-options.h" #include "util/session.h" -static char const *input_name ="perf.data" ; +static const char *input_name;static int __cmd_evlist (void ) {
tools/perf/builtin-kmem.c +1 -1
@@ -19,7 +19,7 @@struct alloc_stat ;typedef int (*sort_fn_t )(struct alloc_stat *,struct alloc_stat *); -static char const *input_name ="perf.data" ; +static const char *input_name;static int alloc_flag;static int caller_flag;
tools/perf/builtin-lock.c +1 -1
@@ -326,7 +326,7 @@ alloc_failed:die ("memory allocation failed\n" ); } -static char const *input_name ="perf.data" ; +static const char *input_name;struct raw_event_sample {u32 size;
tools/perf/builtin-report.c +10 -3
@@ -321,8 +321,7 @@ static int __cmd_report(struct perf_report *rep) }if (nr_samples ==0 ) { -ui__warning ("The %s file has no samples!\n" , - rep->input_name); +ui__warning ("The %s file has no samples!\n" , session->filename); goto out_delete; }
@@ -430,6 +429,7 @@ setup:int cmd_report (int argc,const char **argv,const char *prefix__used ) { +struct stat st;char callchain_default_opt[] ="fractal,0.5,callee" ;const char *const report_usage[] = {"perf report [<options>]" ,
@@ -451,7 +451,6 @@ int cmd_report(int argc, const char **argv, const char *prefix __used) .ordered_samples = true, .ordering_requires_timestamps = true, }, - .input_name = "perf.data", .pretty_printing_style = "normal", }; const struct option options[] = {
@@ -531,10 +530,18 @@ int cmd_report(int argc, const char **argv, const char *prefix __used)if (report.inverted_callchain) callchain_param.order =ORDER_CALLER ; +if (!report.input_name || !strlen (report.input_name)) { +if (!fstat (STDIN_FILENO , &st) &&S_ISFIFO (st.st_mode)) + report.input_name ="-" ; +else + report.input_name ="perf.data" ; + } +if (strcmp (report.input_name,"-" ) !=0 )setup_browser (true);else use_browser =0 ; +/* * Only in the newt browser we are doing integrated annotation, * so don't allocate extra space that won't be used in the stdio
tools/perf/builtin-sched.c +1 -1
@@ -22,7 +22,7 @@#include <pthread.h> #include <math.h> -static char const *input_name ="perf.data" ; +static const char *input_name;static char default_sort_order[] ="avg, max, switch, runtime" ;static const char *sort_order = default_sort_order;
tools/perf/builtin-script.c +2 -2
@@ -434,7 +434,7 @@ static int cleanup_scripting(void)return scripting_ops->stop_script (); } -static char const *input_name ="perf.data" ; +static const char *input_name; static int process_sample_event(struct perf_tool *tool __used, union perf_event *event,
@@ -1316,7 +1316,7 @@ int cmd_script(int argc, const char **argv, const char *prefix __used)return -1 ; } - input =open (input_name,O_RDONLY ); + input =open (session->filename,O_RDONLY );/* input_name */ if (input <0 ) {perror ("failed to open file" );exit (-1 );
tools/perf/builtin-timechart.c +2 -2
@@ -38,8 +38,8 @@#define PWR_EVENT_EXIT -1 -static char const *input_name ="perf.data" ; -static char const *output_name ="output.svg" ; +static const char *input_name; +static const char *output_name ="output.svg" ;static unsigned int numcpus;static u64 min_freq;/* Lowest CPU frequency seen */
tools/perf/util/session.c +13 -2
@@ -107,8 +107,19 @@ struct perf_session *perf_session__new(const char *filename, int mode, bool force, bool repipe, struct perf_tool *tool) { - size_t len = filename ? strlen(filename) : 0; -struct perf_session *self =zalloc (sizeof (*self) + len); + struct perf_session *self; +struct stat st; +size_t len; + +if (!filename || !strlen (filename)) { +if (!fstat (STDIN_FILENO , &st) &&S_ISFIFO (st.st_mode)) + filename ="-" ; +else + filename ="perf.data" ; + } + + len =strlen (filename); + self =zalloc (sizeof (*self) + len);if (self ==NULL ) goto out;
PATCH v2 5/7 perf tool: Unify handling of features when writing feature section
In reply to Robert RichterThe features HEADER_TRACE_INFO and HEADER_BUILD_ID are handled different when writing the feature section. All other features are simply disabled on failure and writing the section goes on without returning an error. There is no reason for these special cases. This patch unifies handling of the features.
This should be ok since all features can be parsed independently. Offset and size of a feature's block is stored in struct perf_file_ section right after the data block of perf.data (see perf_session__ write_header()). Thus, if a feature does not exist then other features can be processed anyway.
Also moving special code for HEADER_BUILD_ID out to write_build_id().
v2:
* perf record throws an error now if buildids may not be generated, which can be disabled with the --no-buildid option.
--- tools/perf/builtin-record.c | 7 +++++++ tools/perf/util/header.c | 14 +++++--------- 2 files changed, 12 insertions(+), 9 deletions(-)
tools/perf/builtin-record.c +7 -0
@@ -493,6 +493,13 @@ static int __cmd_record(struct perf_record *rec, int argc, const char **argv)return err; } +if (!!rec->no_buildid + && !perf_header__has_feat (&session->header,HEADER_BUILD_ID )) { +pr_err ("Couldn't generating buildids. " +"Use --no-buildid to profile anyway.\n" ); +return -1 ; + } + rec->post_processing_offset =lseek (output,0 ,SEEK_CUR ); machine =perf_session__find_host_machine (session);
tools/perf/util/header.c +5 -9
@@ -445,6 +445,9 @@ static int write_build_id(int fd, struct perf_header *h, session = container_of(h, struct perf_session, header); +if (!perf_session__read_build_ids (session, true)) +return -1 ; + err =dsos__write_buildid_table (h, fd);if (err <0 ) {pr_debug ("failed to write buildid table\n" );
@@ -1413,10 +1416,6 @@ static int perf_header__adds_write(struct perf_header *header, session = container_of(header, struct perf_session, header); -if (perf_header__has_feat (header,HEADER_BUILD_ID && - !perf_session__read_build_ids (session, true))) -perf_header__clear_feat (header,HEADER_BUILD_ID ); - nr_sections =bitmap_weight (header->adds_features,HEADER_FEAT_BITS );if (!nr_sections)return 0 ;
@@ -1432,13 +1431,11 @@ static int perf_header__adds_write(struct perf_header *header, err =do_write_feat (fd, header,HEADER_TRACE_INFO , &p, evlist);if (err) - goto out_free; +perf_header__clear_feat (header,HEADER_TRACE_INFO ); err =do_write_feat (fd, header,HEADER_BUILD_ID , &p, evlist); -if (err) { +if (err)perf_header__clear_feat (header,HEADER_BUILD_ID ); - goto out_free; - } err =do_write_feat (fd, header,HEADER_HOSTNAME , &p, evlist);if (err)
@@ -1496,7 +1493,6 @@ static int perf_header__adds_write(struct perf_header *header, err =do_write (fd, feat_sec, sec_size);if (err <0 )pr_debug ("failed to write feature section\n" ); -out_free:free (feat_sec);return err; }
Signature · 1 line
1.7.7
[tip:perf/core] perf tools: Unify handling of features when writing feature section
Commit-ID: e20960c0271f91aead94746872fd976326a703b3 Gitweb: http://git.kernel.org/tip/e20960c0271f91aead94746872fd976326a703b3 Author: Robert Richter <[email protected]> AuthorDate: Wed, 7 Dec 2011 10:02:55 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 23 Dec 2011 17:02:22 -0200
perf tools: Unify handling of features when writing feature section
The features HEADER_TRACE_INFO and HEADER_BUILD_ID are handled different when writing the feature section. All other features are simply disabled on failure and writing the section goes on without returning an error. There is no reason for these special cases. This patch unifies handling of the features.
This should be ok since all features can be parsed independently. Offset and size of a feature's block is stored in struct perf_file_ section right after the data block of perf.data (see perf_session__ write_header()). Thus, if a feature does not exist then other features can be processed anyway.
Also moving special code for HEADER_BUILD_ID out to write_build_id().
v2:
* perf record throws an error now if buildids may not be generated, which can be disabled with the --no-buildid option.
--- tools/perf/builtin-record.c | 7 +++++++ tools/perf/util/header.c | 14 +++++--------- 2 files changed, 12 insertions(+), 9 deletions(-)
tools/perf/builtin-record.c +7 -0
@@ -503,6 +503,13 @@ static int __cmd_record(struct perf_record *rec, int argc, const char **argv)return err; } +if (!!rec->no_buildid + && !perf_header__has_feat (&session->header,HEADER_BUILD_ID )) { +pr_err ("Couldn't generating buildids. " +"Use --no-buildid to profile anyway.\n" ); +return -1 ; + } + rec->post_processing_offset =lseek (output,0 ,SEEK_CUR ); machine =perf_session__find_host_machine (session);
tools/perf/util/header.c +5 -9
@@ -445,6 +445,9 @@ static int write_build_id(int fd, struct perf_header *h, session = container_of(h, struct perf_session, header); +if (!perf_session__read_build_ids (session, true)) +return -1 ; + err =dsos__write_buildid_table (h, fd);if (err <0 ) {pr_debug ("failed to write buildid table\n" );
@@ -1417,10 +1420,6 @@ static int perf_header__adds_write(struct perf_header *header, session = container_of(header, struct perf_session, header); -if (perf_header__has_feat (header,HEADER_BUILD_ID && - !perf_session__read_build_ids (session, true))) -perf_header__clear_feat (header,HEADER_BUILD_ID ); - nr_sections =bitmap_weight (header->adds_features,HEADER_FEAT_BITS );if (!nr_sections)return 0 ;
@@ -1436,13 +1435,11 @@ static int perf_header__adds_write(struct perf_header *header, err =do_write_feat (fd, header,HEADER_TRACE_INFO , &p, evlist);if (err) - goto out_free; +perf_header__clear_feat (header,HEADER_TRACE_INFO ); err =do_write_feat (fd, header,HEADER_BUILD_ID , &p, evlist); -if (err) { +if (err)perf_header__clear_feat (header,HEADER_BUILD_ID ); - goto out_free; - } err =do_write_feat (fd, header,HEADER_HOSTNAME , &p, evlist);if (err)
@@ -1500,7 +1497,6 @@ static int perf_header__adds_write(struct perf_header *header, err =do_write (fd, feat_sec, sec_size);if (err <0 )pr_debug ("failed to write feature section\n" ); -out_free:free (feat_sec);return err; }
PATCH v2 6/7 perf tools: Improve macros for struct feature_ops
In reply to Robert RichterReducing duplication and line size by extending function names for print and write from a single name.
--- tools/perf/util/header.c | 40 ++++++++++++++++++++++------------------ 1 files changed, 22 insertions(+), 18 deletions(-)
tools/perf/util/header.c +22 -18
@@ -1311,26 +1311,30 @@ struct feature_ops {bool full_only; }; -#define FEAT_OPA (n, w, p) \ - [n] = { .name = #n, .write = w, .print = p } -#define FEAT_OPF (n, w, p) \ - [n] = { .name = #n, .write = w, .print = p, .full_only = true } +#define FEAT_OPA (n, func) \ + [n] = { .name = #n, .write = write_##func, .print = print_##func } +#define FEAT_OPF (n, func) \ + [n] = { .name = #n, .write = write_##func, .print = print_##func, .full_only = true } + +/* feature_ops not implemented: */ +#define print_trace_info NULL +#define print_build_id NULLstatic const struct feature_ops feat_ops[HEADER_LAST_FEATURE ] = { -FEAT_OPA (HEADER_TRACE_INFO , write_trace_info,NULL ), -FEAT_OPA (HEADER_BUILD_ID , write_build_id,NULL ), -FEAT_OPA (HEADER_HOSTNAME , write_hostname, print_hostname), -FEAT_OPA (HEADER_OSRELEASE , write_osrelease, print_osrelease), -FEAT_OPA (HEADER_VERSION , write_version, print_version), -FEAT_OPA (HEADER_ARCH , write_arch, print_arch), -FEAT_OPA (HEADER_NRCPUS , write_nrcpus, print_nrcpus), -FEAT_OPA (HEADER_CPUDESC , write_cpudesc, print_cpudesc), -FEAT_OPA (HEADER_CPUID , write_cpuid, print_cpuid), -FEAT_OPA (HEADER_TOTAL_MEM , write_total_mem, print_total_mem), -FEAT_OPA (HEADER_EVENT_DESC , write_event_desc, print_event_desc), -FEAT_OPA (HEADER_CMDLINE , write_cmdline, print_cmdline), -FEAT_OPF (HEADER_CPU_TOPOLOGY , write_cpu_topology, print_cpu_topology), -FEAT_OPF (HEADER_NUMA_TOPOLOGY , write_numa_topology, print_numa_topology), +FEAT_OPA (HEADER_TRACE_INFO , trace_info), +FEAT_OPA (HEADER_BUILD_ID , build_id), +FEAT_OPA (HEADER_HOSTNAME , hostname), +FEAT_OPA (HEADER_OSRELEASE , osrelease), +FEAT_OPA (HEADER_VERSION , version), +FEAT_OPA (HEADER_ARCH , arch), +FEAT_OPA (HEADER_NRCPUS , nrcpus), +FEAT_OPA (HEADER_CPUDESC , cpudesc), +FEAT_OPA (HEADER_CPUID , cpuid), +FEAT_OPA (HEADER_TOTAL_MEM , total_mem), +FEAT_OPA (HEADER_EVENT_DESC , event_desc), +FEAT_OPA (HEADER_CMDLINE , cmdline), +FEAT_OPF (HEADER_CPU_TOPOLOGY , cpu_topology), +FEAT_OPF (HEADER_NUMA_TOPOLOGY , numa_topology), };struct header_print_data {
Signature · 1 line
1.7.7
[tip:perf/core] perf tools: Improve macros for struct feature_ops
Commit-ID: 8cdfa78a885d94a79205d183a611ebc4876d6f33 Gitweb: http://git.kernel.org/tip/8cdfa78a885d94a79205d183a611ebc4876d6f33 Author: Robert Richter <[email protected]> AuthorDate: Wed, 7 Dec 2011 10:02:56 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 23 Dec 2011 16:56:27 -0200
perf tools: Improve macros for struct feature_ops
Reducing duplication and line size by extending function names for print and write from a single name.
--- tools/perf/util/header.c | 40 ++++++++++++++++++++++------------------ 1 files changed, 22 insertions(+), 18 deletions(-)
tools/perf/util/header.c +22 -18
@@ -1065,26 +1065,30 @@ struct feature_ops {bool full_only; }; -#define FEAT_OPA (n, w, p) \ - [n] = { .name = #n, .write = w, .print = p } -#define FEAT_OPF (n, w, p) \ - [n] = { .name = #n, .write = w, .print = p, .full_only = true } +#define FEAT_OPA (n, func) \ + [n] = { .name = #n, .write = write_##func, .print = print_##func } +#define FEAT_OPF (n, func) \ + [n] = { .name = #n, .write = write_##func, .print = print_##func, .full_only = true } + +/* feature_ops not implemented: */ +#define print_trace_info NULL +#define print_build_id NULLstatic const struct feature_ops feat_ops[HEADER_LAST_FEATURE ] = { -FEAT_OPA (HEADER_TRACE_INFO , write_trace_info,NULL ), -FEAT_OPA (HEADER_BUILD_ID , write_build_id,NULL ), -FEAT_OPA (HEADER_HOSTNAME , write_hostname, print_hostname), -FEAT_OPA (HEADER_OSRELEASE , write_osrelease, print_osrelease), -FEAT_OPA (HEADER_VERSION , write_version, print_version), -FEAT_OPA (HEADER_ARCH , write_arch, print_arch), -FEAT_OPA (HEADER_NRCPUS , write_nrcpus, print_nrcpus), -FEAT_OPA (HEADER_CPUDESC , write_cpudesc, print_cpudesc), -FEAT_OPA (HEADER_CPUID , write_cpuid, print_cpuid), -FEAT_OPA (HEADER_TOTAL_MEM , write_total_mem, print_total_mem), -FEAT_OPA (HEADER_EVENT_DESC , write_event_desc, print_event_desc), -FEAT_OPA (HEADER_CMDLINE , write_cmdline, print_cmdline), -FEAT_OPF (HEADER_CPU_TOPOLOGY , write_cpu_topology, print_cpu_topology), -FEAT_OPF (HEADER_NUMA_TOPOLOGY , write_numa_topology, print_numa_topology), +FEAT_OPA (HEADER_TRACE_INFO , trace_info), +FEAT_OPA (HEADER_BUILD_ID , build_id), +FEAT_OPA (HEADER_HOSTNAME , hostname), +FEAT_OPA (HEADER_OSRELEASE , osrelease), +FEAT_OPA (HEADER_VERSION , version), +FEAT_OPA (HEADER_ARCH , arch), +FEAT_OPA (HEADER_NRCPUS , nrcpus), +FEAT_OPA (HEADER_CPUDESC , cpudesc), +FEAT_OPA (HEADER_CPUID , cpuid), +FEAT_OPA (HEADER_TOTAL_MEM , total_mem), +FEAT_OPA (HEADER_EVENT_DESC , event_desc), +FEAT_OPA (HEADER_CMDLINE , cmdline), +FEAT_OPF (HEADER_CPU_TOPOLOGY , cpu_topology), +FEAT_OPF (HEADER_NUMA_TOPOLOGY , numa_topology), };struct header_print_data {
PATCH v2 7/7 perf tools: Use for_each_set_bit() to iterate over feature flags
In reply to Robert RichterThis patch introduces the for_each_set_bit() macro and modifies feature implementation to use it.
--- tools/perf/util/header.c | 118 ++++++++------------------------ tools/perf/util/header.h | 6 +- tools/perf/util/include/linux/bitops.h | 118 ++++++++++++++++++++++++++++++++ 3 files changed, 149 insertions(+), 93 deletions(-)
tools/perf/util/header.c +28 -90
@@ -8,6 +8,7 @@#include <stdlib.h> #include <linux/list.h> #include <linux/kernel.h> +#include <linux/bitops.h> #include <sys/utsname.h> #include "evlist.h"
@@ -1353,7 +1354,7 @@ static int perf_file_section__fprintf_info(struct perf_file_section *section, "%d, continuing...\n", section->offset, feat);return 0 ; } -if (feat <HEADER_TRACE_INFO || feat >=HEADER_LAST_FEATURE ) { +if (feat >=HEADER_LAST_FEATURE ) {pr_warning ("unknown feature %d\n" , feat);return 0 ; }
@@ -1390,6 +1391,8 @@ static int do_write_feat(int fd, struct perf_header *h, int type,int ret =0 ;if (perf_header__has_feat (h, type)) { +if (!feat_ops[type].write) +return -1 ; (*p)->offset =lseek (fd,0 ,SEEK_CUR );
@@ -1416,6 +1419,7 @@ static int perf_header__adds_write(struct perf_header *header,struct perf_file_section *feat_sec, *p;int sec_size;u64 sec_start; +int feat;int err; session = container_of(header, struct perf_session, header);
@@ -1433,61 +1437,10 @@ static int perf_header__adds_write(struct perf_header *header, sec_start = header->data_offset + header->data_size;lseek (fd, sec_start + sec_size,SEEK_SET ); - err =do_write_feat (fd, header,HEADER_TRACE_INFO , &p, evlist); -if (err) -perf_header__clear_feat (header,HEADER_TRACE_INFO ); - - err =do_write_feat (fd, header,HEADER_BUILD_ID , &p, evlist); -if (err) -perf_header__clear_feat (header,HEADER_BUILD_ID ); - - err =do_write_feat (fd, header,HEADER_HOSTNAME , &p, evlist); -if (err) -perf_header__clear_feat (header,HEADER_HOSTNAME ); - - err =do_write_feat (fd, header,HEADER_OSRELEASE , &p, evlist); -if (err) -perf_header__clear_feat (header,HEADER_OSRELEASE ); - - err =do_write_feat (fd, header,HEADER_VERSION , &p, evlist); -if (err) -perf_header__clear_feat (header,HEADER_VERSION ); - - err =do_write_feat (fd, header,HEADER_ARCH , &p, evlist); -if (err) -perf_header__clear_feat (header,HEADER_ARCH ); - - err =do_write_feat (fd, header,HEADER_NRCPUS , &p, evlist); -if (err) -perf_header__clear_feat (header,HEADER_NRCPUS ); - - err =do_write_feat (fd, header,HEADER_CPUDESC , &p, evlist); -if (err) -perf_header__clear_feat (header,HEADER_CPUDESC ); - - err =do_write_feat (fd, header,HEADER_CPUID , &p, evlist); -if (err) -perf_header__clear_feat (header,HEADER_CPUID ); - - err =do_write_feat (fd, header,HEADER_TOTAL_MEM , &p, evlist); -if (err) -perf_header__clear_feat (header,HEADER_TOTAL_MEM ); - - err =do_write_feat (fd, header,HEADER_CMDLINE , &p, evlist); -if (err) -perf_header__clear_feat (header,HEADER_CMDLINE ); - - err =do_write_feat (fd, header,HEADER_EVENT_DESC , &p, evlist); -if (err) -perf_header__clear_feat (header,HEADER_EVENT_DESC ); - - err =do_write_feat (fd, header,HEADER_CPU_TOPOLOGY , &p, evlist); -if (err) -perf_header__clear_feat (header,HEADER_CPU_TOPOLOGY ); - - err =do_write_feat (fd, header,HEADER_NUMA_TOPOLOGY , &p, evlist); -if (err) -perf_header__clear_feat (header,HEADER_NUMA_TOPOLOGY ); +for_each_set_bit (feat, header->adds_features,HEADER_FEAT_BITS ) { +if (do_write_feat (fd, header, feat, &p, evlist)) +perf_header__clear_feat (header, feat); + }lseek (fd, sec_start,SEEK_SET );/*
@@ -1634,20 +1587,20 @@ static int perf_header__getbuffer64(struct perf_header *header,int perf_header__process_sections (struct perf_header *header,int fd,void *data,int (*process)(struct perf_file_section *section, -struct perf_header *ph, -int feat,int fd,void *data)) +struct perf_header *ph, +int feat,int fd,void *data)) { -struct perf_file_section *feat_sec; +struct perf_file_section *feat_sec, *sec;int nr_sections;int sec_size; -int idx =0 ; -int err =-1 , feat =1 ; +int feat; +int err; nr_sections =bitmap_weight (header->adds_features,HEADER_FEAT_BITS );if (!nr_sections)return 0 ; - feat_sec =calloc (sizeof (*feat_sec), nr_sections); + feat_sec = sec =calloc (sizeof (*feat_sec), nr_sections);if (!feat_sec)return -1 ;
@@ -1655,20 +1608,16 @@ int perf_header__process_sections(struct perf_header *header, int fd,lseek (fd, header->data_offset + header->data_size,SEEK_SET ); -if (perf_header__getbuffer64 (header, fd, feat_sec, sec_size)) + err =perf_header__getbuffer64 (header, fd, feat_sec, sec_size); +if (err <0 ) goto out_free; - err =0 ; -while (idx < nr_sections && feat <HEADER_LAST_FEATURE ) { -if (perf_header__has_feat (header, feat)) { -struct perf_file_section *sec = &feat_sec[idx++]; - - err =process (sec, header, feat, fd, data); -if (err <0 ) -break ; - } - ++feat; +for_each_set_bit (feat, header->adds_features,HEADER_LAST_FEATURE ) { + err =process (sec++, header, feat, fd, data); +if (err <0 ) + goto out_free; } + err =0 ; out_free:free (feat_sec);return err;
@@ -1903,32 +1852,21 @@ static int perf_file_section__process(struct perf_file_section *section,return 0 ; } +if (feat >=HEADER_LAST_FEATURE ) { +pr_debug ("unknown feature %d, continuing...\n" , feat); +return 0 ; + } +switch (feat) {case HEADER_TRACE_INFO :trace_report (fd, false);break ; -case HEADER_BUILD_ID :if (perf_header__read_build_ids (ph, fd, section->offset, section->size))pr_debug ("Failed to read buildids, continuing...\n" );break ; - -case HEADER_HOSTNAME : -case HEADER_OSRELEASE : -case HEADER_VERSION : -case HEADER_ARCH : -case HEADER_NRCPUS : -case HEADER_CPUDESC : -case HEADER_CPUID : -case HEADER_TOTAL_MEM : -case HEADER_CMDLINE : -case HEADER_EVENT_DESC : -case HEADER_CPU_TOPOLOGY : -case HEADER_NUMA_TOPOLOGY : -break ; -default : -pr_debug ("unknown feature %d, continuing...\n" , feat); +break ; }return 0 ;
tools/perf/util/header.h +3 -3
@@ -10,7 +10,8 @@#include <linux/bitmap.h> enum { -HEADER_TRACE_INFO =1 , +HEADER_RESERVED =0 ,/* always cleared */ +HEADER_TRACE_INFO =1 ,HEADER_BUILD_ID ,HEADER_HOSTNAME ,
@@ -27,10 +28,9 @@ enum { HEADER_NUMA_TOPOLOGY,HEADER_LAST_FEATURE , + HEADER_FEAT_BITS = 256, }; -#define HEADER_FEAT_BITS 256 -struct perf_file_section {u64 offset;u64 size;
tools/perf/util/include/linux/bitops.h +118 -0
128 lines not on this page · raw message
Signature · 1 line
1.7.7
[tip:perf/core] perf tools: Use for_each_set_bit() to iterate over feature flags
Commit-ID: b1e5a9bee3c342dd3281aef76d1be1044dd8addf Gitweb: http://git.kernel.org/tip/b1e5a9bee3c342dd3281aef76d1be1044dd8addf Author: Robert Richter <[email protected]> AuthorDate: Wed, 7 Dec 2011 10:02:57 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 23 Dec 2011 17:03:36 -0200
perf tools: Use for_each_set_bit() to iterate over feature flags
This patch introduces the for_each_set_bit() macro and modifies feature implementation to use it.
--- tools/perf/util/header.c | 118 ++++++++------------------------ tools/perf/util/header.h | 6 +- tools/perf/util/include/linux/bitops.h | 118 ++++++++++++++++++++++++++++++++ 3 files changed, 149 insertions(+), 93 deletions(-)
tools/perf/util/header.c +28 -90
@@ -8,6 +8,7 @@#include <stdlib.h> #include <linux/list.h> #include <linux/kernel.h> +#include <linux/bitops.h> #include <sys/utsname.h> #include "evlist.h"
@@ -1353,7 +1354,7 @@ static int perf_file_section__fprintf_info(struct perf_file_section *section, "%d, continuing...\n", section->offset, feat);return 0 ; } -if (feat <HEADER_TRACE_INFO || feat >=HEADER_LAST_FEATURE ) { +if (feat >=HEADER_LAST_FEATURE ) {pr_warning ("unknown feature %d\n" , feat);return 0 ; }
@@ -1390,6 +1391,8 @@ static int do_write_feat(int fd, struct perf_header *h, int type,int ret =0 ;if (perf_header__has_feat (h, type)) { +if (!feat_ops[type].write) +return -1 ; (*p)->offset =lseek (fd,0 ,SEEK_CUR );
@@ -1416,6 +1419,7 @@ static int perf_header__adds_write(struct perf_header *header,struct perf_file_section *feat_sec, *p;int sec_size;u64 sec_start; +int feat;int err; session = container_of(header, struct perf_session, header);
@@ -1433,61 +1437,10 @@ static int perf_header__adds_write(struct perf_header *header, sec_start = header->data_offset + header->data_size;lseek (fd, sec_start + sec_size,SEEK_SET ); - err =do_write_feat (fd, header,HEADER_TRACE_INFO , &p, evlist); -if (err) -perf_header__clear_feat (header,HEADER_TRACE_INFO ); - - err =do_write_feat (fd, header,HEADER_BUILD_ID , &p, evlist); -if (err) -perf_header__clear_feat (header,HEADER_BUILD_ID ); - - err =do_write_feat (fd, header,HEADER_HOSTNAME , &p, evlist); -if (err) -perf_header__clear_feat (header,HEADER_HOSTNAME ); - - err =do_write_feat (fd, header,HEADER_OSRELEASE , &p, evlist); -if (err) -perf_header__clear_feat (header,HEADER_OSRELEASE ); - - err =do_write_feat (fd, header,HEADER_VERSION , &p, evlist); -if (err) -perf_header__clear_feat (header,HEADER_VERSION ); - - err =do_write_feat (fd, header,HEADER_ARCH , &p, evlist); -if (err) -perf_header__clear_feat (header,HEADER_ARCH ); - - err =do_write_feat (fd, header,HEADER_NRCPUS , &p, evlist); -if (err) -perf_header__clear_feat (header,HEADER_NRCPUS ); - - err =do_write_feat (fd, header,HEADER_CPUDESC , &p, evlist); -if (err) -perf_header__clear_feat (header,HEADER_CPUDESC ); - - err =do_write_feat (fd, header,HEADER_CPUID , &p, evlist); -if (err) -perf_header__clear_feat (header,HEADER_CPUID ); - - err =do_write_feat (fd, header,HEADER_TOTAL_MEM , &p, evlist); -if (err) -perf_header__clear_feat (header,HEADER_TOTAL_MEM ); - - err =do_write_feat (fd, header,HEADER_CMDLINE , &p, evlist); -if (err) -perf_header__clear_feat (header,HEADER_CMDLINE ); - - err =do_write_feat (fd, header,HEADER_EVENT_DESC , &p, evlist); -if (err) -perf_header__clear_feat (header,HEADER_EVENT_DESC ); - - err =do_write_feat (fd, header,HEADER_CPU_TOPOLOGY , &p, evlist); -if (err) -perf_header__clear_feat (header,HEADER_CPU_TOPOLOGY ); - - err =do_write_feat (fd, header,HEADER_NUMA_TOPOLOGY , &p, evlist); -if (err) -perf_header__clear_feat (header,HEADER_NUMA_TOPOLOGY ); +for_each_set_bit (feat, header->adds_features,HEADER_FEAT_BITS ) { +if (do_write_feat (fd, header, feat, &p, evlist)) +perf_header__clear_feat (header, feat); + }lseek (fd, sec_start,SEEK_SET );/*
@@ -1634,20 +1587,20 @@ static int perf_header__getbuffer64(struct perf_header *header,int perf_header__process_sections (struct perf_header *header,int fd,void *data,int (*process)(struct perf_file_section *section, -struct perf_header *ph, -int feat,int fd,void *data)) +struct perf_header *ph, +int feat,int fd,void *data)) { -struct perf_file_section *feat_sec; +struct perf_file_section *feat_sec, *sec;int nr_sections;int sec_size; -int idx =0 ; -int err =-1 , feat =1 ; +int feat; +int err; nr_sections =bitmap_weight (header->adds_features,HEADER_FEAT_BITS );if (!nr_sections)return 0 ; - feat_sec =calloc (sizeof (*feat_sec), nr_sections); + feat_sec = sec =calloc (sizeof (*feat_sec), nr_sections);if (!feat_sec)return -1 ;
@@ -1655,20 +1608,16 @@ int perf_header__process_sections(struct perf_header *header, int fd,lseek (fd, header->data_offset + header->data_size,SEEK_SET ); -if (perf_header__getbuffer64 (header, fd, feat_sec, sec_size)) + err =perf_header__getbuffer64 (header, fd, feat_sec, sec_size); +if (err <0 ) goto out_free; - err =0 ; -while (idx < nr_sections && feat <HEADER_LAST_FEATURE ) { -if (perf_header__has_feat (header, feat)) { -struct perf_file_section *sec = &feat_sec[idx++]; - - err =process (sec, header, feat, fd, data); -if (err <0 ) -break ; - } - ++feat; +for_each_set_bit (feat, header->adds_features,HEADER_LAST_FEATURE ) { + err =process (sec++, header, feat, fd, data); +if (err <0 ) + goto out_free; } + err =0 ; out_free:free (feat_sec);return err;
@@ -1903,32 +1852,21 @@ static int perf_file_section__process(struct perf_file_section *section,return 0 ; } +if (feat >=HEADER_LAST_FEATURE ) { +pr_debug ("unknown feature %d, continuing...\n" , feat); +return 0 ; + } +switch (feat) {case HEADER_TRACE_INFO :trace_report (fd, false);break ; -case HEADER_BUILD_ID :if (perf_header__read_build_ids (ph, fd, section->offset, section->size))pr_debug ("Failed to read buildids, continuing...\n" );break ; - -case HEADER_HOSTNAME : -case HEADER_OSRELEASE : -case HEADER_VERSION : -case HEADER_ARCH : -case HEADER_NRCPUS : -case HEADER_CPUDESC : -case HEADER_CPUID : -case HEADER_TOTAL_MEM : -case HEADER_CMDLINE : -case HEADER_EVENT_DESC : -case HEADER_CPU_TOPOLOGY : -case HEADER_NUMA_TOPOLOGY : -break ; -default : -pr_debug ("unknown feature %d, continuing...\n" , feat); +break ; }return 0 ;
tools/perf/util/header.h +3 -3
@@ -10,7 +10,8 @@#include <linux/bitmap.h> enum { -HEADER_TRACE_INFO =1 , +HEADER_RESERVED =0 ,/* always cleared */ +HEADER_TRACE_INFO =1 ,HEADER_BUILD_ID ,HEADER_HOSTNAME ,
@@ -27,10 +28,9 @@ enum { HEADER_NUMA_TOPOLOGY,HEADER_LAST_FEATURE , + HEADER_FEAT_BITS = 256, }; -#define HEADER_FEAT_BITS 256 -struct perf_file_section {u64 offset;u64 size;
tools/perf/util/include/linux/bitops.h +118 -0
128 lines not on this page · raw message