Commit ece2a4f4 authored by Tzvetomir Stoyanov (VMware)'s avatar Tzvetomir Stoyanov (VMware) Committed by Arnaldo Carvalho de Melo

tools lib traceevent, perf tools: Rename pevent_set_* APIs

In order to make libtraceevent into a proper library, variables, data
structures and functions require a unique prefix to prevent name space
conflicts. That prefix will be "tep_" and not "pevent_". This changes
APIs: pevent_set_file_bigendian, pevent_set_flag,
pevent_set_function_resolver, pevent_set_host_bigendian,
pevent_set_long_size, pevent_set_page_size and pevent_get_long_size
Signed-off-by: default avatarTzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Yordan Karadzhov (VMware) <y.karadz@gmail.com>
Cc: linux-trace-devel@vger.kernel.org
Link: http://lkml.kernel.org/r/20180808180701.256265951@goodmis.orgSigned-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 13a41890
...@@ -444,7 +444,7 @@ struct func_resolver { ...@@ -444,7 +444,7 @@ struct func_resolver {
}; };
/** /**
* pevent_set_function_resolver - set an alternative function resolver * tep_set_function_resolver - set an alternative function resolver
* @pevent: handle for the pevent * @pevent: handle for the pevent
* @resolver: function to be used * @resolver: function to be used
* @priv: resolver function private state. * @priv: resolver function private state.
...@@ -453,7 +453,7 @@ struct func_resolver { ...@@ -453,7 +453,7 @@ struct func_resolver {
* keep using it instead of duplicating all the entries inside * keep using it instead of duplicating all the entries inside
* pevent->funclist. * pevent->funclist.
*/ */
int pevent_set_function_resolver(struct tep_handle *pevent, int tep_set_function_resolver(struct tep_handle *pevent,
tep_func_resolver_t *func, void *priv) tep_func_resolver_t *func, void *priv)
{ {
struct func_resolver *resolver = malloc(sizeof(*resolver)); struct func_resolver *resolver = malloc(sizeof(*resolver));
......
...@@ -532,7 +532,7 @@ struct tep_handle { ...@@ -532,7 +532,7 @@ struct tep_handle {
char *trace_clock; char *trace_clock;
}; };
static inline void pevent_set_flag(struct tep_handle *pevent, int flag) static inline void tep_set_flag(struct tep_handle *pevent, int flag)
{ {
pevent->flags |= flag; pevent->flags |= flag;
} }
...@@ -615,7 +615,7 @@ enum trace_flag_type { ...@@ -615,7 +615,7 @@ enum trace_flag_type {
TRACE_FLAG_SOFTIRQ = 0x10, TRACE_FLAG_SOFTIRQ = 0x10,
}; };
int pevent_set_function_resolver(struct tep_handle *pevent, int tep_set_function_resolver(struct tep_handle *pevent,
tep_func_resolver_t *func, void *priv); tep_func_resolver_t *func, void *priv);
void pevent_reset_function_resolver(struct tep_handle *pevent); void pevent_reset_function_resolver(struct tep_handle *pevent);
int tep_register_comm(struct tep_handle *pevent, const char *comm, int pid); int tep_register_comm(struct tep_handle *pevent, const char *comm, int pid);
...@@ -741,12 +741,12 @@ static inline void pevent_set_cpus(struct tep_handle *pevent, int cpus) ...@@ -741,12 +741,12 @@ static inline void pevent_set_cpus(struct tep_handle *pevent, int cpus)
pevent->cpus = cpus; pevent->cpus = cpus;
} }
static inline int pevent_get_long_size(struct tep_handle *pevent) static inline int tep_get_long_size(struct tep_handle *pevent)
{ {
return pevent->long_size; return pevent->long_size;
} }
static inline void pevent_set_long_size(struct tep_handle *pevent, int long_size) static inline void tep_set_long_size(struct tep_handle *pevent, int long_size)
{ {
pevent->long_size = long_size; pevent->long_size = long_size;
} }
...@@ -756,7 +756,7 @@ static inline int pevent_get_page_size(struct tep_handle *pevent) ...@@ -756,7 +756,7 @@ static inline int pevent_get_page_size(struct tep_handle *pevent)
return pevent->page_size; return pevent->page_size;
} }
static inline void pevent_set_page_size(struct tep_handle *pevent, int _page_size) static inline void tep_set_page_size(struct tep_handle *pevent, int _page_size)
{ {
pevent->page_size = _page_size; pevent->page_size = _page_size;
} }
...@@ -766,7 +766,7 @@ static inline int pevent_is_file_bigendian(struct tep_handle *pevent) ...@@ -766,7 +766,7 @@ static inline int pevent_is_file_bigendian(struct tep_handle *pevent)
return pevent->file_bigendian; return pevent->file_bigendian;
} }
static inline void pevent_set_file_bigendian(struct tep_handle *pevent, int endian) static inline void tep_set_file_bigendian(struct tep_handle *pevent, int endian)
{ {
pevent->file_bigendian = endian; pevent->file_bigendian = endian;
} }
...@@ -776,7 +776,7 @@ static inline int pevent_is_host_bigendian(struct tep_handle *pevent) ...@@ -776,7 +776,7 @@ static inline int pevent_is_host_bigendian(struct tep_handle *pevent)
return pevent->host_bigendian; return pevent->host_bigendian;
} }
static inline void pevent_set_host_bigendian(struct tep_handle *pevent, int endian) static inline void tep_set_host_bigendian(struct tep_handle *pevent, int endian)
{ {
pevent->host_bigendian = endian; pevent->host_bigendian = endian;
} }
......
...@@ -1369,7 +1369,7 @@ int cmd_report(int argc, const char **argv) ...@@ -1369,7 +1369,7 @@ int cmd_report(int argc, const char **argv)
} }
if (session->tevent.pevent && if (session->tevent.pevent &&
pevent_set_function_resolver(session->tevent.pevent, tep_set_function_resolver(session->tevent.pevent,
machine__resolve_kernel_addr, machine__resolve_kernel_addr,
&session->machines.host) < 0) { &session->machines.host) < 0) {
pr_err("%s: failed to set libtraceevent function resolver\n", pr_err("%s: failed to set libtraceevent function resolver\n",
......
...@@ -3429,7 +3429,7 @@ int cmd_script(int argc, const char **argv) ...@@ -3429,7 +3429,7 @@ int cmd_script(int argc, const char **argv)
symbol_conf.use_callchain = false; symbol_conf.use_callchain = false;
if (session->tevent.pevent && if (session->tevent.pevent &&
pevent_set_function_resolver(session->tevent.pevent, tep_set_function_resolver(session->tevent.pevent,
machine__resolve_kernel_addr, machine__resolve_kernel_addr,
&session->machines.host) < 0) { &session->machines.host) < 0) {
pr_err("%s: failed to set libtraceevent function resolver\n", __func__); pr_err("%s: failed to set libtraceevent function resolver\n", __func__);
......
...@@ -265,7 +265,7 @@ pid_t machine__get_current_tid(struct machine *machine, int cpu); ...@@ -265,7 +265,7 @@ pid_t machine__get_current_tid(struct machine *machine, int cpu);
int machine__set_current_tid(struct machine *machine, int cpu, pid_t pid, int machine__set_current_tid(struct machine *machine, int cpu, pid_t pid,
pid_t tid); pid_t tid);
/* /*
* For use with libtraceevent's pevent_set_function_resolver() * For use with libtraceevent's tep_set_function_resolver()
*/ */
char *machine__resolve_kernel_addr(void *vmachine, unsigned long long *addrp, char **modp); char *machine__resolve_kernel_addr(void *vmachine, unsigned long long *addrp, char **modp);
......
...@@ -236,12 +236,12 @@ static int read_header_files(struct tep_handle *pevent) ...@@ -236,12 +236,12 @@ static int read_header_files(struct tep_handle *pevent)
} }
if (!tep_parse_header_page(pevent, header_page, size, if (!tep_parse_header_page(pevent, header_page, size,
pevent_get_long_size(pevent))) { tep_get_long_size(pevent))) {
/* /*
* The commit field in the page is of type long, * The commit field in the page is of type long,
* use that instead, since it represents the kernel. * use that instead, since it represents the kernel.
*/ */
pevent_set_long_size(pevent, pevent->header_page_size_size); tep_set_long_size(pevent, pevent->header_page_size_size);
} }
free(header_page); free(header_page);
...@@ -439,9 +439,9 @@ ssize_t trace_report(int fd, struct trace_event *tevent, bool __repipe) ...@@ -439,9 +439,9 @@ ssize_t trace_report(int fd, struct trace_event *tevent, bool __repipe)
pevent = tevent->pevent; pevent = tevent->pevent;
pevent_set_flag(pevent, PEVENT_NSEC_OUTPUT); tep_set_flag(pevent, PEVENT_NSEC_OUTPUT);
pevent_set_file_bigendian(pevent, file_bigendian); tep_set_file_bigendian(pevent, file_bigendian);
pevent_set_host_bigendian(pevent, host_bigendian); tep_set_host_bigendian(pevent, host_bigendian);
if (do_read(buf, 1) < 0) if (do_read(buf, 1) < 0)
goto out; goto out;
...@@ -451,8 +451,8 @@ ssize_t trace_report(int fd, struct trace_event *tevent, bool __repipe) ...@@ -451,8 +451,8 @@ ssize_t trace_report(int fd, struct trace_event *tevent, bool __repipe)
if (!file_page_size) if (!file_page_size)
goto out; goto out;
pevent_set_long_size(pevent, file_long_size); tep_set_long_size(pevent, file_long_size);
pevent_set_page_size(pevent, file_page_size); tep_set_page_size(pevent, file_page_size);
err = read_header_files(pevent); err = read_header_files(pevent);
if (err) if (err)
......
...@@ -47,9 +47,9 @@ static int trace_event__init2(void) ...@@ -47,9 +47,9 @@ static int trace_event__init2(void)
return -1; return -1;
pevent = tevent.pevent; pevent = tevent.pevent;
pevent_set_flag(pevent, PEVENT_NSEC_OUTPUT); tep_set_flag(pevent, PEVENT_NSEC_OUTPUT);
pevent_set_file_bigendian(pevent, be); tep_set_file_bigendian(pevent, be);
pevent_set_host_bigendian(pevent, be); tep_set_host_bigendian(pevent, be);
tevent_initialized = true; tevent_initialized = true;
return 0; return 0;
} }
...@@ -60,7 +60,7 @@ int trace_event__register_resolver(struct machine *machine, ...@@ -60,7 +60,7 @@ int trace_event__register_resolver(struct machine *machine,
if (!tevent_initialized && trace_event__init2()) if (!tevent_initialized && trace_event__init2())
return -1; return -1;
return pevent_set_function_resolver(tevent.pevent, func, machine); return tep_set_function_resolver(tevent.pevent, func, machine);
} }
void trace_event__cleanup(struct trace_event *t) void trace_event__cleanup(struct trace_event *t)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment