Skip to content

L
linux
Commit 047ff221 authored by Tzvetomir Stoyanov's avatar Tzvetomir Stoyanov Committed by Arnaldo Carvalho de Melo
Browse files
Options

tools lib traceevent: Rename input arguments of libtraceevent APIs from pevent to tep 

Input arguments of libtraceevent APIs are renamed from "struct
tep_handle *pevent" to "struct tep_handle *tep". This makes the API
consistent with the chosen naming convention: tep (trace event parser),
instead of the old pevent.
Signed-off-by: default avatarTzvetomir Stoyanov <tstoyanov@vmware.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lore.kernel.org/linux-trace-devel/20190401132111.13727-2-tstoyanov@vmware.com
Link: http://lkml.kernel.org/r/20190401164344.465573837@goodmis.orgSigned-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 55c34ae0
Show whitespace changes
Inline Side-by-side
Showing with 439 additions and 442 deletions
tools/lib/traceevent/event-parse-api.c
View file @ 047ff221
...@@ -92,11 +92,11 @@ bool tep_test_flag(struct tep_handle *tep, enum tep_flag flag) ...@@ -92,11 +92,11 @@ bool tep_test_flag(struct tep_handle *tep, enum tep_flag flag)
return false; return false;
} }
unsigned short tep_data2host2(struct tep_handle *pevent, unsigned short data) unsigned short tep_data2host2(struct tep_handle *tep, unsigned short data)
{ {
unsigned short swap; unsigned short swap;
if (!pevent || pevent->host_bigendian == pevent->file_bigendian) if (!tep || tep->host_bigendian == tep->file_bigendian)
return data; return data;
swap = ((data & 0xffULL) << 8) | swap = ((data & 0xffULL) << 8) |
...@@ -105,11 +105,11 @@ unsigned short tep_data2host2(struct tep_handle *pevent, unsigned short data) ...@@ -105,11 +105,11 @@ unsigned short tep_data2host2(struct tep_handle *pevent, unsigned short data)
return swap; return swap;
} }
unsigned int tep_data2host4(struct tep_handle *pevent, unsigned int data) unsigned int tep_data2host4(struct tep_handle *tep, unsigned int data)
{ {
unsigned int swap; unsigned int swap;
if (!pevent || pevent->host_bigendian == pevent->file_bigendian) if (!tep || tep->host_bigendian == tep->file_bigendian)
return data; return data;
swap = ((data & 0xffULL) << 24) | swap = ((data & 0xffULL) << 24) |
...@@ -121,11 +121,11 @@ unsigned int tep_data2host4(struct tep_handle *pevent, unsigned int data) ...@@ -121,11 +121,11 @@ unsigned int tep_data2host4(struct tep_handle *pevent, unsigned int data)
} }
unsigned long long unsigned long long
tep_data2host8(struct tep_handle *pevent, unsigned long long data) tep_data2host8(struct tep_handle *tep, unsigned long long data)
{ {
unsigned long long swap; unsigned long long swap;
if (!pevent || pevent->host_bigendian == pevent->file_bigendian) if (!tep || tep->host_bigendian == tep->file_bigendian)
return data; return data;
swap = ((data & 0xffULL) << 56) | swap = ((data & 0xffULL) << 56) |
...@@ -142,15 +142,15 @@ tep_data2host8(struct tep_handle *pevent, unsigned long long data) ...@@ -142,15 +142,15 @@ tep_data2host8(struct tep_handle *pevent, unsigned long long data)
/** /**
* tep_get_header_page_size - get size of the header page * tep_get_header_page_size - get size of the header page
* @pevent: a handle to the tep_handle * @tep: a handle to the tep_handle
* *
* This returns size of the header page * This returns size of the header page
* If @pevent is NULL, 0 is returned. * If @tep is NULL, 0 is returned.
*/ */
int tep_get_header_page_size(struct tep_handle *pevent) int tep_get_header_page_size(struct tep_handle *tep)
{ {
if (pevent) if (tep)
return pevent->header_page_size_size; return tep->header_page_size_size;
return 0; return 0;
} }
...@@ -170,163 +170,163 @@ int tep_get_header_timestamp_size(struct tep_handle *tep) ...@@ -170,163 +170,163 @@ int tep_get_header_timestamp_size(struct tep_handle *tep)
/** /**
* tep_get_cpus - get the number of CPUs * tep_get_cpus - get the number of CPUs
* @pevent: a handle to the tep_handle * @tep: a handle to the tep_handle
* *
* This returns the number of CPUs * This returns the number of CPUs
* If @pevent is NULL, 0 is returned. * If @tep is NULL, 0 is returned.
*/ */
int tep_get_cpus(struct tep_handle *pevent) int tep_get_cpus(struct tep_handle *tep)
{ {
if (pevent) if (tep)
return pevent->cpus; return tep->cpus;
return 0; return 0;
} }
/** /**
* tep_set_cpus - set the number of CPUs * tep_set_cpus - set the number of CPUs
* @pevent: a handle to the tep_handle * @tep: a handle to the tep_handle
* *
* This sets the number of CPUs * This sets the number of CPUs
*/ */
void tep_set_cpus(struct tep_handle *pevent, int cpus) void tep_set_cpus(struct tep_handle *tep, int cpus)
{ {
if (pevent) if (tep)
pevent->cpus = cpus; tep->cpus = cpus;
} }
/** /**
* tep_get_long_size - get the size of a long integer on the traced machine * tep_get_long_size - get the size of a long integer on the traced machine
* @pevent: a handle to the tep_handle * @tep: a handle to the tep_handle
* *
* This returns the size of a long integer on the traced machine * This returns the size of a long integer on the traced machine
* If @pevent is NULL, 0 is returned. * If @tep is NULL, 0 is returned.
*/ */
int tep_get_long_size(struct tep_handle *pevent) int tep_get_long_size(struct tep_handle *tep)
{ {
if (pevent) if (tep)
return pevent->long_size; return tep->long_size;
return 0; return 0;
} }
/** /**
* tep_set_long_size - set the size of a long integer on the traced machine * tep_set_long_size - set the size of a long integer on the traced machine
* @pevent: a handle to the tep_handle * @tep: a handle to the tep_handle
* @size: size, in bytes, of a long integer * @size: size, in bytes, of a long integer
* *
* This sets the size of a long integer on the traced machine * This sets the size of a long integer on the traced machine
*/ */
void tep_set_long_size(struct tep_handle *pevent, int long_size) void tep_set_long_size(struct tep_handle *tep, int long_size)
{ {
if (pevent) if (tep)
pevent->long_size = long_size; tep->long_size = long_size;
} }
/** /**
* tep_get_page_size - get the size of a memory page on the traced machine * tep_get_page_size - get the size of a memory page on the traced machine
* @pevent: a handle to the tep_handle * @tep: a handle to the tep_handle
* *
* This returns the size of a memory page on the traced machine * This returns the size of a memory page on the traced machine
* If @pevent is NULL, 0 is returned. * If @tep is NULL, 0 is returned.
*/ */
int tep_get_page_size(struct tep_handle *pevent) int tep_get_page_size(struct tep_handle *tep)
{ {
if (pevent) if (tep)
return pevent->page_size; return tep->page_size;
return 0; return 0;
} }
/** /**
* tep_set_page_size - set the size of a memory page on the traced machine * tep_set_page_size - set the size of a memory page on the traced machine
* @pevent: a handle to the tep_handle * @tep: a handle to the tep_handle
* @_page_size: size of a memory page, in bytes * @_page_size: size of a memory page, in bytes
* *
* This sets the size of a memory page on the traced machine * This sets the size of a memory page on the traced machine
*/ */
void tep_set_page_size(struct tep_handle *pevent, int _page_size) void tep_set_page_size(struct tep_handle *tep, int _page_size)
{ {
if (pevent) if (tep)
pevent->page_size = _page_size; tep->page_size = _page_size;
} }
/** /**
* tep_is_file_bigendian - return the endian of the file * tep_is_file_bigendian - return the endian of the file
* @pevent: a handle to the tep_handle * @tep: a handle to the tep_handle
* *
* This returns true if the file is in big endian order * This returns true if the file is in big endian order
* If @pevent is NULL, false is returned. * If @tep is NULL, false is returned.
*/ */
bool tep_is_file_bigendian(struct tep_handle *pevent) bool tep_is_file_bigendian(struct tep_handle *tep)
{ {
if (pevent) if (tep)
return pevent->file_bigendian == TEP_BIG_ENDIAN; return (tep->file_bigendian == TEP_BIG_ENDIAN);
return false; return false;
} }
/** /**
* tep_set_file_bigendian - set if the file is in big endian order * tep_set_file_bigendian - set if the file is in big endian order
* @pevent: a handle to the tep_handle * @tep: a handle to the tep_handle
* @endian: non zero, if the file is in big endian order * @endian: non zero, if the file is in big endian order
* *
* This sets if the file is in big endian order * This sets if the file is in big endian order
*/ */
void tep_set_file_bigendian(struct tep_handle *pevent, enum tep_endian endian) void tep_set_file_bigendian(struct tep_handle *tep, enum tep_endian endian)
{ {
if (pevent) if (tep)
pevent->file_bigendian = endian; tep->file_bigendian = endian;
} }
/** /**
* tep_is_local_bigendian - return the endian of the saved local machine * tep_is_local_bigendian - return the endian of the saved local machine
* @pevent: a handle to the tep_handle * @tep: a handle to the tep_handle
* *
* This returns true if the saved local machine in @pevent is big endian. * This returns true if the saved local machine in @tep is big endian.
* If @pevent is NULL, false is returned. * If @tep is NULL, false is returned.
*/ */
bool tep_is_local_bigendian(struct tep_handle *pevent) bool tep_is_local_bigendian(struct tep_handle *tep)
{ {
if (pevent) if (tep)
return pevent->host_bigendian == TEP_BIG_ENDIAN; return (tep->host_bigendian == TEP_BIG_ENDIAN);
return 0; return 0;
} }
/** /**
* tep_set_local_bigendian - set the stored local machine endian order * tep_set_local_bigendian - set the stored local machine endian order
* @pevent: a handle to the tep_handle * @tep: a handle to the tep_handle
* @endian: non zero, if the local host has big endian order * @endian: non zero, if the local host has big endian order
* *
* This sets the endian order for the local machine. * This sets the endian order for the local machine.
*/ */
void tep_set_local_bigendian(struct tep_handle *pevent, enum tep_endian endian) void tep_set_local_bigendian(struct tep_handle *tep, enum tep_endian endian)
{ {
if (pevent) if (tep)
pevent->host_bigendian = endian; tep->host_bigendian = endian;
} }
/** /**
* tep_is_latency_format - get if the latency output format is configured * tep_is_latency_format - get if the latency output format is configured
* @pevent: a handle to the tep_handle * @tep: a handle to the tep_handle
* *
* This returns true if the latency output format is configured * This returns true if the latency output format is configured
* If @pevent is NULL, false is returned. * If @tep is NULL, false is returned.
*/ */
bool tep_is_latency_format(struct tep_handle *pevent) bool tep_is_latency_format(struct tep_handle *tep)
{ {
if (pevent) if (tep)
return pevent->latency_format; return (tep->latency_format);
return false; return false;
} }
/** /**
* tep_set_latency_format - set the latency output format * tep_set_latency_format - set the latency output format
* @pevent: a handle to the tep_handle * @tep: a handle to the tep_handle
* @lat: non zero for latency output format * @lat: non zero for latency output format
* *
* This sets the latency output format * This sets the latency output format
*/ */
void tep_set_latency_format(struct tep_handle *pevent, int lat) void tep_set_latency_format(struct tep_handle *tep, int lat)
{ {
if (pevent) if (tep)
pevent->latency_format = lat; tep->latency_format = lat;
} }
/** /**
......
tools/lib/traceevent/event-parse-local.h
View file @ 047ff221
...@@ -92,8 +92,8 @@ struct tep_handle { ...@@ -92,8 +92,8 @@ struct tep_handle {
void tep_free_event(struct tep_event *event); void tep_free_event(struct tep_event *event);
void tep_free_format_field(struct tep_format_field *field); void tep_free_format_field(struct tep_format_field *field);
unsigned short tep_data2host2(struct tep_handle *pevent, unsigned short data); unsigned short tep_data2host2(struct tep_handle *tep, unsigned short data);
unsigned int tep_data2host4(struct tep_handle *pevent, unsigned int data); unsigned int tep_data2host4(struct tep_handle *tep, unsigned int data);
unsigned long long tep_data2host8(struct tep_handle *pevent, unsigned long long data); unsigned long long tep_data2host8(struct tep_handle *tep, unsigned long long data);
#endif /* _PARSE_EVENTS_INT_H */ #endif /* _PARSE_EVENTS_INT_H */
tools/lib/traceevent/event-parse.c
View file @ 047ff221
...@@ -200,13 +200,13 @@ static const char *find_cmdline(struct tep_handle *pevent, int pid) ...@@ -200,13 +200,13 @@ static const char *find_cmdline(struct tep_handle *pevent, int pid)
/** /**
* tep_is_pid_registered - return if a pid has a cmdline registered * tep_is_pid_registered - return if a pid has a cmdline registered
* @pevent: handle for the pevent * @tep: a handle to the trace event parser context
* @pid: The pid to check if it has a cmdline registered with. * @pid: The pid to check if it has a cmdline registered with.
* *
* Returns true if the pid has a cmdline mapped to it * Returns true if the pid has a cmdline mapped to it
* false otherwise. * false otherwise.
*/ */
bool tep_is_pid_registered(struct tep_handle *pevent, int pid) bool tep_is_pid_registered(struct tep_handle *tep, int pid)
{ {
const struct tep_cmdline *comm; const struct tep_cmdline *comm;
struct tep_cmdline key; struct tep_cmdline key;
...@@ -214,13 +214,13 @@ bool tep_is_pid_registered(struct tep_handle *pevent, int pid) ...@@ -214,13 +214,13 @@ bool tep_is_pid_registered(struct tep_handle *pevent, int pid)
if (!pid) if (!pid)
return true; return true;
if (!pevent->cmdlines && cmdline_init(pevent)) if (!tep->cmdlines && cmdline_init(tep))
return false; return false;
key.pid = pid; key.pid = pid;
comm = bsearch(&key, pevent->cmdlines, pevent->cmdline_count, comm = bsearch(&key, tep->cmdlines, tep->cmdline_count,
sizeof(*pevent->cmdlines), cmdline_cmp); sizeof(*tep->cmdlines), cmdline_cmp);
if (comm) if (comm)
return true; return true;
...@@ -288,13 +288,13 @@ static int add_new_comm(struct tep_handle *pevent, ...@@ -288,13 +288,13 @@ static int add_new_comm(struct tep_handle *pevent,
return 0; return 0;
} }
static int _tep_register_comm(struct tep_handle *pevent, static int _tep_register_comm(struct tep_handle *tep,
const char *comm, int pid, bool override) const char *comm, int pid, bool override)
{ {
struct cmdline_list *item; struct cmdline_list *item;
if (pevent->cmdlines) if (tep->cmdlines)
return add_new_comm(pevent, comm, pid, override); return add_new_comm(tep, comm, pid, override);
item = malloc(sizeof(*item)); item = malloc(sizeof(*item));
if (!item) if (!item)
...@@ -309,17 +309,17 @@ static int _tep_register_comm(struct tep_handle *pevent, ...@@ -309,17 +309,17 @@ static int _tep_register_comm(struct tep_handle *pevent,
return -1; return -1;
} }
item->pid = pid; item->pid = pid;
item->next = pevent->cmdlist; item->next = tep->cmdlist;
pevent->cmdlist = item; tep->cmdlist = item;
pevent->cmdline_count++; tep->cmdline_count++;
return 0; return 0;
} }
/** /**
* tep_register_comm - register a pid / comm mapping * tep_register_comm - register a pid / comm mapping
* @pevent: handle for the pevent * @tep: a handle to the trace event parser context
* @comm: the command line to register * @comm: the command line to register
* @pid: the pid to map the command line to * @pid: the pid to map the command line to
* *
...@@ -327,14 +327,14 @@ static int _tep_register_comm(struct tep_handle *pevent, ...@@ -327,14 +327,14 @@ static int _tep_register_comm(struct tep_handle *pevent,
* a given pid. The comm is duplicated. If a command with the same pid * a given pid. The comm is duplicated. If a command with the same pid
* already exist, -1 is returned and errno is set to EEXIST * already exist, -1 is returned and errno is set to EEXIST
*/ */
int tep_register_comm(struct tep_handle *pevent, const char *comm, int pid) int tep_register_comm(struct tep_handle *tep, const char *comm, int pid)
{ {
return _tep_register_comm(pevent, comm, pid, false); return _tep_register_comm(tep, comm, pid, false);
} }
/** /**
* tep_override_comm - register a pid / comm mapping * tep_override_comm - register a pid / comm mapping
* @pevent: handle for the pevent * @tep: a handle to the trace event parser context
* @comm: the command line to register * @comm: the command line to register
* @pid: the pid to map the command line to * @pid: the pid to map the command line to
* *
...@@ -342,19 +342,19 @@ int tep_register_comm(struct tep_handle *pevent, const char *comm, int pid) ...@@ -342,19 +342,19 @@ int tep_register_comm(struct tep_handle *pevent, const char *comm, int pid)
* a given pid. The comm is duplicated. If a command with the same pid * a given pid. The comm is duplicated. If a command with the same pid
* already exist, the command string is udapted with the new one * already exist, the command string is udapted with the new one
*/ */
int tep_override_comm(struct tep_handle *pevent, const char *comm, int pid) int tep_override_comm(struct tep_handle *tep, const char *comm, int pid)
{ {
if (!pevent->cmdlines && cmdline_init(pevent)) { if (!tep->cmdlines && cmdline_init(tep)) {
errno = ENOMEM; errno = ENOMEM;
return -1; return -1;
} }
return _tep_register_comm(pevent, comm, pid, true); return _tep_register_comm(tep, comm, pid, true);
} }
int tep_register_trace_clock(struct tep_handle *pevent, const char *trace_clock) int tep_register_trace_clock(struct tep_handle *tep, const char *trace_clock)
{ {
pevent->trace_clock = strdup(trace_clock); tep->trace_clock = strdup(trace_clock);
if (!pevent->trace_clock) { if (!tep->trace_clock) {
errno = ENOMEM; errno = ENOMEM;
return -1; return -1;
} }
...@@ -472,15 +472,14 @@ struct func_resolver { ...@@ -472,15 +472,14 @@ struct func_resolver {
/** /**
* tep_set_function_resolver - set an alternative function resolver * tep_set_function_resolver - set an alternative function resolver
* @pevent: handle for the pevent * @tep: a handle to the trace event parser context
* @resolver: function to be used * @resolver: function to be used
* @priv: resolver function private state. * @priv: resolver function private state.
* *
* Some tools may have already a way to resolve kernel functions, allow them to * Some tools may have already a way to resolve kernel functions, allow them to
* keep using it instead of duplicating all the entries inside * keep using it instead of duplicating all the entries inside tep->funclist.
* pevent->funclist.
*/ */
int tep_set_function_resolver(struct tep_handle *pevent, int tep_set_function_resolver(struct tep_handle *tep,
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));
...@@ -491,23 +490,23 @@ int tep_set_function_resolver(struct tep_handle *pevent, ...@@ -491,23 +490,23 @@ int tep_set_function_resolver(struct tep_handle *pevent,
resolver->func = func; resolver->func = func;
resolver->priv = priv; resolver->priv = priv;
free(pevent->func_resolver); free(tep->func_resolver);
pevent->func_resolver = resolver; tep->func_resolver = resolver;
return 0; return 0;
} }
/** /**
* tep_reset_function_resolver - reset alternative function resolver * tep_reset_function_resolver - reset alternative function resolver
* @pevent: handle for the pevent * @tep: a handle to the trace event parser context
* *
* Stop using whatever alternative resolver was set, use the default * Stop using whatever alternative resolver was set, use the default
* one instead. * one instead.
*/ */
void tep_reset_function_resolver(struct tep_handle *pevent) void tep_reset_function_resolver(struct tep_handle *tep)
{ {
free(pevent->func_resolver); free(tep->func_resolver);
pevent->func_resolver = NULL; tep->func_resolver = NULL;
} }
static struct func_map * static struct func_map *
...@@ -531,18 +530,18 @@ find_func(struct tep_handle *pevent, unsigned long long addr) ...@@ -531,18 +530,18 @@ find_func(struct tep_handle *pevent, unsigned long long addr)
/** /**
* tep_find_function - find a function by a given address * tep_find_function - find a function by a given address
* @pevent: handle for the pevent * @tep: a handle to the trace event parser context
* @addr: the address to find the function with * @addr: the address to find the function with
* *
* Returns a pointer to the function stored that has the given * Returns a pointer to the function stored that has the given
* address. Note, the address does not have to be exact, it * address. Note, the address does not have to be exact, it
* will select the function that would contain the address. * will select the function that would contain the address.
*/ */
const char *tep_find_function(struct tep_handle *pevent, unsigned long long addr) const char *tep_find_function(struct tep_handle *tep, unsigned long long addr)
{ {
struct func_map *map; struct func_map *map;
map = find_func(pevent, addr); map = find_func(tep, addr);
if (!map) if (!map)
return NULL; return NULL;
...@@ -551,7 +550,7 @@ const char *tep_find_function(struct tep_handle *pevent, unsigned long long addr ...@@ -551,7 +550,7 @@ const char *tep_find_function(struct tep_handle *pevent, unsigned long long addr
/** /**
* tep_find_function_address - find a function address by a given address * tep_find_function_address - find a function address by a given address
* @pevent: handle for the pevent * @tep: a handle to the trace event parser context
* @addr: the address to find the function with * @addr: the address to find the function with
* *
* Returns the address the function starts at. This can be used in * Returns the address the function starts at. This can be used in
...@@ -559,11 +558,11 @@ const char *tep_find_function(struct tep_handle *pevent, unsigned long long addr ...@@ -559,11 +558,11 @@ const char *tep_find_function(struct tep_handle *pevent, unsigned long long addr
* name and the function offset. * name and the function offset.
*/ */
unsigned long long unsigned long long
tep_find_function_address(struct tep_handle *pevent, unsigned long long addr) tep_find_function_address(struct tep_handle *tep, unsigned long long addr)
{ {
struct func_map *map; struct func_map *map;
map = find_func(pevent, addr); map = find_func(tep, addr);
if (!map) if (!map)
return 0; return 0;
...@@ -572,7 +571,7 @@ tep_find_function_address(struct tep_handle *pevent, unsigned long long addr) ...@@ -572,7 +571,7 @@ tep_find_function_address(struct tep_handle *pevent, unsigned long long addr)
/** /**
* tep_register_function - register a function with a given address * tep_register_function - register a function with a given address
* @pevent: handle for the pevent * @tep: a handle to the trace event parser context
* @function: the function name to register * @function: the function name to register
* @addr: the address the function starts at * @addr: the address the function starts at
* @mod: the kernel module the function may be in (NULL for none) * @mod: the kernel module the function may be in (NULL for none)
...@@ -580,7 +579,7 @@ tep_find_function_address(struct tep_handle *pevent, unsigned long long addr) ...@@ -580,7 +579,7 @@ tep_find_function_address(struct tep_handle *pevent, unsigned long long addr)
* This registers a function name with an address and module. * This registers a function name with an address and module.
* The @func passed in is duplicated. * The @func passed in is duplicated.
*/ */
int tep_register_function(struct tep_handle *pevent, char *func, int tep_register_function(struct tep_handle *tep, char *func,
unsigned long long addr, char *mod) unsigned long long addr, char *mod)
{ {
struct func_list *item = malloc(sizeof(*item)); struct func_list *item = malloc(sizeof(*item));
...@@ -588,7 +587,7 @@ int tep_register_function(struct tep_handle *pevent, char *func, ...@@ -588,7 +587,7 @@ int tep_register_function(struct tep_handle *pevent, char *func,
if (!item) if (!item)
return -1; return -1;
item->next = pevent->funclist; item->next = tep->funclist;
item->func = strdup(func); item->func = strdup(func);
if (!item->func) if (!item->func)
goto out_free; goto out_free;
...@@ -601,8 +600,8 @@ int tep_register_function(struct tep_handle *pevent, char *func, ...@@ -601,8 +600,8 @@ int tep_register_function(struct tep_handle *pevent, char *func,
item->mod = NULL; item->mod = NULL;
item->addr = addr; item->addr = addr;
pevent->funclist = item; tep->funclist = item;
pevent->func_count++; tep->func_count++;
return 0; return 0;
...@@ -617,23 +616,23 @@ int tep_register_function(struct tep_handle *pevent, char *func, ...@@ -617,23 +616,23 @@ int tep_register_function(struct tep_handle *pevent, char *func,
/** /**
* tep_print_funcs - print out the stored functions * tep_print_funcs - print out the stored functions
* @pevent: handle for the pevent * @tep: a handle to the trace event parser context
* *
* This prints out the stored functions. * This prints out the stored functions.
*/ */
void tep_print_funcs(struct tep_handle *pevent) void tep_print_funcs(struct tep_handle *tep)
{ {
int i; int i;
if (!pevent->func_map) if (!tep->func_map)
func_map_init(pevent); func_map_init(tep);
for (i = 0; i < (int)pevent->func_count; i++) { for (i = 0; i < (int)tep->func_count; i++) {
printf("%016llx %s", printf("%016llx %s",
pevent->func_map[i].addr, tep->func_map[i].addr,
pevent->func_map[i].func); tep->func_map[i].func);
if (pevent->func_map[i].mod) if (tep->func_map[i].mod)
printf(" [%s]\n", pevent->func_map[i].mod); printf(" [%s]\n", tep->func_map[i].mod);
else else
printf("\n"); printf("\n");
} }
...@@ -713,14 +712,14 @@ find_printk(struct tep_handle *pevent, unsigned long long addr) ...@@ -713,14 +712,14 @@ find_printk(struct tep_handle *pevent, unsigned long long addr)
/** /**
* tep_register_print_string - register a string by its address * tep_register_print_string - register a string by its address
* @pevent: handle for the pevent * @tep: a handle to the trace event parser context
* @fmt: the string format to register * @fmt: the string format to register
* @addr: the address the string was located at * @addr: the address the string was located at
* *
* This registers a string by the address it was stored in the kernel. * This registers a string by the address it was stored in the kernel.
* The @fmt passed in is duplicated. * The @fmt passed in is duplicated.
*/ */
int tep_register_print_string(struct tep_handle *pevent, const char *fmt, int tep_register_print_string(struct tep_handle *tep, const char *fmt,
unsigned long long addr) unsigned long long addr)
{ {
struct printk_list *item = malloc(sizeof(*item)); struct printk_list *item = malloc(sizeof(*item));
...@@ -729,7 +728,7 @@ int tep_register_print_string(struct tep_handle *pevent, const char *fmt, ...@@ -729,7 +728,7 @@ int tep_register_print_string(struct tep_handle *pevent, const char *fmt,
if (!item) if (!item)
return -1; return -1;
item->next = pevent->printklist; item->next = tep->printklist;
item->addr = addr; item->addr = addr;
/* Strip off quotes and '\n' from the end */ /* Strip off quotes and '\n' from the end */
...@@ -747,8 +746,8 @@ int tep_register_print_string(struct tep_handle *pevent, const char *fmt, ...@@ -747,8 +746,8 @@ int tep_register_print_string(struct tep_handle *pevent, const char *fmt,
if (strcmp(p, "\\n") == 0) if (strcmp(p, "\\n") == 0)
*p = 0; *p = 0;
pevent->printklist = item; tep->printklist = item;
pevent->printk_count++; tep->printk_count++;
return 0; return 0;
...@@ -760,21 +759,21 @@ int tep_register_print_string(struct tep_handle *pevent, const char *fmt, ...@@ -760,21 +759,21 @@ int tep_register_print_string(struct tep_handle *pevent, const char *fmt,
/** /**
* tep_print_printk - print out the stored strings * tep_print_printk - print out the stored strings
* @pevent: handle for the pevent * @tep: a handle to the trace event parser context
* *
* This prints the string formats that were stored. * This prints the string formats that were stored.
*/ */
void tep_print_printk(struct tep_handle *pevent) void tep_print_printk(struct tep_handle *tep)
{ {
int i; int i;
if (!pevent->printk_map) if (!tep->printk_map)
printk_map_init(pevent); printk_map_init(tep);
for (i = 0; i < (int)pevent->printk_count; i++) { for (i = 0; i < (int)tep->printk_count; i++) {
printf("%016llx %s\n", printf("%016llx %s\n",
pevent->printk_map[i].addr, tep->printk_map[i].addr,
pevent->printk_map[i].printk); tep->printk_map[i].printk);
} }
} }
...@@ -1184,7 +1183,7 @@ static enum tep_event_type read_token(char **tok) ...@@ -1184,7 +1183,7 @@ static enum tep_event_type read_token(char **tok)
} }
/** /**
* tep_read_token - access to utilities to use the pevent parser * tep_read_token - access to utilities to use the tep parser
* @tok: The token to return * @tok: The token to return
* *
* This will parse tokens from the string given by * This will parse tokens from the string given by
...@@ -3357,14 +3356,14 @@ tep_find_any_field(struct tep_event *event, const char *name) ...@@ -3357,14 +3356,14 @@ tep_find_any_field(struct tep_event *event, const char *name)
/** /**
* tep_read_number - read a number from data * tep_read_number - read a number from data
* @pevent: handle for the pevent * @tep: a handle to the trace event parser context
* @ptr: the raw data * @ptr: the raw data
* @size: the size of the data that holds the number * @size: the size of the data that holds the number
* *
* Returns the number (converted to host) from the * Returns the number (converted to host) from the
* raw data. * raw data.
*/ */
unsigned long long tep_read_number(struct tep_handle *pevent, unsigned long long tep_read_number(struct tep_handle *tep,
const void *ptr, int size) const void *ptr, int size)
{ {
unsigned long long val; unsigned long long val;
...@@ -3373,12 +3372,12 @@ unsigned long long tep_read_number(struct tep_handle *pevent, ...@@ -3373,12 +3372,12 @@ unsigned long long tep_read_number(struct tep_handle *pevent,
case 1: case 1:
return *(unsigned char *)ptr; return *(unsigned char *)ptr;
case 2: case 2:
return tep_data2host2(pevent, *(unsigned short *)ptr); return tep_data2host2(tep, *(unsigned short *)ptr);
case 4: case 4:
return tep_data2host4(pevent, *(unsigned int *)ptr); return tep_data2host4(tep, *(unsigned int *)ptr);
case 8: case 8:
memcpy(&val, (ptr), sizeof(unsigned long long)); memcpy(&val, (ptr), sizeof(unsigned long long));
return tep_data2host8(pevent, val); return tep_data2host8(tep, val);
default: default:
/* BUG! */ /* BUG! */
return 0; return 0;
...@@ -3499,28 +3498,28 @@ static int events_id_cmp(const void *a, const void *b); ...@@ -3499,28 +3498,28 @@ static int events_id_cmp(const void *a, const void *b);
/** /**
* tep_find_event - find an event by given id * tep_find_event - find an event by given id
* @pevent: a handle to the pevent * @tep: a handle to the trace event parser context
* @id: the id of the event * @id: the id of the event
* *
* Returns an event that has a given @id. * Returns an event that has a given @id.
*/ */
struct tep_event *tep_find_event(struct tep_handle *pevent, int id) struct tep_event *tep_find_event(struct tep_handle *tep, int id)
{ {
struct tep_event **eventptr; struct tep_event **eventptr;
struct tep_event key; struct tep_event key;
struct tep_event *pkey = &key; struct tep_event *pkey = &key;
/* Check cache first */ /* Check cache first */
if (pevent->last_event && pevent->last_event->id == id) if (tep->last_event && tep->last_event->id == id)
return pevent->last_event; return tep->last_event;
key.id = id; key.id = id;
eventptr = bsearch(&pkey, pevent->events, pevent->nr_events, eventptr = bsearch(&pkey, tep->events, tep->nr_events,
sizeof(*pevent->events), events_id_cmp); sizeof(*tep->events), events_id_cmp);
if (eventptr) { if (eventptr) {
pevent->last_event = *eventptr; tep->last_event = *eventptr;
return *eventptr; return *eventptr;
} }
...@@ -3529,7 +3528,7 @@ struct tep_event *tep_find_event(struct tep_handle *pevent, int id) ...@@ -3529,7 +3528,7 @@ struct tep_event *tep_find_event(struct tep_handle *pevent, int id)
/** /**
* tep_find_event_by_name - find an event by given name * tep_find_event_by_name - find an event by given name
* @pevent: a handle to the pevent * @tep: a handle to the trace event parser context
* @sys: the system name to search for * @sys: the system name to search for
* @name: the name of the event to search for * @name: the name of the event to search for
* *
...@@ -3537,19 +3536,19 @@ struct tep_event *tep_find_event(struct tep_handle *pevent, int id) ...@@ -3537,19 +3536,19 @@ struct tep_event *tep_find_event(struct tep_handle *pevent, int id)
* @sys. If @sys is NULL the first event with @name is returned. * @sys. If @sys is NULL the first event with @name is returned.
*/ */
struct tep_event * struct tep_event *
tep_find_event_by_name(struct tep_handle *pevent, tep_find_event_by_name(struct tep_handle *tep,
const char *sys, const char *name) const char *sys, const char *name)
{ {
struct tep_event *event = NULL; struct tep_event *event = NULL;
int i; int i;
if (pevent->last_event && if (tep->last_event &&
strcmp(pevent->last_event->name, name) == 0 && strcmp(tep->last_event->name, name) == 0 &&
(!sys || strcmp(pevent->last_event->system, sys) == 0)) (!sys || strcmp(tep->last_event->system, sys) == 0))
return pevent->last_event; return tep->last_event;
for (i = 0; i < pevent->nr_events; i++) { for (i = 0; i < tep->nr_events; i++) {
event = pevent->events[i]; event = tep->events[i];
if (strcmp(event->name, name) == 0) { if (strcmp(event->name, name) == 0) {
if (!sys) if (!sys)
break; break;
...@@ -3557,10 +3556,10 @@ tep_find_event_by_name(struct tep_handle *pevent, ...@@ -3557,10 +3556,10 @@ tep_find_event_by_name(struct tep_handle *pevent,
break; break;
} }
} }
if (i == pevent->nr_events) if (i == tep->nr_events)
event = NULL; event = NULL;
pevent->last_event = event; tep->last_event = event;
return event; return event;
} }
...@@ -5173,7 +5172,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_e ...@@ -5173,7 +5172,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_e
/** /**
* tep_data_latency_format - parse the data for the latency format * tep_data_latency_format - parse the data for the latency format
* @pevent: a handle to the pevent * @tep: a handle to the trace event parser context
* @s: the trace_seq to write to * @s: the trace_seq to write to
* @record: the record to read from * @record: the record to read from
* *
...@@ -5181,7 +5180,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_e ...@@ -5181,7 +5180,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_e
* need rescheduling, in hard/soft interrupt, preempt count * need rescheduling, in hard/soft interrupt, preempt count
* and lock depth) and places it into the trace_seq. * and lock depth) and places it into the trace_seq.
*/ */
void tep_data_latency_format(struct tep_handle *pevent, void tep_data_latency_format(struct tep_handle *tep,
struct trace_seq *s, struct tep_record *record) struct trace_seq *s, struct tep_record *record)
{ {
static int check_lock_depth = 1; static int check_lock_depth = 1;
...@@ -5196,13 +5195,13 @@ void tep_data_latency_format(struct tep_handle *pevent, ...@@ -5196,13 +5195,13 @@ void tep_data_latency_format(struct tep_handle *pevent,
int softirq; int softirq;
void *data = record->data; void *data = record->data;
lat_flags = parse_common_flags(pevent, data); lat_flags = parse_common_flags(tep, data);
pc = parse_common_pc(pevent, data); pc = parse_common_pc(tep, data);
/* lock_depth may not always exist */ /* lock_depth may not always exist */
if (lock_depth_exists) if (lock_depth_exists)
lock_depth = parse_common_lock_depth(pevent, data); lock_depth = parse_common_lock_depth(tep, data);
else if (check_lock_depth) { else if (check_lock_depth) {
lock_depth = parse_common_lock_depth(pevent, data); lock_depth = parse_common_lock_depth(tep, data);
if (lock_depth < 0) if (lock_depth < 0)
check_lock_depth = 0; check_lock_depth = 0;
else else
...@@ -5211,9 +5210,9 @@ void tep_data_latency_format(struct tep_handle *pevent, ...@@ -5211,9 +5210,9 @@ void tep_data_latency_format(struct tep_handle *pevent,
/* migrate_disable may not always exist */ /* migrate_disable may not always exist */
if (migrate_disable_exists) if (migrate_disable_exists)
migrate_disable = parse_common_migrate_disable(pevent, data); migrate_disable = parse_common_migrate_disable(tep, data);
else if (check_migrate_disable) { else if (check_migrate_disable) {
migrate_disable = parse_common_migrate_disable(pevent, data); migrate_disable = parse_common_migrate_disable(tep, data);
if (migrate_disable < 0) if (migrate_disable < 0)
check_migrate_disable = 0; check_migrate_disable = 0;
else else
...@@ -5256,67 +5255,67 @@ void tep_data_latency_format(struct tep_handle *pevent, ...@@ -5256,67 +5255,67 @@ void tep_data_latency_format(struct tep_handle *pevent,
/** /**
* tep_data_type - parse out the given event type * tep_data_type - parse out the given event type
* @pevent: a handle to the pevent * @tep: a handle to the trace event parser context
* @rec: the record to read from * @rec: the record to read from
* *
* This returns the event id from the @rec. * This returns the event id from the @rec.
*/ */
int tep_data_type(struct tep_handle *pevent, struct tep_record *rec) int tep_data_type(struct tep_handle *tep, struct tep_record *rec)
{ {
return trace_parse_common_type(pevent, rec->data); return trace_parse_common_type(tep, rec->data);
} }
/** /**
* tep_data_pid - parse the PID from record * tep_data_pid - parse the PID from record
* @pevent: a handle to the pevent * @tep: a handle to the trace event parser context
* @rec: the record to parse * @rec: the record to parse
* *
* This returns the PID from a record. * This returns the PID from a record.
*/ */
int tep_data_pid(struct tep_handle *pevent, struct tep_record *rec) int tep_data_pid(struct tep_handle *tep, struct tep_record *rec)
{ {
return parse_common_pid(pevent, rec->data); return parse_common_pid(tep, rec->data);
} }
/** /**
* tep_data_preempt_count - parse the preempt count from the record * tep_data_preempt_count - parse the preempt count from the record
* @pevent: a handle to the pevent * @tep: a handle to the trace event parser context
* @rec: the record to parse * @rec: the record to parse
* *
* This returns the preempt count from a record. * This returns the preempt count from a record.
*/ */
int tep_data_preempt_count(struct tep_handle *pevent, struct tep_record *rec) int tep_data_preempt_count(struct tep_handle *tep, struct tep_record *rec)
{ {
return parse_common_pc(pevent, rec->data); return parse_common_pc(tep, rec->data);
} }
/** /**
* tep_data_flags - parse the latency flags from the record * tep_data_flags - parse the latency flags from the record
* @pevent: a handle to the pevent * @tep: a handle to the trace event parser context
* @rec: the record to parse * @rec: the record to parse
* *
* This returns the latency flags from a record. * This returns the latency flags from a record.
* *
* Use trace_flag_type enum for the flags (see event-parse.h). * Use trace_flag_type enum for the flags (see event-parse.h).
*/ */
int tep_data_flags(struct tep_handle *pevent, struct tep_record *rec) int tep_data_flags(struct tep_handle *tep, struct tep_record *rec)
{ {
return parse_common_flags(pevent, rec->data); return parse_common_flags(tep, rec->data);
} }
/** /**
* tep_data_comm_from_pid - return the command line from PID * tep_data_comm_from_pid - return the command line from PID
* @pevent: a handle to the pevent * @tep: a handle to the trace event parser context
* @pid: the PID of the task to search for * @pid: the PID of the task to search for
* *
* This returns a pointer to the command line that has the given * This returns a pointer to the command line that has the given
* @pid. * @pid.
*/ */
const char *tep_data_comm_from_pid(struct tep_handle *pevent, int pid) const char *tep_data_comm_from_pid(struct tep_handle *tep, int pid)
{ {
const char *comm; const char *comm;
comm = find_cmdline(pevent, pid); comm = find_cmdline(tep, pid);
return comm; return comm;
} }
...@@ -5338,7 +5337,7 @@ pid_from_cmdlist(struct tep_handle *pevent, const char *comm, struct tep_cmdline ...@@ -5338,7 +5337,7 @@ pid_from_cmdlist(struct tep_handle *pevent, const char *comm, struct tep_cmdline
/** /**
* tep_data_pid_from_comm - return the pid from a given comm * tep_data_pid_from_comm - return the pid from a given comm
* @pevent: a handle to the pevent * @tep: a handle to the trace event parser context
* @comm: the cmdline to find the pid from * @comm: the cmdline to find the pid from
* @next: the cmdline structure to find the next comm * @next: the cmdline structure to find the next comm
* *
...@@ -5349,7 +5348,7 @@ pid_from_cmdlist(struct tep_handle *pevent, const char *comm, struct tep_cmdline ...@@ -5349,7 +5348,7 @@ pid_from_cmdlist(struct tep_handle *pevent, const char *comm, struct tep_cmdline
* next pid. * next pid.
* Also, it does a linear search, so it may be slow. * Also, it does a linear search, so it may be slow.
*/ */
struct tep_cmdline *tep_data_pid_from_comm(struct tep_handle *pevent, const char *comm, struct tep_cmdline *tep_data_pid_from_comm(struct tep_handle *tep, const char *comm,
struct tep_cmdline *next) struct tep_cmdline *next)
{ {
struct tep_cmdline *cmdline; struct tep_cmdline *cmdline;
...@@ -5358,25 +5357,25 @@ struct tep_cmdline *tep_data_pid_from_comm(struct tep_handle *pevent, const char ...@@ -5358,25 +5357,25 @@ struct tep_cmdline *tep_data_pid_from_comm(struct tep_handle *pevent, const char
* If the cmdlines have not been converted yet, then use * If the cmdlines have not been converted yet, then use
* the list. * the list.
*/ */
if (!pevent->cmdlines) if (!tep->cmdlines)
return pid_from_cmdlist(pevent, comm, next); return pid_from_cmdlist(tep, comm, next);
if (next) { if (next) {
/* /*
* The next pointer could have been still from * The next pointer could have been still from
* a previous call before cmdlines were created * a previous call before cmdlines were created
*/ */
if (next < pevent->cmdlines || if (next < tep->cmdlines ||
next >= pevent->cmdlines + pevent->cmdline_count) next >= tep->cmdlines + tep->cmdline_count)
next = NULL; next = NULL;
else else
cmdline = next++; cmdline = next++;
} }
if (!next) if (!next)
cmdline = pevent->cmdlines; cmdline = tep->cmdlines;
while (cmdline < pevent->cmdlines + pevent->cmdline_count) { while (cmdline < tep->cmdlines + tep->cmdline_count) {
if (strcmp(cmdline->comm, comm) == 0) if (strcmp(cmdline->comm, comm) == 0)
return cmdline; return cmdline;
cmdline++; cmdline++;
...@@ -5386,12 +5385,13 @@ struct tep_cmdline *tep_data_pid_from_comm(struct tep_handle *pevent, const char ...@@ -5386,12 +5385,13 @@ struct tep_cmdline *tep_data_pid_from_comm(struct tep_handle *pevent, const char
/** /**
* tep_cmdline_pid - return the pid associated to a given cmdline * tep_cmdline_pid - return the pid associated to a given cmdline
* @tep: a handle to the trace event parser context
* @cmdline: The cmdline structure to get the pid from * @cmdline: The cmdline structure to get the pid from
* *
* Returns the pid for a give cmdline. If @cmdline is NULL, then * Returns the pid for a give cmdline. If @cmdline is NULL, then
* -1 is returned. * -1 is returned.
*/ */
int tep_cmdline_pid(struct tep_handle *pevent, struct tep_cmdline *cmdline) int tep_cmdline_pid(struct tep_handle *tep, struct tep_cmdline *cmdline)
{ {
struct cmdline_list *cmdlist = (struct cmdline_list *)cmdline; struct cmdline_list *cmdlist = (struct cmdline_list *)cmdline;
...@@ -5402,9 +5402,9 @@ int tep_cmdline_pid(struct tep_handle *pevent, struct tep_cmdline *cmdline) ...@@ -5402,9 +5402,9 @@ int tep_cmdline_pid(struct tep_handle *pevent, struct tep_cmdline *cmdline)
* If cmdlines have not been created yet, or cmdline is * If cmdlines have not been created yet, or cmdline is
* not part of the array, then treat it as a cmdlist instead. * not part of the array, then treat it as a cmdlist instead.
*/ */
if (!pevent->cmdlines || if (!tep->cmdlines ||
cmdline < pevent->cmdlines || cmdline < tep->cmdlines ||
cmdline >= pevent->cmdlines + pevent->cmdline_count) cmdline >= tep->cmdlines + tep->cmdline_count)
return cmdlist->pid; return cmdlist->pid;
return cmdline->pid; return cmdline->pid;
...@@ -5455,14 +5455,14 @@ static bool is_timestamp_in_us(char *trace_clock, bool use_trace_clock) ...@@ -5455,14 +5455,14 @@ static bool is_timestamp_in_us(char *trace_clock, bool use_trace_clock)
/** /**
* tep_find_event_by_record - return the event from a given record * tep_find_event_by_record - return the event from a given record
* @pevent: a handle to the pevent * @tep: a handle to the trace event parser context
* @record: The record to get the event from * @record: The record to get the event from
* *
* Returns the associated event for a given record, or NULL if non is * Returns the associated event for a given record, or NULL if non is
* is found. * is found.
*/ */
struct tep_event * struct tep_event *
tep_find_event_by_record(struct tep_handle *pevent, struct tep_record *record) tep_find_event_by_record(struct tep_handle *tep, struct tep_record *record)
{ {
int type; int type;
...@@ -5471,21 +5471,21 @@ tep_find_event_by_record(struct tep_handle *pevent, struct tep_record *record) ...@@ -5471,21 +5471,21 @@ tep_find_event_by_record(struct tep_handle *pevent, struct tep_record *record)
return NULL; return NULL;
} }
type = trace_parse_common_type(pevent, record->data); type = trace_parse_common_type(tep, record->data);
return tep_find_event(pevent, type); return tep_find_event(tep, type);
} }
/** /**
* tep_print_event_task - Write the event task comm, pid and CPU * tep_print_event_task - Write the event task comm, pid and CPU
* @pevent: a handle to the pevent * @tep: a handle to the trace event parser context
* @s: the trace_seq to write to * @s: the trace_seq to write to
* @event: the handle to the record's event * @event: the handle to the record's event
* @record: The record to get the event from * @record: The record to get the event from
* *
* Writes the tasks comm, pid and CPU to @s. * Writes the tasks comm, pid and CPU to @s.
*/ */
void tep_print_event_task(struct tep_handle *pevent, struct trace_seq *s, void tep_print_event_task(struct tep_handle *tep, struct trace_seq *s,
struct tep_event *event, struct tep_event *event,
struct tep_record *record) struct tep_record *record)
{ {
...@@ -5493,27 +5493,26 @@ void tep_print_event_task(struct tep_handle *pevent, struct trace_seq *s, ...@@ -5493,27 +5493,26 @@ void tep_print_event_task(struct tep_handle *pevent, struct trace_seq *s,
const char *comm; const char *comm;
int pid; int pid;
pid = parse_common_pid(pevent, data); pid = parse_common_pid(tep, data);
comm = find_cmdline(pevent, pid); comm = find_cmdline(tep, pid);
if (pevent->latency_format) { if (tep->latency_format)
trace_seq_printf(s, "%8.8s-%-5d %3d", trace_seq_printf(s, "%8.8s-%-5d %3d", comm, pid, record->cpu);
comm, pid, record->cpu); else
} else
trace_seq_printf(s, "%16s-%-5d [%03d]", comm, pid, record->cpu); trace_seq_printf(s, "%16s-%-5d [%03d]", comm, pid, record->cpu);
} }
/** /**
* tep_print_event_time - Write the event timestamp * tep_print_event_time - Write the event timestamp
* @pevent: a handle to the pevent * @tep: a handle to the trace event parser context
* @s: the trace_seq to write to * @s: the trace_seq to write to
* @event: the handle to the record's event * @event: the handle to the record's event
* @record: The record to get the event from * @record: The record to get the event from
* @use_trace_clock: Set to parse according to the @pevent->trace_clock * @use_trace_clock: Set to parse according to the @tep->trace_clock
* *
* Writes the timestamp of the record into @s. * Writes the timestamp of the record into @s.
*/ */
void tep_print_event_time(struct tep_handle *pevent, struct trace_seq *s, void tep_print_event_time(struct tep_handle *tep, struct trace_seq *s,
struct tep_event *event, struct tep_event *event,
struct tep_record *record, struct tep_record *record,
bool use_trace_clock) bool use_trace_clock)
...@@ -5524,19 +5523,18 @@ void tep_print_event_time(struct tep_handle *pevent, struct trace_seq *s, ...@@ -5524,19 +5523,18 @@ void tep_print_event_time(struct tep_handle *pevent, struct trace_seq *s,
int p; int p;
bool use_usec_format; bool use_usec_format;
use_usec_format = is_timestamp_in_us(pevent->trace_clock, use_usec_format = is_timestamp_in_us(tep->trace_clock, use_trace_clock);
use_trace_clock);
if (use_usec_format) { if (use_usec_format) {
secs = record->ts / NSEC_PER_SEC; secs = record->ts / NSEC_PER_SEC;
nsecs = record->ts - secs * NSEC_PER_SEC; nsecs = record->ts - secs * NSEC_PER_SEC;
} }
if (pevent->latency_format) { if (tep->latency_format) {
tep_data_latency_format(pevent, s, record); tep_data_latency_format(tep, s, record);
} }
if (use_usec_format) { if (use_usec_format) {
if (pevent->flags & TEP_NSEC_OUTPUT) { if (tep->flags & TEP_NSEC_OUTPUT) {
usecs = nsecs; usecs = nsecs;
p = 9; p = 9;
} else { } else {
...@@ -5556,14 +5554,14 @@ void tep_print_event_time(struct tep_handle *pevent, struct trace_seq *s, ...@@ -5556,14 +5554,14 @@ void tep_print_event_time(struct tep_handle *pevent, struct trace_seq *s,
/** /**
* tep_print_event_data - Write the event data section * tep_print_event_data - Write the event data section
* @pevent: a handle to the pevent * @tep: a handle to the trace event parser context
* @s: the trace_seq to write to * @s: the trace_seq to write to
* @event: the handle to the record's event * @event: the handle to the record's event
* @record: The record to get the event from * @record: The record to get the event from
* *
* Writes the parsing of the record's data to @s. * Writes the parsing of the record's data to @s.
*/ */
void tep_print_event_data(struct tep_handle *pevent, struct trace_seq *s, void tep_print_event_data(struct tep_handle *tep, struct trace_seq *s,
struct tep_event *event, struct tep_event *event,
struct tep_record *record) struct tep_record *record)
{ {
...@@ -5580,15 +5578,15 @@ void tep_print_event_data(struct tep_handle *pevent, struct trace_seq *s, ...@@ -5580,15 +5578,15 @@ void tep_print_event_data(struct tep_handle *pevent, struct trace_seq *s,
tep_event_info(s, event, record); tep_event_info(s, event, record);
} }
void tep_print_event(struct tep_handle *pevent, struct trace_seq *s, void tep_print_event(struct tep_handle *tep, struct trace_seq *s,
struct tep_record *record, bool use_trace_clock) struct tep_record *record, bool use_trace_clock)
{ {
struct tep_event *event; struct tep_event *event;
event = tep_find_event_by_record(pevent, record); event = tep_find_event_by_record(tep, record);
if (!event) { if (!event) {
int i; int i;
int type = trace_parse_common_type(pevent, record->data); int type = trace_parse_common_type(tep, record->data);
do_warning("ug! no event found for type %d", type); do_warning("ug! no event found for type %d", type);
trace_seq_printf(s, "[UNKNOWN TYPE %d]", type); trace_seq_printf(s, "[UNKNOWN TYPE %d]", type);
...@@ -5598,9 +5596,9 @@ void tep_print_event(struct tep_handle *pevent, struct trace_seq *s, ...@@ -5598,9 +5596,9 @@ void tep_print_event(struct tep_handle *pevent, struct trace_seq *s,
return; return;
} }
tep_print_event_task(pevent, s, event, record); tep_print_event_task(tep, s, event, record);
tep_print_event_time(pevent, s, event, record, use_trace_clock); tep_print_event_time(tep, s, event, record, use_trace_clock);
tep_print_event_data(pevent, s, event, record); tep_print_event_data(tep, s, event, record);
} }
static int events_id_cmp(const void *a, const void *b) static int events_id_cmp(const void *a, const void *b)
...@@ -6017,7 +6015,7 @@ static void parse_header_field(const char *field, ...@@ -6017,7 +6015,7 @@ static void parse_header_field(const char *field,
/** /**
* tep_parse_header_page - parse the data stored in the header page * tep_parse_header_page - parse the data stored in the header page
* @pevent: the handle to the pevent * @tep: a handle to the trace event parser context
* @buf: the buffer storing the header page format string * @buf: the buffer storing the header page format string
* @size: the size of @buf * @size: the size of @buf
* @long_size: the long size to use if there is no header * @long_size: the long size to use if there is no header
...@@ -6027,7 +6025,7 @@ static void parse_header_field(const char *field, ...@@ -6027,7 +6025,7 @@ static void parse_header_field(const char *field,
* *
* /sys/kernel/debug/tracing/events/header_page * /sys/kernel/debug/tracing/events/header_page
*/ */
int tep_parse_header_page(struct tep_handle *pevent, char *buf, unsigned long size, int tep_parse_header_page(struct tep_handle *tep, char *buf, unsigned long size,
int long_size) int long_size)
{ {
int ignore; int ignore;
...@@ -6037,22 +6035,22 @@ int tep_parse_header_page(struct tep_handle *pevent, char *buf, unsigned long si ...@@ -6037,22 +6035,22 @@ int tep_parse_header_page(struct tep_handle *pevent, char *buf, unsigned long si
* Old kernels did not have header page info. * Old kernels did not have header page info.
* Sorry but we just use what we find here in user space. * Sorry but we just use what we find here in user space.
*/ */
pevent->header_page_ts_size = sizeof(long long); tep->header_page_ts_size = sizeof(long long);
pevent->header_page_size_size = long_size; tep->header_page_size_size = long_size;
pevent->header_page_data_offset = sizeof(long long) + long_size; tep->header_page_data_offset = sizeof(long long) + long_size;
pevent->old_format = 1; tep->old_format = 1;
return -1; return -1;
} }
init_input_buf(buf, size); init_input_buf(buf, size);
parse_header_field("timestamp", &pevent->header_page_ts_offset, parse_header_field("timestamp", &tep->header_page_ts_offset,
&pevent->header_page_ts_size, 1); &tep->header_page_ts_size, 1);
parse_header_field("commit", &pevent->header_page_size_offset, parse_header_field("commit", &tep->header_page_size_offset,
&pevent->header_page_size_size, 1); &tep->header_page_size_size, 1);
parse_header_field("overwrite", &pevent->header_page_overwrite, parse_header_field("overwrite", &tep->header_page_overwrite,
&ignore, 0); &ignore, 0);
parse_header_field("data", &pevent->header_page_data_offset, parse_header_field("data", &tep->header_page_data_offset,
&pevent->header_page_data_size, 1); &tep->header_page_data_size, 1);
return 0; return 0;
} }
...@@ -6258,7 +6256,7 @@ __parse_event(struct tep_handle *pevent, ...@@ -6258,7 +6256,7 @@ __parse_event(struct tep_handle *pevent,
/** /**
* tep_parse_format - parse the event format * tep_parse_format - parse the event format
* @pevent: the handle to the pevent * @tep: a handle to the trace event parser context
* @eventp: returned format * @eventp: returned format
* @buf: the buffer storing the event format string * @buf: the buffer storing the event format string
* @size: the size of @buf * @size: the size of @buf
...@@ -6271,17 +6269,17 @@ __parse_event(struct tep_handle *pevent, ...@@ -6271,17 +6269,17 @@ __parse_event(struct tep_handle *pevent,
* *
* /sys/kernel/debug/tracing/events/.../.../format * /sys/kernel/debug/tracing/events/.../.../format
*/ */
enum tep_errno tep_parse_format(struct tep_handle *pevent, enum tep_errno tep_parse_format(struct tep_handle *tep,
struct tep_event **eventp, struct tep_event **eventp,
const char *buf, const char *buf,
unsigned long size, const char *sys) unsigned long size, const char *sys)
{ {
return __parse_event(pevent, eventp, buf, size, sys); return __parse_event(tep, eventp, buf, size, sys);
} }
/** /**
* tep_parse_event - parse the event format * tep_parse_event - parse the event format
* @pevent: the handle to the pevent * @tep: a handle to the trace event parser context
* @buf: the buffer storing the event format string * @buf: the buffer storing the event format string
* @size: the size of @buf * @size: the size of @buf
* @sys: the system the event belongs to * @sys: the system the event belongs to
...@@ -6293,11 +6291,11 @@ enum tep_errno tep_parse_format(struct tep_handle *pevent, ...@@ -6293,11 +6291,11 @@ enum tep_errno tep_parse_format(struct tep_handle *pevent,
* *
* /sys/kernel/debug/tracing/events/.../.../format * /sys/kernel/debug/tracing/events/.../.../format
*/ */
enum tep_errno tep_parse_event(struct tep_handle *pevent, const char *buf, enum tep_errno tep_parse_event(struct tep_handle *tep, const char *buf,
unsigned long size, const char *sys) unsigned long size, const char *sys)
{ {
struct tep_event *event = NULL; struct tep_event *event = NULL;
return __parse_event(pevent, &event, buf, size, sys); return __parse_event(tep, &event, buf, size, sys);
} }
int get_field_val(struct trace_seq *s, struct tep_format_field *field, int get_field_val(struct trace_seq *s, struct tep_format_field *field,
...@@ -6537,7 +6535,7 @@ static void free_func_handle(struct tep_function_handler *func) ...@@ -6537,7 +6535,7 @@ static void free_func_handle(struct tep_function_handler *func)
/** /**
* tep_register_print_function - register a helper function * tep_register_print_function - register a helper function
* @pevent: the handle to the pevent * @tep: a handle to the trace event parser context
* @func: the function to process the helper function * @func: the function to process the helper function
* @ret_type: the return type of the helper function * @ret_type: the return type of the helper function
* @name: the name of the helper function * @name: the name of the helper function
...@@ -6550,7 +6548,7 @@ static void free_func_handle(struct tep_function_handler *func) ...@@ -6550,7 +6548,7 @@ static void free_func_handle(struct tep_function_handler *func)
* The @parameters is a variable list of tep_func_arg_type enums that * The @parameters is a variable list of tep_func_arg_type enums that
* must end with TEP_FUNC_ARG_VOID. * must end with TEP_FUNC_ARG_VOID.
*/ */
int tep_register_print_function(struct tep_handle *pevent, int tep_register_print_function(struct tep_handle *tep,
tep_func_handler func, tep_func_handler func,
enum tep_func_arg_type ret_type, enum tep_func_arg_type ret_type,
char *name, ...) char *name, ...)
...@@ -6562,7 +6560,7 @@ int tep_register_print_function(struct tep_handle *pevent, ...@@ -6562,7 +6560,7 @@ int tep_register_print_function(struct tep_handle *pevent,
va_list ap; va_list ap;
int ret; int ret;
func_handle = find_func_handler(pevent, name); func_handle = find_func_handler(tep, name);
if (func_handle) { if (func_handle) {
/* /*
* This is most like caused by the users own * This is most like caused by the users own
...@@ -6570,7 +6568,7 @@ int tep_register_print_function(struct tep_handle *pevent, ...@@ -6570,7 +6568,7 @@ int tep_register_print_function(struct tep_handle *pevent,
* system defaults. * system defaults.
*/ */
pr_stat("override of function helper '%s'", name); pr_stat("override of function helper '%s'", name);
remove_func_handler(pevent, name); remove_func_handler(tep, name);
} }
func_handle = calloc(1, sizeof(*func_handle)); func_handle = calloc(1, sizeof(*func_handle));
...@@ -6617,8 +6615,8 @@ int tep_register_print_function(struct tep_handle *pevent, ...@@ -6617,8 +6615,8 @@ int tep_register_print_function(struct tep_handle *pevent,
} }
va_end(ap); va_end(ap);
func_handle->next = pevent->func_handlers; func_handle->next = tep->func_handlers;
pevent->func_handlers = func_handle; tep->func_handlers = func_handle;
return 0; return 0;
out_free: out_free:
...@@ -6629,7 +6627,7 @@ int tep_register_print_function(struct tep_handle *pevent, ...@@ -6629,7 +6627,7 @@ int tep_register_print_function(struct tep_handle *pevent,
/** /**
* tep_unregister_print_function - unregister a helper function * tep_unregister_print_function - unregister a helper function
* @pevent: the handle to the pevent * @tep: a handle to the trace event parser context
* @func: the function to process the helper function * @func: the function to process the helper function
* @name: the name of the helper function * @name: the name of the helper function
* *
...@@ -6637,14 +6635,14 @@ int tep_register_print_function(struct tep_handle *pevent, ...@@ -6637,14 +6635,14 @@ int tep_register_print_function(struct tep_handle *pevent,
* *
* Returns 0 if the handler was removed successully, -1 otherwise. * Returns 0 if the handler was removed successully, -1 otherwise.
*/ */
int tep_unregister_print_function(struct tep_handle *pevent, int tep_unregister_print_function(struct tep_handle *tep,
tep_func_handler func, char *name) tep_func_handler func, char *name)
{ {
struct tep_function_handler *func_handle; struct tep_function_handler *func_handle;
func_handle = find_func_handler(pevent, name); func_handle = find_func_handler(tep, name);
if (func_handle && func_handle->func == func) { if (func_handle && func_handle->func == func) {
remove_func_handler(pevent, name); remove_func_handler(tep, name);
return 0; return 0;
} }
return -1; return -1;
...@@ -6675,7 +6673,7 @@ static struct tep_event *search_event(struct tep_handle *pevent, int id, ...@@ -6675,7 +6673,7 @@ static struct tep_event *search_event(struct tep_handle *pevent, int id,
/** /**
* tep_register_event_handler - register a way to parse an event * tep_register_event_handler - register a way to parse an event
* @pevent: the handle to the pevent * @tep: a handle to the trace event parser context
* @id: the id of the event to register * @id: the id of the event to register
* @sys_name: the system name the event belongs to * @sys_name: the system name the event belongs to
* @event_name: the name of the event * @event_name: the name of the event
...@@ -6696,14 +6694,14 @@ static struct tep_event *search_event(struct tep_handle *pevent, int id, ...@@ -6696,14 +6694,14 @@ static struct tep_event *search_event(struct tep_handle *pevent, int id,
* negative TEP_ERRNO_... in case of an error * negative TEP_ERRNO_... in case of an error
* *
*/ */
int tep_register_event_handler(struct tep_handle *pevent, int id, int tep_register_event_handler(struct tep_handle *tep, int id,
const char *sys_name, const char *event_name, const char *sys_name, const char *event_name,
tep_event_handler_func func, void *context) tep_event_handler_func func, void *context)
{ {
struct tep_event *event; struct tep_event *event;
struct event_handler *handle; struct event_handler *handle;
event = search_event(pevent, id, sys_name, event_name); event = search_event(tep, id, sys_name, event_name);
if (event == NULL) if (event == NULL)
goto not_found; goto not_found;
...@@ -6738,8 +6736,8 @@ int tep_register_event_handler(struct tep_handle *pevent, int id, ...@@ -6738,8 +6736,8 @@ int tep_register_event_handler(struct tep_handle *pevent, int id,
} }
handle->func = func; handle->func = func;
handle->next = pevent->handlers; handle->next = tep->handlers;
pevent->handlers = handle; tep->handlers = handle;
handle->context = context; handle->context = context;
return TEP_REGISTER_SUCCESS; return TEP_REGISTER_SUCCESS;
...@@ -6766,7 +6764,7 @@ static int handle_matches(struct event_handler *handler, int id, ...@@ -6766,7 +6764,7 @@ static int handle_matches(struct event_handler *handler, int id,
/** /**
* tep_unregister_event_handler - unregister an existing event handler * tep_unregister_event_handler - unregister an existing event handler
* @pevent: the handle to the pevent * @tep: a handle to the trace event parser context
* @id: the id of the event to unregister * @id: the id of the event to unregister
* @sys_name: the system name the handler belongs to * @sys_name: the system name the handler belongs to
* @event_name: the name of the event handler * @event_name: the name of the event handler
...@@ -6780,7 +6778,7 @@ static int handle_matches(struct event_handler *handler, int id, ...@@ -6780,7 +6778,7 @@ static int handle_matches(struct event_handler *handler, int id,
* *
* Returns 0 if handler was removed successfully, -1 if event was not found. * Returns 0 if handler was removed successfully, -1 if event was not found.
*/ */
int tep_unregister_event_handler(struct tep_handle *pevent, int id, int tep_unregister_event_handler(struct tep_handle *tep, int id,
const char *sys_name, const char *event_name, const char *sys_name, const char *event_name,
tep_event_handler_func func, void *context) tep_event_handler_func func, void *context)
{ {
...@@ -6788,7 +6786,7 @@ int tep_unregister_event_handler(struct tep_handle *pevent, int id, ...@@ -6788,7 +6786,7 @@ int tep_unregister_event_handler(struct tep_handle *pevent, int id,
struct event_handler *handle; struct event_handler *handle;
struct event_handler **next; struct event_handler **next;
event = search_event(pevent, id, sys_name, event_name); event = search_event(tep, id, sys_name, event_name);
if (event == NULL) if (event == NULL)
goto not_found; goto not_found;
...@@ -6802,7 +6800,7 @@ int tep_unregister_event_handler(struct tep_handle *pevent, int id, ...@@ -6802,7 +6800,7 @@ int tep_unregister_event_handler(struct tep_handle *pevent, int id,
} }
not_found: not_found:
for (next = &pevent->handlers; *next; next = &(*next)->next) { for (next = &tep->handlers; *next; next = &(*next)->next) {
handle = *next; handle = *next;
if (handle_matches(handle, id, sys_name, event_name, if (handle_matches(handle, id, sys_name, event_name,
func, context)) func, context))
...@@ -6819,7 +6817,7 @@ int tep_unregister_event_handler(struct tep_handle *pevent, int id, ...@@ -6819,7 +6817,7 @@ int tep_unregister_event_handler(struct tep_handle *pevent, int id,
} }
/** /**
* tep_alloc - create a pevent handle * tep_alloc - create a tep handle
*/ */
struct tep_handle *tep_alloc(void) struct tep_handle *tep_alloc(void)
{ {
...@@ -6833,9 +6831,9 @@ struct tep_handle *tep_alloc(void) ...@@ -6833,9 +6831,9 @@ struct tep_handle *tep_alloc(void)
return pevent; return pevent;
} }
void tep_ref(struct tep_handle *pevent) void tep_ref(struct tep_handle *tep)
{ {
pevent->ref_count++; tep->ref_count++;
} }
int tep_get_ref(struct tep_handle *tep) int tep_get_ref(struct tep_handle *tep)
...@@ -6885,10 +6883,10 @@ void tep_free_event(struct tep_event *event) ...@@ -6885,10 +6883,10 @@ void tep_free_event(struct tep_event *event)
} }
/** /**
* tep_free - free a pevent handle * tep_free - free a tep handle
* @pevent: the pevent handle to free * @tep: the tep handle to free
*/ */
void tep_free(struct tep_handle *pevent) void tep_free(struct tep_handle *tep)
{ {
struct cmdline_list *cmdlist, *cmdnext; struct cmdline_list *cmdlist, *cmdnext;
struct func_list *funclist, *funcnext; struct func_list *funclist, *funcnext;
...@@ -6897,21 +6895,21 @@ void tep_free(struct tep_handle *pevent) ...@@ -6897,21 +6895,21 @@ void tep_free(struct tep_handle *pevent)
struct event_handler *handle; struct event_handler *handle;
int i; int i;
if (!pevent) if (!tep)
return; return;
cmdlist = pevent->cmdlist; cmdlist = tep->cmdlist;
funclist = pevent->funclist; funclist = tep->funclist;
printklist = pevent->printklist; printklist = tep->printklist;
pevent->ref_count--; tep->ref_count--;
if (pevent->ref_count) if (tep->ref_count)
return; return;
if (pevent->cmdlines) { if (tep->cmdlines) {
for (i = 0; i < pevent->cmdline_count; i++) for (i = 0; i < tep->cmdline_count; i++)
free(pevent->cmdlines[i].comm); free(tep->cmdlines[i].comm);
free(pevent->cmdlines); free(tep->cmdlines);
} }
while (cmdlist) { while (cmdlist) {
...@@ -6921,12 +6919,12 @@ void tep_free(struct tep_handle *pevent) ...@@ -6921,12 +6919,12 @@ void tep_free(struct tep_handle *pevent)
cmdlist = cmdnext; cmdlist = cmdnext;
} }
if (pevent->func_map) { if (tep->func_map) {
for (i = 0; i < (int)pevent->func_count; i++) { for (i = 0; i < (int)tep->func_count; i++) {
free(pevent->func_map[i].func); free(tep->func_map[i].func);
free(pevent->func_map[i].mod); free(tep->func_map[i].mod);
} }
free(pevent->func_map); free(tep->func_map);
} }
while (funclist) { while (funclist) {
...@@ -6937,16 +6935,16 @@ void tep_free(struct tep_handle *pevent) ...@@ -6937,16 +6935,16 @@ void tep_free(struct tep_handle *pevent)
funclist = funcnext; funclist = funcnext;
} }
while (pevent->func_handlers) { while (tep->func_handlers) {
func_handler = pevent->func_handlers; func_handler = tep->func_handlers;
pevent->func_handlers = func_handler->next; tep->func_handlers = func_handler->next;
free_func_handle(func_handler); free_func_handle(func_handler);
} }
if (pevent->printk_map) { if (tep->printk_map) {
for (i = 0; i < (int)pevent->printk_count; i++) for (i = 0; i < (int)tep->printk_count; i++)
free(pevent->printk_map[i].printk); free(tep->printk_map[i].printk);
free(pevent->printk_map); free(tep->printk_map);
} }
while (printklist) { while (printklist) {
...@@ -6956,24 +6954,24 @@ void tep_free(struct tep_handle *pevent) ...@@ -6956,24 +6954,24 @@ void tep_free(struct tep_handle *pevent)
printklist = printknext; printklist = printknext;
} }
for (i = 0; i < pevent->nr_events; i++) for (i = 0; i < tep->nr_events; i++)
tep_free_event(pevent->events[i]); tep_free_event(tep->events[i]);
while (pevent->handlers) { while (tep->handlers) {
handle = pevent->handlers; handle = tep->handlers;
pevent->handlers = handle->next; tep->handlers = handle->next;
free_handler(handle); free_handler(handle);
} }
free(pevent->trace_clock); free(tep->trace_clock);
free(pevent->events); free(tep->events);
free(pevent->sort_events); free(tep->sort_events);
free(pevent->func_resolver); free(tep->func_resolver);
free(pevent); free(tep);
} }
void tep_unref(struct tep_handle *pevent) void tep_unref(struct tep_handle *tep)
{ {
tep_free(pevent); tep_free(tep);
} }
tools/lib/traceevent/event-parse.h
View file @ 047ff221
...@@ -64,8 +64,8 @@ typedef int (*tep_event_handler_func)(struct trace_seq *s, ...@@ -64,8 +64,8 @@ typedef int (*tep_event_handler_func)(struct trace_seq *s,
struct tep_event *event, struct tep_event *event,
void *context); void *context);
typedef int (*tep_plugin_load_func)(struct tep_handle *pevent); typedef int (*tep_plugin_load_func)(struct tep_handle *tep);
typedef int (*tep_plugin_unload_func)(struct tep_handle *pevent); typedef int (*tep_plugin_unload_func)(struct tep_handle *tep);
struct tep_plugin_option { struct tep_plugin_option {
struct tep_plugin_option *next; struct tep_plugin_option *next;
...@@ -85,12 +85,12 @@ struct tep_plugin_option { ...@@ -85,12 +85,12 @@ struct tep_plugin_option {
* TEP_PLUGIN_LOADER: (required) * TEP_PLUGIN_LOADER: (required)
* The function name to initialized the plugin. * The function name to initialized the plugin.
* *
* int TEP_PLUGIN_LOADER(struct tep_handle *pevent) * int TEP_PLUGIN_LOADER(struct tep_handle *tep)
* *
* TEP_PLUGIN_UNLOADER: (optional) * TEP_PLUGIN_UNLOADER: (optional)
* The function called just before unloading * The function called just before unloading
* *
* int TEP_PLUGIN_UNLOADER(struct tep_handle *pevent) * int TEP_PLUGIN_UNLOADER(struct tep_handle *tep)
* *
* TEP_PLUGIN_OPTIONS: (optional) * TEP_PLUGIN_OPTIONS: (optional)
* Plugin options that can be set before loading * Plugin options that can be set before loading
...@@ -393,9 +393,9 @@ struct tep_plugin_list; ...@@ -393,9 +393,9 @@ struct tep_plugin_list;
#define INVALID_PLUGIN_LIST_OPTION ((char **)((unsigned long)-1)) #define INVALID_PLUGIN_LIST_OPTION ((char **)((unsigned long)-1))
struct tep_plugin_list *tep_load_plugins(struct tep_handle *pevent); struct tep_plugin_list *tep_load_plugins(struct tep_handle *tep);
void tep_unload_plugins(struct tep_plugin_list *plugin_list, void tep_unload_plugins(struct tep_plugin_list *plugin_list,
struct tep_handle *pevent); struct tep_handle *tep);
char **tep_plugin_list_options(void); char **tep_plugin_list_options(void);
void tep_plugin_free_options_list(char **list); void tep_plugin_free_options_list(char **list);
int tep_plugin_add_options(const char *name, int tep_plugin_add_options(const char *name,
...@@ -410,7 +410,7 @@ typedef char *(tep_func_resolver_t)(void *priv, ...@@ -410,7 +410,7 @@ typedef char *(tep_func_resolver_t)(void *priv,
unsigned long long *addrp, char **modp); unsigned long long *addrp, char **modp);
void tep_set_flag(struct tep_handle *tep, int flag); void tep_set_flag(struct tep_handle *tep, int flag);
void tep_clear_flag(struct tep_handle *tep, enum tep_flag flag); void tep_clear_flag(struct tep_handle *tep, enum tep_flag flag);
bool tep_check_flags(struct tep_handle *tep, enum tep_flag flags); bool tep_test_flag(struct tep_handle *tep, enum tep_flag flags);
static inline int tep_is_bigendian(void) static inline int tep_is_bigendian(void)
{ {
...@@ -430,37 +430,37 @@ enum trace_flag_type { ...@@ -430,37 +430,37 @@ enum trace_flag_type {
TRACE_FLAG_SOFTIRQ = 0x10, TRACE_FLAG_SOFTIRQ = 0x10,
}; };
int tep_set_function_resolver(struct tep_handle *pevent, int tep_set_function_resolver(struct tep_handle *tep,
tep_func_resolver_t *func, void *priv); tep_func_resolver_t *func, void *priv);
void tep_reset_function_resolver(struct tep_handle *pevent); void tep_reset_function_resolver(struct tep_handle *tep);
int tep_register_comm(struct tep_handle *pevent, const char *comm, int pid); int tep_register_comm(struct tep_handle *tep, const char *comm, int pid);
int tep_override_comm(struct tep_handle *pevent, const char *comm, int pid); int tep_override_comm(struct tep_handle *tep, const char *comm, int pid);
int tep_register_trace_clock(struct tep_handle *pevent, const char *trace_clock); int tep_register_trace_clock(struct tep_handle *tep, const char *trace_clock);
int tep_register_function(struct tep_handle *pevent, char *name, int tep_register_function(struct tep_handle *tep, char *name,
unsigned long long addr, char *mod); unsigned long long addr, char *mod);
int tep_register_print_string(struct tep_handle *pevent, const char *fmt, int tep_register_print_string(struct tep_handle *tep, const char *fmt,
unsigned long long addr); unsigned long long addr);
bool tep_is_pid_registered(struct tep_handle *pevent, int pid); bool tep_is_pid_registered(struct tep_handle *tep, int pid);
void tep_print_event_task(struct tep_handle *pevent, struct trace_seq *s, void tep_print_event_task(struct tep_handle *tep, struct trace_seq *s,
struct tep_event *event, struct tep_event *event,
struct tep_record *record); struct tep_record *record);
void tep_print_event_time(struct tep_handle *pevent, struct trace_seq *s, void tep_print_event_time(struct tep_handle *tep, struct trace_seq *s,
struct tep_event *event, struct tep_event *event,
struct tep_record *record, struct tep_record *record,
bool use_trace_clock); bool use_trace_clock);
void tep_print_event_data(struct tep_handle *pevent, struct trace_seq *s, void tep_print_event_data(struct tep_handle *tep, struct trace_seq *s,
struct tep_event *event, struct tep_event *event,
struct tep_record *record); struct tep_record *record);
void tep_print_event(struct tep_handle *pevent, struct trace_seq *s, void tep_print_event(struct tep_handle *tep, struct trace_seq *s,
struct tep_record *record, bool use_trace_clock); struct tep_record *record, bool use_trace_clock);
int tep_parse_header_page(struct tep_handle *pevent, char *buf, unsigned long size, int tep_parse_header_page(struct tep_handle *tep, char *buf, unsigned long size,
int long_size); int long_size);
enum tep_errno tep_parse_event(struct tep_handle *pevent, const char *buf, enum tep_errno tep_parse_event(struct tep_handle *tep, const char *buf,
unsigned long size, const char *sys); unsigned long size, const char *sys);
enum tep_errno tep_parse_format(struct tep_handle *pevent, enum tep_errno tep_parse_format(struct tep_handle *tep,
struct tep_event **eventp, struct tep_event **eventp,
const char *buf, const char *buf,
unsigned long size, const char *sys); unsigned long size, const char *sys);
...@@ -492,50 +492,50 @@ enum tep_reg_handler { ...@@ -492,50 +492,50 @@ enum tep_reg_handler {
TEP_REGISTER_SUCCESS_OVERWRITE, TEP_REGISTER_SUCCESS_OVERWRITE,
}; };
int tep_register_event_handler(struct tep_handle *pevent, int id, int tep_register_event_handler(struct tep_handle *tep, int id,
const char *sys_name, const char *event_name, const char *sys_name, const char *event_name,
tep_event_handler_func func, void *context); tep_event_handler_func func, void *context);
int tep_unregister_event_handler(struct tep_handle *pevent, int id, int tep_unregister_event_handler(struct tep_handle *tep, int id,
const char *sys_name, const char *event_name, const char *sys_name, const char *event_name,
tep_event_handler_func func, void *context); tep_event_handler_func func, void *context);
int tep_register_print_function(struct tep_handle *pevent, int tep_register_print_function(struct tep_handle *tep,
tep_func_handler func, tep_func_handler func,
enum tep_func_arg_type ret_type, enum tep_func_arg_type ret_type,
char *name, ...); char *name, ...);
int tep_unregister_print_function(struct tep_handle *pevent, int tep_unregister_print_function(struct tep_handle *tep,
tep_func_handler func, char *name); tep_func_handler func, char *name);
struct tep_format_field *tep_find_common_field(struct tep_event *event, const char *name); struct tep_format_field *tep_find_common_field(struct tep_event *event, const char *name);
struct tep_format_field *tep_find_field(struct tep_event *event, const char *name); struct tep_format_field *tep_find_field(struct tep_event *event, const char *name);
struct tep_format_field *tep_find_any_field(struct tep_event *event, const char *name); struct tep_format_field *tep_find_any_field(struct tep_event *event, const char *name);
const char *tep_find_function(struct tep_handle *pevent, unsigned long long addr); const char *tep_find_function(struct tep_handle *tep, unsigned long long addr);
unsigned long long unsigned long long
tep_find_function_address(struct tep_handle *pevent, unsigned long long addr); tep_find_function_address(struct tep_handle *tep, unsigned long long addr);
unsigned long long tep_read_number(struct tep_handle *pevent, const void *ptr, int size); unsigned long long tep_read_number(struct tep_handle *tep, const void *ptr, int size);
int tep_read_number_field(struct tep_format_field *field, const void *data, int tep_read_number_field(struct tep_format_field *field, const void *data,
unsigned long long *value); unsigned long long *value);
struct tep_event *tep_get_first_event(struct tep_handle *tep); struct tep_event *tep_get_first_event(struct tep_handle *tep);
int tep_get_events_count(struct tep_handle *tep); int tep_get_events_count(struct tep_handle *tep);
struct tep_event *tep_find_event(struct tep_handle *pevent, int id); struct tep_event *tep_find_event(struct tep_handle *tep, int id);
struct tep_event * struct tep_event *
tep_find_event_by_name(struct tep_handle *pevent, const char *sys, const char *name); tep_find_event_by_name(struct tep_handle *tep, const char *sys, const char *name);
struct tep_event * struct tep_event *
tep_find_event_by_record(struct tep_handle *pevent, struct tep_record *record); tep_find_event_by_record(struct tep_handle *tep, struct tep_record *record);
void tep_data_latency_format(struct tep_handle *pevent, void tep_data_latency_format(struct tep_handle *tep,
struct trace_seq *s, struct tep_record *record); struct trace_seq *s, struct tep_record *record);
int tep_data_type(struct tep_handle *pevent, struct tep_record *rec); int tep_data_type(struct tep_handle *tep, struct tep_record *rec);
int tep_data_pid(struct tep_handle *pevent, struct tep_record *rec); int tep_data_pid(struct tep_handle *tep, struct tep_record *rec);
int tep_data_preempt_count(struct tep_handle *pevent, struct tep_record *rec); int tep_data_preempt_count(struct tep_handle *tep, struct tep_record *rec);
int tep_data_flags(struct tep_handle *pevent, struct tep_record *rec); int tep_data_flags(struct tep_handle *tep, struct tep_record *rec);
const char *tep_data_comm_from_pid(struct tep_handle *pevent, int pid); const char *tep_data_comm_from_pid(struct tep_handle *tep, int pid);
struct tep_cmdline; struct tep_cmdline;
struct tep_cmdline *tep_data_pid_from_comm(struct tep_handle *pevent, const char *comm, struct tep_cmdline *tep_data_pid_from_comm(struct tep_handle *tep, const char *comm,
struct tep_cmdline *next); struct tep_cmdline *next);
int tep_cmdline_pid(struct tep_handle *pevent, struct tep_cmdline *cmdline); int tep_cmdline_pid(struct tep_handle *tep, struct tep_cmdline *cmdline);
void tep_print_field(struct trace_seq *s, void *data, void tep_print_field(struct trace_seq *s, void *data,
struct tep_format_field *field); struct tep_format_field *field);
...@@ -543,11 +543,10 @@ void tep_print_fields(struct trace_seq *s, void *data, ...@@ -543,11 +543,10 @@ void tep_print_fields(struct trace_seq *s, void *data,
int size __maybe_unused, struct tep_event *event); int size __maybe_unused, struct tep_event *event);
void tep_event_info(struct trace_seq *s, struct tep_event *event, void tep_event_info(struct trace_seq *s, struct tep_event *event,
struct tep_record *record); struct tep_record *record);
int tep_strerror(struct tep_handle *pevent, enum tep_errno errnum, int tep_strerror(struct tep_handle *tep, enum tep_errno errnum,
char *buf, size_t buflen); char *buf, size_t buflen);
struct tep_event **tep_list_events(struct tep_handle *tep, struct tep_event **tep_list_events(struct tep_handle *tep, enum tep_event_sort_type);
enum tep_event_sort_type);
struct tep_event **tep_list_events_copy(struct tep_handle *tep, struct tep_event **tep_list_events_copy(struct tep_handle *tep,
enum tep_event_sort_type); enum tep_event_sort_type);
struct tep_format_field **tep_event_common_fields(struct tep_event *event); struct tep_format_field **tep_event_common_fields(struct tep_event *event);
...@@ -557,28 +556,28 @@ enum tep_endian { ...@@ -557,28 +556,28 @@ enum tep_endian {
TEP_LITTLE_ENDIAN = 0, TEP_LITTLE_ENDIAN = 0,
TEP_BIG_ENDIAN TEP_BIG_ENDIAN
}; };
int tep_get_cpus(struct tep_handle *pevent); int tep_get_cpus(struct tep_handle *tep);
void tep_set_cpus(struct tep_handle *pevent, int cpus); void tep_set_cpus(struct tep_handle *tep, int cpus);
int tep_get_long_size(struct tep_handle *pevent); int tep_get_long_size(struct tep_handle *tep);
void tep_set_long_size(struct tep_handle *pevent, int long_size); void tep_set_long_size(struct tep_handle *tep, int long_size);
int tep_get_page_size(struct tep_handle *pevent); int tep_get_page_size(struct tep_handle *tep);
void tep_set_page_size(struct tep_handle *pevent, int _page_size); void tep_set_page_size(struct tep_handle *tep, int _page_size);
bool tep_is_file_bigendian(struct tep_handle *pevent); bool tep_is_file_bigendian(struct tep_handle *tep);
void tep_set_file_bigendian(struct tep_handle *pevent, enum tep_endian endian); void tep_set_file_bigendian(struct tep_handle *tep, enum tep_endian endian);
bool tep_is_local_bigendian(struct tep_handle *pevent); bool tep_is_local_bigendian(struct tep_handle *tep);
void tep_set_local_bigendian(struct tep_handle *pevent, enum tep_endian endian); void tep_set_local_bigendian(struct tep_handle *tep, enum tep_endian endian);
bool tep_is_latency_format(struct tep_handle *pevent); bool tep_is_latency_format(struct tep_handle *tep);
void tep_set_latency_format(struct tep_handle *pevent, int lat); void tep_set_latency_format(struct tep_handle *tep, int lat);
int tep_get_header_page_size(struct tep_handle *pevent); int tep_get_header_page_size(struct tep_handle *tep);
int tep_get_header_timestamp_size(struct tep_handle *tep); int tep_get_header_timestamp_size(struct tep_handle *tep);
bool tep_is_old_format(struct tep_handle *tep); bool tep_is_old_format(struct tep_handle *tep);
void tep_set_print_raw(struct tep_handle *tep, int print_raw); void tep_set_print_raw(struct tep_handle *tep, int print_raw);
void tep_set_test_filters(struct tep_handle *tep, int test_filters); void tep_set_test_filters(struct tep_handle *tep, int test_filters);
struct tep_handle *tep_alloc(void); struct tep_handle *tep_alloc(void);
void tep_free(struct tep_handle *pevent); void tep_free(struct tep_handle *tep);
void tep_ref(struct tep_handle *pevent); void tep_ref(struct tep_handle *tep);
void tep_unref(struct tep_handle *pevent); void tep_unref(struct tep_handle *tep);
int tep_get_ref(struct tep_handle *tep); int tep_get_ref(struct tep_handle *tep);
/* access to the internal parser */ /* access to the internal parser */
...@@ -590,8 +589,8 @@ const char *tep_get_input_buf(void); ...@@ -590,8 +589,8 @@ const char *tep_get_input_buf(void);
unsigned long long tep_get_input_buf_ptr(void); unsigned long long tep_get_input_buf_ptr(void);
/* for debugging */ /* for debugging */
void tep_print_funcs(struct tep_handle *pevent); void tep_print_funcs(struct tep_handle *tep);
void tep_print_printk(struct tep_handle *pevent); void tep_print_printk(struct tep_handle *tep);
/* ----------------------- filtering ----------------------- */ /* ----------------------- filtering ----------------------- */
...@@ -724,7 +723,7 @@ struct tep_event_filter { ...@@ -724,7 +723,7 @@ struct tep_event_filter {
char error_buffer[TEP_FILTER_ERROR_BUFSZ]; char error_buffer[TEP_FILTER_ERROR_BUFSZ];
}; };
struct tep_event_filter *tep_filter_alloc(struct tep_handle *pevent); struct tep_event_filter *tep_filter_alloc(struct tep_handle *tep);
/* for backward compatibility */ /* for backward compatibility */
#define FILTER_NONE TEP_ERRNO__NO_FILTER #define FILTER_NONE TEP_ERRNO__NO_FILTER
......
tools/lib/traceevent/event-plugin.c
View file @ 047ff221
...@@ -419,16 +419,16 @@ load_plugins(struct tep_handle *pevent, const char *suffix, ...@@ -419,16 +419,16 @@ load_plugins(struct tep_handle *pevent, const char *suffix,
} }
struct tep_plugin_list* struct tep_plugin_list*
tep_load_plugins(struct tep_handle *pevent) tep_load_plugins(struct tep_handle *tep)
{ {
struct tep_plugin_list *list = NULL; struct tep_plugin_list *list = NULL;
load_plugins(pevent, ".so", load_plugin, &list); load_plugins(tep, ".so", load_plugin, &list);
return list; return list;
} }
void void
tep_unload_plugins(struct tep_plugin_list *plugin_list, struct tep_handle *pevent) tep_unload_plugins(struct tep_plugin_list *plugin_list, struct tep_handle *tep)
{ {
tep_plugin_unload_func func; tep_plugin_unload_func func;
struct tep_plugin_list *list; struct tep_plugin_list *list;
...@@ -438,7 +438,7 @@ tep_unload_plugins(struct tep_plugin_list *plugin_list, struct tep_handle *peven ...@@ -438,7 +438,7 @@ tep_unload_plugins(struct tep_plugin_list *plugin_list, struct tep_handle *peven
plugin_list = list->next; plugin_list = list->next;
func = dlsym(list->handle, TEP_PLUGIN_UNLOADER_NAME); func = dlsym(list->handle, TEP_PLUGIN_UNLOADER_NAME);
if (func) if (func)
func(pevent); func(tep);
dlclose(list->handle); dlclose(list->handle);
free(list->name); free(list->name);
free(list); free(list);
......
tools/lib/traceevent/parse-filter.c
View file @ 047ff221
...@@ -164,9 +164,9 @@ add_filter_type(struct tep_event_filter *filter, int id) ...@@ -164,9 +164,9 @@ add_filter_type(struct tep_event_filter *filter, int id)
/** /**
* tep_filter_alloc - create a new event filter * tep_filter_alloc - create a new event filter
* @pevent: The pevent that this filter is associated with * @tep: The tep that this filter is associated with
*/ */
struct tep_event_filter *tep_filter_alloc(struct tep_handle *pevent) struct tep_event_filter *tep_filter_alloc(struct tep_handle *tep)
{ {
struct tep_event_filter *filter; struct tep_event_filter *filter;
...@@ -175,8 +175,8 @@ struct tep_event_filter *tep_filter_alloc(struct tep_handle *pevent) ...@@ -175,8 +175,8 @@ struct tep_event_filter *tep_filter_alloc(struct tep_handle *pevent)
return NULL; return NULL;
memset(filter, 0, sizeof(*filter)); memset(filter, 0, sizeof(*filter));
filter->pevent = pevent; filter->pevent = tep;
tep_ref(pevent); tep_ref(tep);
return filter; return filter;
} }
......
tools/lib/traceevent/plugin_cfg80211.c
View file @ 047ff221
...@@ -25,9 +25,9 @@ process___le16_to_cpup(struct trace_seq *s, unsigned long long *args) ...@@ -25,9 +25,9 @@ process___le16_to_cpup(struct trace_seq *s, unsigned long long *args)
return val ? (long long) le16toh(*val) : 0; return val ? (long long) le16toh(*val) : 0;
} }
int TEP_PLUGIN_LOADER(struct tep_handle *pevent) int TEP_PLUGIN_LOADER(struct tep_handle *tep)
{ {
tep_register_print_function(pevent, tep_register_print_function(tep,
process___le16_to_cpup, process___le16_to_cpup,
TEP_FUNC_ARG_INT, TEP_FUNC_ARG_INT,
"__le16_to_cpup", "__le16_to_cpup",
...@@ -36,8 +36,8 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent) ...@@ -36,8 +36,8 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)
return 0; return 0;
} }
void TEP_PLUGIN_UNLOADER(struct tep_handle *pevent) void TEP_PLUGIN_UNLOADER(struct tep_handle *tep)
{ {
tep_unregister_print_function(pevent, process___le16_to_cpup, tep_unregister_print_function(tep, process___le16_to_cpup,
"__le16_to_cpup"); "__le16_to_cpup");
} }
tools/lib/traceevent/plugin_function.c
View file @ 047ff221
...@@ -164,9 +164,9 @@ static int function_handler(struct trace_seq *s, struct tep_record *record, ...@@ -164,9 +164,9 @@ static int function_handler(struct trace_seq *s, struct tep_record *record,
return 0; return 0;
} }
int TEP_PLUGIN_LOADER(struct tep_handle *pevent) int TEP_PLUGIN_LOADER(struct tep_handle *tep)
{ {
tep_register_event_handler(pevent, -1, "ftrace", "function", tep_register_event_handler(tep, -1, "ftrace", "function",
function_handler, NULL); function_handler, NULL);
tep_plugin_add_options("ftrace", plugin_options); tep_plugin_add_options("ftrace", plugin_options);
...@@ -174,11 +174,11 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent) ...@@ -174,11 +174,11 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)
return 0; return 0;
} }
void TEP_PLUGIN_UNLOADER(struct tep_handle *pevent) void TEP_PLUGIN_UNLOADER(struct tep_handle *tep)
{ {
int i, x; int i, x;
tep_unregister_event_handler(pevent, -1, "ftrace", "function", tep_unregister_event_handler(tep, -1, "ftrace", "function",
function_handler, NULL); function_handler, NULL);
for (i = 0; i <= cpus; i++) { for (i = 0; i <= cpus; i++) {
......
tools/lib/traceevent/plugin_hrtimer.c
View file @ 047ff221
...@@ -67,23 +67,23 @@ static int timer_start_handler(struct trace_seq *s, ...@@ -67,23 +67,23 @@ static int timer_start_handler(struct trace_seq *s,
return 0; return 0;
} }
int TEP_PLUGIN_LOADER(struct tep_handle *pevent) int TEP_PLUGIN_LOADER(struct tep_handle *tep)
{ {
tep_register_event_handler(pevent, -1, tep_register_event_handler(tep, -1,
"timer", "hrtimer_expire_entry", "timer", "hrtimer_expire_entry",
timer_expire_handler, NULL); timer_expire_handler, NULL);
tep_register_event_handler(pevent, -1, "timer", "hrtimer_start", tep_register_event_handler(tep, -1, "timer", "hrtimer_start",
timer_start_handler, NULL); timer_start_handler, NULL);
return 0; return 0;
} }
void TEP_PLUGIN_UNLOADER(struct tep_handle *pevent) void TEP_PLUGIN_UNLOADER(struct tep_handle *tep)
{ {
tep_unregister_event_handler(pevent, -1, tep_unregister_event_handler(tep, -1,
"timer", "hrtimer_expire_entry", "timer", "hrtimer_expire_entry",
timer_expire_handler, NULL); timer_expire_handler, NULL);
tep_unregister_event_handler(pevent, -1, "timer", "hrtimer_start", tep_unregister_event_handler(tep, -1, "timer", "hrtimer_start",
timer_start_handler, NULL); timer_start_handler, NULL);
} }
tools/lib/traceevent/plugin_jbd2.c
View file @ 047ff221
...@@ -48,16 +48,16 @@ process_jiffies_to_msecs(struct trace_seq *s, unsigned long long *args) ...@@ -48,16 +48,16 @@ process_jiffies_to_msecs(struct trace_seq *s, unsigned long long *args)
return jiffies; return jiffies;
} }
int TEP_PLUGIN_LOADER(struct tep_handle *pevent) int TEP_PLUGIN_LOADER(struct tep_handle *tep)
{ {
tep_register_print_function(pevent, tep_register_print_function(tep,
process_jbd2_dev_to_name, process_jbd2_dev_to_name,
TEP_FUNC_ARG_STRING, TEP_FUNC_ARG_STRING,
"jbd2_dev_to_name", "jbd2_dev_to_name",
TEP_FUNC_ARG_INT, TEP_FUNC_ARG_INT,
TEP_FUNC_ARG_VOID); TEP_FUNC_ARG_VOID);
tep_register_print_function(pevent, tep_register_print_function(tep,
process_jiffies_to_msecs, process_jiffies_to_msecs,
TEP_FUNC_ARG_LONG, TEP_FUNC_ARG_LONG,
"jiffies_to_msecs", "jiffies_to_msecs",
...@@ -66,11 +66,11 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent) ...@@ -66,11 +66,11 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)
return 0; return 0;
} }
void TEP_PLUGIN_UNLOADER(struct tep_handle *pevent) void TEP_PLUGIN_UNLOADER(struct tep_handle *tep)
{ {
tep_unregister_print_function(pevent, process_jbd2_dev_to_name, tep_unregister_print_function(tep, process_jbd2_dev_to_name,
"jbd2_dev_to_name"); "jbd2_dev_to_name");
tep_unregister_print_function(pevent, process_jiffies_to_msecs, tep_unregister_print_function(tep, process_jiffies_to_msecs,
"jiffies_to_msecs"); "jiffies_to_msecs");
} }
tools/lib/traceevent/plugin_kmem.c
View file @ 047ff221
...@@ -49,47 +49,47 @@ static int call_site_handler(struct trace_seq *s, struct tep_record *record, ...@@ -49,47 +49,47 @@ static int call_site_handler(struct trace_seq *s, struct tep_record *record,
return 1; return 1;
} }
int TEP_PLUGIN_LOADER(struct tep_handle *pevent) int TEP_PLUGIN_LOADER(struct tep_handle *tep)
{ {
tep_register_event_handler(pevent, -1, "kmem", "kfree", tep_register_event_handler(tep, -1, "kmem", "kfree",
call_site_handler, NULL); call_site_handler, NULL);
tep_register_event_handler(pevent, -1, "kmem", "kmalloc", tep_register_event_handler(tep, -1, "kmem", "kmalloc",
call_site_handler, NULL); call_site_handler, NULL);
tep_register_event_handler(pevent, -1, "kmem", "kmalloc_node", tep_register_event_handler(tep, -1, "kmem", "kmalloc_node",
call_site_handler, NULL); call_site_handler, NULL);
tep_register_event_handler(pevent, -1, "kmem", "kmem_cache_alloc", tep_register_event_handler(tep, -1, "kmem", "kmem_cache_alloc",
call_site_handler, NULL); call_site_handler, NULL);
tep_register_event_handler(pevent, -1, "kmem", tep_register_event_handler(tep, -1, "kmem",
"kmem_cache_alloc_node", "kmem_cache_alloc_node",
call_site_handler, NULL); call_site_handler, NULL);
tep_register_event_handler(pevent, -1, "kmem", "kmem_cache_free", tep_register_event_handler(tep, -1, "kmem", "kmem_cache_free",
call_site_handler, NULL); call_site_handler, NULL);
return 0; return 0;
} }
void TEP_PLUGIN_UNLOADER(struct tep_handle *pevent) void TEP_PLUGIN_UNLOADER(struct tep_handle *tep)
{ {
tep_unregister_event_handler(pevent, -1, "kmem", "kfree", tep_unregister_event_handler(tep, -1, "kmem", "kfree",
call_site_handler, NULL); call_site_handler, NULL);
tep_unregister_event_handler(pevent, -1, "kmem", "kmalloc", tep_unregister_event_handler(tep, -1, "kmem", "kmalloc",
call_site_handler, NULL); call_site_handler, NULL);
tep_unregister_event_handler(pevent, -1, "kmem", "kmalloc_node", tep_unregister_event_handler(tep, -1, "kmem", "kmalloc_node",
call_site_handler, NULL); call_site_handler, NULL);
tep_unregister_event_handler(pevent, -1, "kmem", "kmem_cache_alloc", tep_unregister_event_handler(tep, -1, "kmem", "kmem_cache_alloc",
call_site_handler, NULL); call_site_handler, NULL);
tep_unregister_event_handler(pevent, -1, "kmem", tep_unregister_event_handler(tep, -1, "kmem",
"kmem_cache_alloc_node", "kmem_cache_alloc_node",
call_site_handler, NULL); call_site_handler, NULL);
tep_unregister_event_handler(pevent, -1, "kmem", "kmem_cache_free", tep_unregister_event_handler(tep, -1, "kmem", "kmem_cache_free",
call_site_handler, NULL); call_site_handler, NULL);
} }
tools/lib/traceevent/plugin_kvm.c
View file @ 047ff221
...@@ -445,40 +445,40 @@ process_is_writable_pte(struct trace_seq *s, unsigned long long *args) ...@@ -445,40 +445,40 @@ process_is_writable_pte(struct trace_seq *s, unsigned long long *args)
return pte & PT_WRITABLE_MASK; return pte & PT_WRITABLE_MASK;
} }
int TEP_PLUGIN_LOADER(struct tep_handle *pevent) int TEP_PLUGIN_LOADER(struct tep_handle *tep)
{ {
init_disassembler(); init_disassembler();
tep_register_event_handler(pevent, -1, "kvm", "kvm_exit", tep_register_event_handler(tep, -1, "kvm", "kvm_exit",
kvm_exit_handler, NULL); kvm_exit_handler, NULL);
tep_register_event_handler(pevent, -1, "kvm", "kvm_emulate_insn", tep_register_event_handler(tep, -1, "kvm", "kvm_emulate_insn",
kvm_emulate_insn_handler, NULL); kvm_emulate_insn_handler, NULL);
tep_register_event_handler(pevent, -1, "kvm", "kvm_nested_vmexit", tep_register_event_handler(tep, -1, "kvm", "kvm_nested_vmexit",
kvm_nested_vmexit_handler, NULL); kvm_nested_vmexit_handler, NULL);
tep_register_event_handler(pevent, -1, "kvm", "kvm_nested_vmexit_inject", tep_register_event_handler(tep, -1, "kvm", "kvm_nested_vmexit_inject",
kvm_nested_vmexit_inject_handler, NULL); kvm_nested_vmexit_inject_handler, NULL);
tep_register_event_handler(pevent, -1, "kvmmmu", "kvm_mmu_get_page", tep_register_event_handler(tep, -1, "kvmmmu", "kvm_mmu_get_page",
kvm_mmu_get_page_handler, NULL); kvm_mmu_get_page_handler, NULL);
tep_register_event_handler(pevent, -1, "kvmmmu", "kvm_mmu_sync_page", tep_register_event_handler(tep, -1, "kvmmmu", "kvm_mmu_sync_page",
kvm_mmu_print_role, NULL); kvm_mmu_print_role, NULL);
tep_register_event_handler(pevent, -1, tep_register_event_handler(tep, -1,
"kvmmmu", "kvm_mmu_unsync_page", "kvmmmu", "kvm_mmu_unsync_page",
kvm_mmu_print_role, NULL); kvm_mmu_print_role, NULL);
tep_register_event_handler(pevent, -1, "kvmmmu", "kvm_mmu_zap_page", tep_register_event_handler(tep, -1, "kvmmmu", "kvm_mmu_zap_page",
kvm_mmu_print_role, NULL); kvm_mmu_print_role, NULL);
tep_register_event_handler(pevent, -1, "kvmmmu", tep_register_event_handler(tep, -1, "kvmmmu",
"kvm_mmu_prepare_zap_page", kvm_mmu_print_role, "kvm_mmu_prepare_zap_page", kvm_mmu_print_role,
NULL); NULL);
tep_register_print_function(pevent, tep_register_print_function(tep,
process_is_writable_pte, process_is_writable_pte,
TEP_FUNC_ARG_INT, TEP_FUNC_ARG_INT,
"is_writable_pte", "is_writable_pte",
...@@ -487,37 +487,37 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent) ...@@ -487,37 +487,37 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)
return 0; return 0;
} }
void TEP_PLUGIN_UNLOADER(struct tep_handle *pevent) void TEP_PLUGIN_UNLOADER(struct tep_handle *tep)
{ {
tep_unregister_event_handler(pevent, -1, "kvm", "kvm_exit", tep_unregister_event_handler(tep, -1, "kvm", "kvm_exit",
kvm_exit_handler, NULL); kvm_exit_handler, NULL);
tep_unregister_event_handler(pevent, -1, "kvm", "kvm_emulate_insn", tep_unregister_event_handler(tep, -1, "kvm", "kvm_emulate_insn",
kvm_emulate_insn_handler, NULL); kvm_emulate_insn_handler, NULL);
tep_unregister_event_handler(pevent, -1, "kvm", "kvm_nested_vmexit", tep_unregister_event_handler(tep, -1, "kvm", "kvm_nested_vmexit",
kvm_nested_vmexit_handler, NULL); kvm_nested_vmexit_handler, NULL);
tep_unregister_event_handler(pevent, -1, "kvm", "kvm_nested_vmexit_inject", tep_unregister_event_handler(tep, -1, "kvm", "kvm_nested_vmexit_inject",
kvm_nested_vmexit_inject_handler, NULL); kvm_nested_vmexit_inject_handler, NULL);
tep_unregister_event_handler(pevent, -1, "kvmmmu", "kvm_mmu_get_page", tep_unregister_event_handler(tep, -1, "kvmmmu", "kvm_mmu_get_page",
kvm_mmu_get_page_handler, NULL); kvm_mmu_get_page_handler, NULL);
tep_unregister_event_handler(pevent, -1, "kvmmmu", "kvm_mmu_sync_page", tep_unregister_event_handler(tep, -1, "kvmmmu", "kvm_mmu_sync_page",
kvm_mmu_print_role, NULL); kvm_mmu_print_role, NULL);
tep_unregister_event_handler(pevent, -1, tep_unregister_event_handler(tep, -1,
"kvmmmu", "kvm_mmu_unsync_page", "kvmmmu", "kvm_mmu_unsync_page",
kvm_mmu_print_role, NULL); kvm_mmu_print_role, NULL);
tep_unregister_event_handler(pevent, -1, "kvmmmu", "kvm_mmu_zap_page", tep_unregister_event_handler(tep, -1, "kvmmmu", "kvm_mmu_zap_page",
kvm_mmu_print_role, NULL); kvm_mmu_print_role, NULL);
tep_unregister_event_handler(pevent, -1, "kvmmmu", tep_unregister_event_handler(tep, -1, "kvmmmu",
"kvm_mmu_prepare_zap_page", kvm_mmu_print_role, "kvm_mmu_prepare_zap_page", kvm_mmu_print_role,
NULL); NULL);
tep_unregister_print_function(pevent, process_is_writable_pte, tep_unregister_print_function(tep, process_is_writable_pte,
"is_writable_pte"); "is_writable_pte");
} }
tools/lib/traceevent/plugin_mac80211.c
View file @ 047ff221
...@@ -87,17 +87,17 @@ static int drv_bss_info_changed(struct trace_seq *s, ...@@ -87,17 +87,17 @@ static int drv_bss_info_changed(struct trace_seq *s,
return 0; return 0;
} }
int TEP_PLUGIN_LOADER(struct tep_handle *pevent) int TEP_PLUGIN_LOADER(struct tep_handle *tep)
{ {
tep_register_event_handler(pevent, -1, "mac80211", tep_register_event_handler(tep, -1, "mac80211",
"drv_bss_info_changed", "drv_bss_info_changed",
drv_bss_info_changed, NULL); drv_bss_info_changed, NULL);
return 0; return 0;
} }
void TEP_PLUGIN_UNLOADER(struct tep_handle *pevent) void TEP_PLUGIN_UNLOADER(struct tep_handle *tep)
{ {
tep_unregister_event_handler(pevent, -1, "mac80211", tep_unregister_event_handler(tep, -1, "mac80211",
"drv_bss_info_changed", "drv_bss_info_changed",
drv_bss_info_changed, NULL); drv_bss_info_changed, NULL);
} }
tools/lib/traceevent/plugin_sched_switch.c
View file @ 047ff221
...@@ -135,27 +135,27 @@ static int sched_switch_handler(struct trace_seq *s, ...@@ -135,27 +135,27 @@ static int sched_switch_handler(struct trace_seq *s,
return 0; return 0;
} }
int TEP_PLUGIN_LOADER(struct tep_handle *pevent) int TEP_PLUGIN_LOADER(struct tep_handle *tep)
{ {
tep_register_event_handler(pevent, -1, "sched", "sched_switch", tep_register_event_handler(tep, -1, "sched", "sched_switch",
sched_switch_handler, NULL); sched_switch_handler, NULL);
tep_register_event_handler(pevent, -1, "sched", "sched_wakeup", tep_register_event_handler(tep, -1, "sched", "sched_wakeup",
sched_wakeup_handler, NULL); sched_wakeup_handler, NULL);
tep_register_event_handler(pevent, -1, "sched", "sched_wakeup_new", tep_register_event_handler(tep, -1, "sched", "sched_wakeup_new",
sched_wakeup_handler, NULL); sched_wakeup_handler, NULL);
return 0; return 0;
} }
void TEP_PLUGIN_UNLOADER(struct tep_handle *pevent) void TEP_PLUGIN_UNLOADER(struct tep_handle *tep)
{ {
tep_unregister_event_handler(pevent, -1, "sched", "sched_switch", tep_unregister_event_handler(tep, -1, "sched", "sched_switch",
sched_switch_handler, NULL); sched_switch_handler, NULL);
tep_unregister_event_handler(pevent, -1, "sched", "sched_wakeup", tep_unregister_event_handler(tep, -1, "sched", "sched_wakeup",
sched_wakeup_handler, NULL); sched_wakeup_handler, NULL);
tep_unregister_event_handler(pevent, -1, "sched", "sched_wakeup_new", tep_unregister_event_handler(tep, -1, "sched", "sched_wakeup_new",
sched_wakeup_handler, NULL); sched_wakeup_handler, NULL);
} }
tools/lib/traceevent/plugin_scsi.c
View file @ 047ff221
...@@ -414,9 +414,9 @@ unsigned long long process_scsi_trace_parse_cdb(struct trace_seq *s, ...@@ -414,9 +414,9 @@ unsigned long long process_scsi_trace_parse_cdb(struct trace_seq *s,
return 0; return 0;
} }
int TEP_PLUGIN_LOADER(struct tep_handle *pevent) int TEP_PLUGIN_LOADER(struct tep_handle *tep)
{ {
tep_register_print_function(pevent, tep_register_print_function(tep,
process_scsi_trace_parse_cdb, process_scsi_trace_parse_cdb,
TEP_FUNC_ARG_STRING, TEP_FUNC_ARG_STRING,
"scsi_trace_parse_cdb", "scsi_trace_parse_cdb",
...@@ -427,8 +427,8 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent) ...@@ -427,8 +427,8 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)
return 0; return 0;
} }
void TEP_PLUGIN_UNLOADER(struct tep_handle *pevent) void TEP_PLUGIN_UNLOADER(struct tep_handle *tep)
{ {
tep_unregister_print_function(pevent, process_scsi_trace_parse_cdb, tep_unregister_print_function(tep, process_scsi_trace_parse_cdb,
"scsi_trace_parse_cdb"); "scsi_trace_parse_cdb");
} }
tools/lib/traceevent/plugin_xen.c
View file @ 047ff221
...@@ -120,9 +120,9 @@ unsigned long long process_xen_hypercall_name(struct trace_seq *s, ...@@ -120,9 +120,9 @@ unsigned long long process_xen_hypercall_name(struct trace_seq *s,
return 0; return 0;
} }
int TEP_PLUGIN_LOADER(struct tep_handle *pevent) int TEP_PLUGIN_LOADER(struct tep_handle *tep)
{ {
tep_register_print_function(pevent, tep_register_print_function(tep,
process_xen_hypercall_name, process_xen_hypercall_name,
TEP_FUNC_ARG_STRING, TEP_FUNC_ARG_STRING,
"xen_hypercall_name", "xen_hypercall_name",
...@@ -131,8 +131,8 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent) ...@@ -131,8 +131,8 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)
return 0; return 0;
} }
void TEP_PLUGIN_UNLOADER(struct tep_handle *pevent) void TEP_PLUGIN_UNLOADER(struct tep_handle *tep)
{ {
tep_unregister_print_function(pevent, process_xen_hypercall_name, tep_unregister_print_function(tep, process_xen_hypercall_name,
"xen_hypercall_name"); "xen_hypercall_name");
} }
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7