perf fixes
Linus,
Please pull the latest perf-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf-fixes-for-linus
Thanks,
Ingo
------------------>
Masami Hiramatsu (5):
perf probe: Fix to ensure function declared file
perf probe: Fix to remove redundant close
perf probe: Fix multiple --vars options behavior
perf probe: Fix to find recursively inlined function perf probe: Fix listing incorrect line number with inline function
tools/perf/util/probe-event.c | 19 ++--- tools/perf/util/probe-finder.c | 159 ++++++++++++++++++++++++++-------------- 2 files changed, 113 insertions(+), 65 deletions(-)
tools/perf/util/probe-event.c +8 -11
@@ -234,7 +234,6 @@ static int try_to_find_probe_trace_events(struct perf_probe_event *pev,/* Searching trace events corresponding to probe event */ ntevs =find_probe_trace_events (fd, pev, tevs, max_tevs); -close (fd);if (ntevs >0 ) {/* Succeeded to find trace events */ pr_debug ("find %d probe_trace_events.\n" , ntevs);
@@ -388,7 +387,6 @@ int show_line_range(struct line_range *lr, const char *module) } ret =find_line_range (fd, lr); -close (fd);if (ret ==0 ) {pr_warning ("Specified source line is not found.\n" );return -ENOENT ;
@@ -512,19 +510,18 @@ int show_available_vars(struct perf_probe_event *pevs, int npevs,if (ret <0 )return ret; - fd =open_vmlinux (module); -if (fd <0 ) { -pr_warning ("Failed to open debug information file.\n" ); -return fd; - } -setup_pager (); -for (i =0 ; i < npevs && ret >=0 ; i++) +for (i =0 ; i < npevs && ret >=0 ; i++) { + fd =open_vmlinux (module); +if (fd <0 ) { +pr_warning ("Failed to open debug information file.\n" ); + ret = fd; +break ; + } ret =show_available_vars_at (fd, &pevs[i], max_vls, _filter, externs); - -close (fd); + }return ret; }
tools/perf/util/probe-finder.c +105 -54
221 lines not on this page · raw message