Merge branch 'x86/cleanups' into perf/uprobes

[karo-tx-linux.git] / tools / perf / util / probe-event.c

diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index e33554a562b36fb59c95d935258d525a0e810dac..15f9bb1b5f0af8aa599efce1d0b4f3941d4abe83 100644 (file)
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -273,10 +273,10 @@ static int add_module_to_probe_trace_events(struct probe_trace_event *tevs,
 /* Try to find perf_probe_event with debuginfo */
 static int try_to_find_probe_trace_events(struct perf_probe_event *pev,
                                          struct probe_trace_event **tevs,
-                                         int max_tevs, const char *module)
+                                         int max_tevs, const char *target)
 {
        bool need_dwarf = perf_probe_event_need_dwarf(pev);
-       struct debuginfo *dinfo = open_debuginfo(module);
+       struct debuginfo *dinfo = open_debuginfo(target);
        int ntevs, ret = 0;
 
        if (!dinfo) {
@@ -295,9 +295,9 @@ static int try_to_find_probe_trace_events(struct perf_probe_event *pev,
 
        if (ntevs > 0) {        /* Succeeded to find trace events */
                pr_debug("find %d probe_trace_events.\n", ntevs);
-               if (module)
+               if (target)
                        ret = add_module_to_probe_trace_events(*tevs, ntevs,
-                                                              module);
+                                                              target);
                return ret < 0 ? ret : ntevs;
        }
 
@@ -1729,7 +1729,7 @@ static int __add_probe_trace_events(struct perf_probe_event *pev,
        }
 
        ret = 0;
-       printf("Add new event%s\n", (ntevs > 1) ? "s:" : ":");
+       printf("Added new event%s\n", (ntevs > 1) ? "s:" : ":");
        for (i = 0; i < ntevs; i++) {
                tev = &tevs[i];
                if (pev->event)
@@ -1784,7 +1784,7 @@ static int __add_probe_trace_events(struct perf_probe_event *pev,
 
        if (ret >= 0) {
                /* Show how to use the event. */
-               printf("\nYou can now use it on all perf tools, such as:\n\n");
+               printf("\nYou can now use it in all perf tools, such as:\n\n");
                printf("\tperf record -e %s:%s -aR sleep 1\n\n", tev->group,
                         tev->event);
        }
@@ -1796,14 +1796,14 @@ static int __add_probe_trace_events(struct perf_probe_event *pev,
 
 static int convert_to_probe_trace_events(struct perf_probe_event *pev,
                                          struct probe_trace_event **tevs,
-                                         int max_tevs, const char *module)
+                                         int max_tevs, const char *target)
 {
        struct symbol *sym;
        int ret = 0, i;
        struct probe_trace_event *tev;
 
        /* Convert perf_probe_event with debuginfo */
-       ret = try_to_find_probe_trace_events(pev, tevs, max_tevs, module);
+       ret = try_to_find_probe_trace_events(pev, tevs, max_tevs, target);
        if (ret != 0)
                return ret;     /* Found in debuginfo or got an error */
 
@@ -1819,8 +1819,8 @@ static int convert_to_probe_trace_events(struct perf_probe_event *pev,
                goto error;
        }
 
-       if (module) {
-               tev->point.module = strdup(module);
+       if (target) {
+               tev->point.module = strdup(target);
                if (tev->point.module == NULL) {
                        ret = -ENOMEM;
                        goto error;
@@ -1890,7 +1890,7 @@ struct __event_package {
 };
 
 int add_perf_probe_events(struct perf_probe_event *pevs, int npevs,
-                         int max_tevs, const char *module, bool force_add)
+                         int max_tevs, const char *target, bool force_add)
 {
        int i, j, ret;
        struct __event_package *pkgs;
@@ -1913,7 +1913,7 @@ int add_perf_probe_events(struct perf_probe_event *pevs, int npevs,
                ret  = convert_to_probe_trace_events(pkgs[i].pev,
                                                     &pkgs[i].tevs,
                                                     max_tevs,
-                                                    module);
+                                                    target);
                if (ret < 0)
                        goto end;
                pkgs[i].ntevs = ret;
@@ -1965,7 +1965,7 @@ static int __del_trace_probe_event(int fd, struct str_node *ent)
                goto error;
        }
 
-       printf("Remove event: %s\n", ent->s);
+       printf("Removed event: %s\n", ent->s);
        return 0;
 error:
        pr_warning("Failed to delete event: %s\n", strerror(-ret));
@@ -2069,7 +2069,7 @@ static int filter_available_functions(struct map *map __unused,
        return 1;
 }
 
-int show_available_funcs(const char *module, struct strfilter *_filter)
+int show_available_funcs(const char *target, struct strfilter *_filter)
 {
        struct map *map;
        int ret;
@@ -2080,9 +2080,9 @@ int show_available_funcs(const char *module, struct strfilter *_filter)
        if (ret < 0)
                return ret;
 
-       map = kernel_get_module_map(module);
+       map = kernel_get_module_map(target);
        if (!map) {
-               pr_err("Failed to find %s map.\n", (module) ? : "kernel");
+               pr_err("Failed to find %s map.\n", (target) ? : "kernel");
                return -EINVAL;
        }
        available_func_filter = _filter;