Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4eced2347c447c9409877368fc52478c356b4767

Authored by Srikar Dronamraju
Committed by Arnaldo Carvalho de Melo
1 parent 946d863cc0
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

perf probe: Rename target_module to target 

This is a precursor patch that modifies names that refer to
kernel/module to also refer to user space names.

Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Anton Arapov <anton@redhat.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Jim Keniston <jkenisto@linux.vnet.ibm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Linux-mm <linux-mm@kvack.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Roland McGrath <roland@hack.frob.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20120202142040.5967.64156.sendpatchset@srdronam.in.ibm.com
Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Showing 2 changed files with 19 additions and 19 deletions Side-by-side Diff

tools/perf/builtin-probe.c
Diff comments   View file @ 4eced23
... ... @@ -58,7 +58,7 @@
58 58 struct perf_probe_event events[MAX_PROBES];
59 59 struct strlist *dellist;
60 60 struct line_range line_range;
61   - const char *target_module;
  61 + const char *target;
62 62 int max_probe_points;
63 63 struct strfilter *filter;
64 64 } params;
... ... @@ -246,7 +246,7 @@
246 246 "file", "vmlinux pathname"),
247 247 OPT_STRING('s', "source", &symbol_conf.source_prefix,
248 248 "directory", "path to kernel source"),
249   - OPT_STRING('m', "module", &params.target_module,
  249 + OPT_STRING('m', "module", &params.target,
250 250 "modname|path",
251 251 "target module name (for online) or path (for offline)"),
252 252 #endif
... ... @@ -333,7 +333,7 @@
333 333 if (!params.filter)
334 334 params.filter = strfilter__new(DEFAULT_FUNC_FILTER,
335 335 NULL);
336   - ret = show_available_funcs(params.target_module,
  336 + ret = show_available_funcs(params.target,
337 337 params.filter);
338 338 strfilter__delete(params.filter);
339 339 if (ret < 0)
... ... @@ -354,7 +354,7 @@
354 354 usage_with_options(probe_usage, options);
355 355 }
356 356  
357   - ret = show_line_range(&params.line_range, params.target_module);
  357 + ret = show_line_range(&params.line_range, params.target);
358 358 if (ret < 0)
359 359 pr_err(" Error: Failed to show lines. (%d)\n", ret);
360 360 return ret;
... ... @@ -371,7 +371,7 @@
371 371  
372 372 ret = show_available_vars(params.events, params.nevents,
373 373 params.max_probe_points,
374   - params.target_module,
  374 + params.target,
375 375 params.filter,
376 376 params.show_ext_vars);
377 377 strfilter__delete(params.filter);
... ... @@ -393,7 +393,7 @@
393 393 if (params.nevents) {
394 394 ret = add_perf_probe_events(params.events, params.nevents,
395 395 params.max_probe_points,
396   - params.target_module,
  396 + params.target,
397 397 params.force_add);
398 398 if (ret < 0) {
399 399 pr_err(" Error: Failed to add events. (%d)\n", ret);
tools/perf/util/probe-event.c
Diff comments   View file @ 4eced23
... ... @@ -273,10 +273,10 @@
273 273 /* Try to find perf_probe_event with debuginfo */
274 274 static int try_to_find_probe_trace_events(struct perf_probe_event *pev,
275 275 struct probe_trace_event **tevs,
276   - int max_tevs, const char *module)
  276 + int max_tevs, const char *target)
277 277 {
278 278 bool need_dwarf = perf_probe_event_need_dwarf(pev);
279   - struct debuginfo *dinfo = open_debuginfo(module);
  279 + struct debuginfo *dinfo = open_debuginfo(target);
280 280 int ntevs, ret = 0;
281 281  
282 282 if (!dinfo) {
283 283  
... ... @@ -295,9 +295,9 @@
295 295  
296 296 if (ntevs > 0) { /* Succeeded to find trace events */
297 297 pr_debug("find %d probe_trace_events.\n", ntevs);
298   - if (module)
  298 + if (target)
299 299 ret = add_module_to_probe_trace_events(*tevs, ntevs,
300   - module);
  300 + target);
301 301 return ret < 0 ? ret : ntevs;
302 302 }
303 303  
304 304  
... ... @@ -1796,14 +1796,14 @@
1796 1796  
1797 1797 static int convert_to_probe_trace_events(struct perf_probe_event *pev,
1798 1798 struct probe_trace_event **tevs,
1799   - int max_tevs, const char *module)
  1799 + int max_tevs, const char *target)
1800 1800 {
1801 1801 struct symbol *sym;
1802 1802 int ret = 0, i;
1803 1803 struct probe_trace_event *tev;
1804 1804  
1805 1805 /* Convert perf_probe_event with debuginfo */
1806   - ret = try_to_find_probe_trace_events(pev, tevs, max_tevs, module);
  1806 + ret = try_to_find_probe_trace_events(pev, tevs, max_tevs, target);
1807 1807 if (ret != 0)
1808 1808 return ret; /* Found in debuginfo or got an error */
1809 1809  
... ... @@ -1819,8 +1819,8 @@
1819 1819 goto error;
1820 1820 }
1821 1821  
1822   - if (module) {
1823   - tev->point.module = strdup(module);
  1822 + if (target) {
  1823 + tev->point.module = strdup(target);
1824 1824 if (tev->point.module == NULL) {
1825 1825 ret = -ENOMEM;
1826 1826 goto error;
... ... @@ -1884,7 +1884,7 @@
1884 1884 };
1885 1885  
1886 1886 int add_perf_probe_events(struct perf_probe_event *pevs, int npevs,
1887   - int max_tevs, const char *module, bool force_add)
  1887 + int max_tevs, const char *target, bool force_add)
1888 1888 {
1889 1889 int i, j, ret;
1890 1890 struct __event_package *pkgs;
... ... @@ -1907,7 +1907,7 @@
1907 1907 ret = convert_to_probe_trace_events(pkgs[i].pev,
1908 1908 &pkgs[i].tevs,
1909 1909 max_tevs,
1910   - module);
  1910 + target);
1911 1911 if (ret < 0)
1912 1912 goto end;
1913 1913 pkgs[i].ntevs = ret;
... ... @@ -2063,7 +2063,7 @@
2063 2063 return 1;
2064 2064 }
2065 2065  
2066   -int show_available_funcs(const char *module, struct strfilter *_filter)
  2066 +int show_available_funcs(const char *target, struct strfilter *_filter)
2067 2067 {
2068 2068 struct map *map;
2069 2069 int ret;
2070 2070  
... ... @@ -2074,9 +2074,9 @@
2074 2074 if (ret < 0)
2075 2075 return ret;
2076 2076  
2077   - map = kernel_get_module_map(module);
  2077 + map = kernel_get_module_map(target);
2078 2078 if (!map) {
2079   - pr_err("Failed to find %s map.\n", (module) ? : "kernel");
  2079 + pr_err("Failed to find %s map.\n", (target) ? : "kernel");
2080 2080 return -EINVAL;
2081 2081 }
2082 2082 available_func_filter = _filter;