Cleanup traceevent API and make it more consistent
cover Cleanup traceevent API and make it more consistent
This patch series does a cleanup of traceevent implementation and APIs:
- All "pevent" function parameters and local variables are renamed to "tep". This makes the implementation consistent with the chosen naming convention, tep (trace event parser), and avoids any confusion with the old "pevent" name
- Removed deprecated tep filter trivial APIs.
- Removed call to exit() from one of traceevent APIs, a library function should not force the application to exit.
- Added counter to track parsing failures.
Changes depend on "Few patches, related to libtracevent APIs" patchset and should be applied on top of it.
Tzvetomir Stoyanov (8):
tools/perf,tools/lib/traceevent: Make traceevent APIs more consistent tools/lib/traceevent: Add counter to track parsing failures tools/lib/traceevent: Remove tep filter trivial APIs tools/lib/traceevent: rename input arguments of libtraceevent APIs
from pevent to tep
tools/perf,tools/lib/traceevent: rename "pevent" member of struct
tep_event to "tep"
tools/perf,tools/lib/traceevent: rename "pevent" member of struct
tep_event_filter to "tep"
tools/lib/traceevent: rename input arguments and local variables of
libtraceevent from pevent to tep
tools/lib/traceevent: remove call to exit() from
tep_filter_add_filter_str()
tools/lib/traceevent/event-parse-api.c | 181 ++-- tools/lib/traceevent/event-parse-local.h | 8 +- tools/lib/traceevent/event-parse.c | 817 +++++++++--------- tools/lib/traceevent/event-parse.h | 148 ++-- tools/lib/traceevent/event-plugin.c | 32 +- tools/lib/traceevent/parse-filter.c | 216 +---- tools/lib/traceevent/plugin_cfg80211.c | 8 +- tools/lib/traceevent/plugin_function.c | 14 +- tools/lib/traceevent/plugin_hrtimer.c | 12 +- tools/lib/traceevent/plugin_jbd2.c | 12 +- tools/lib/traceevent/plugin_kmem.c | 32 +- tools/lib/traceevent/plugin_kvm.c | 48 +- tools/lib/traceevent/plugin_mac80211.c | 8 +- tools/lib/traceevent/plugin_sched_switch.c | 18 +- tools/lib/traceevent/plugin_scsi.c | 8 +- tools/lib/traceevent/plugin_xen.c | 8 +- tools/perf/builtin-kmem.c | 2 +- tools/perf/util/data-convert-bt.c | 4 +- tools/perf/util/python.c | 2 +- .../util/scripting-engines/trace-event-perl.c | 2 +- .../scripting-engines/trace-event-python.c | 2 +- tools/perf/util/trace-event-parse.c | 2 +- tools/perf/util/trace-event-read.c | 2 +- tools/perf/util/trace-event.c | 4 +- 24 files changed, 719 insertions(+), 871 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/8 tools/perf,tools/lib/traceevent: Make traceevent APIs more consistent
Rename some traceevent APIs for consistency:
tep_pid_is_registered() to tep_is_pid_registered() tep_file_bigendian() to tep_is_file_bigendian()
to make the names and return values consistent with other tep_is_... APIs
tep_data_lat_fmt() to tep_data_latency_format()
to make the name more descriptive
tep_host_bigendian() to tep_is_bigendian() tep_set_host_bigendian() to tep_set_local_bigendian() tep_is_host_bigendian() to tep_is_local_bigendian()
"host" can be confused with VMs, and "local" is about the local machine. All tep_is_..._bigendian(struct tep_handle *tep) APIs return the saved data in the tep handle, while tep_is_bigendian() returns the running machine's endianness.
All tep_is_... functions are modified to return bool value, instead of int.
--- tools/lib/traceevent/event-parse-api.c | 44 +++++++++++++------------- tools/lib/traceevent/event-parse.c | 26 +++++++-------- tools/lib/traceevent/event-parse.h | 16 +++++----- tools/lib/traceevent/plugin_kvm.c | 4 +-- tools/perf/util/trace-event-read.c | 2 +- tools/perf/util/trace-event.c | 4 +-- 6 files changed, 48 insertions(+), 48 deletions(-)
tools/lib/traceevent/event-parse-api.c +22 -22
@@ -88,7 +88,7 @@ void tep_clear_flag(struct tep_handle *tep, enum tep_flag flag)bool tep_test_flag (struct tep_handle *tep,enum tep_flag flag) {if (tep) -return (tep->flags & flag); +return !!(tep->flags & flag);return false; }
@@ -155,10 +155,10 @@ int tep_get_header_page_size(struct tep_handle *pevent) }/** -* tep_get_header_timestamp_size - get size of the time stamp in the header page +* tep_get_header_timestamp_size - get size of the timestamp in the header page * @tep: a handle to the tep_handle * -* This returns size of the time stamp in the header page +* This returns size of the timestamp in the header page * If @tep is NULL, 0 is returned. */ int tep_get_header_timestamp_size (struct tep_handle *tep)
@@ -249,17 +249,17 @@ void tep_set_page_size(struct tep_handle *pevent, int _page_size) }/** -* tep_file_bigendian - get if the file is in big endian order +* tep_is_file_bigendian - return the endian of the file * @pevent: a handle to the tep_handle * -* This returns if the file is in big endian order -* If @pevent is NULL, 0 is returned. +* This returns true if the file is in big endian order +* If @pevent is NULL, false is returned. */ -int tep_file_bigendian (struct tep_handle *pevent) +bool tep_is_file_bigendian (struct tep_handle *pevent) {if (pevent) -return pevent->file_bigendian; -return 0 ; +return (pevent->file_bigendian ==TEP_BIG_ENDIAN ); +return false; }/**
@@ -276,27 +276,27 @@ void tep_set_file_bigendian(struct tep_handle *pevent, enum tep_endian endian) }/** -* tep_is_host_bigendian - get if the order of the current host is big endian +* tep_is_local_bigendian - return the endian of the saved local machine * @pevent: a handle to the tep_handle * -* This gets if the order of the current host is big endian -* If @pevent is NULL, 0 is returned. +* This returns true if the saved local machine in @pevent is big endian. +* If @pevent is NULL, false is returned. */ -int tep_is_host_bigendian (struct tep_handle *pevent) +bool tep_is_local_bigendian (struct tep_handle *pevent) {if (pevent) -return pevent->host_bigendian; +return (pevent->host_bigendian ==TEP_BIG_ENDIAN );return 0 ; }/** -* tep_set_host_bigendian - set the order of the local host +* tep_set_local_bigendian - set the stored local machine endian order * @pevent: a handle to the tep_handle * @endian: non zero, if the local host has big endian order * -* This sets the order of the local host +* This sets the endian order for the local machine. */ -void tep_set_host_bigendian (struct tep_handle *pevent,enum tep_endian endian) +void tep_set_local_bigendian (struct tep_handle *pevent,enum tep_endian endian) {if (pevent) pevent->host_bigendian = endian;
@@ -306,14 +306,14 @@ void tep_set_host_bigendian(struct tep_handle *pevent, enum tep_endian endian)* tep_is_latency_format - get if the latency output format is configured * @pevent: a handle to the tep_handle * -* This gets if the latency output format is configured -* If @pevent is NULL, 0 is returned. +* This returns true if the latency output format is configured +* If @pevent is NULL, false is returned. */ -int tep_is_latency_format (struct tep_handle *pevent) +bool tep_is_latency_format (struct tep_handle *pevent) {if (pevent) -return pevent->latency_format; -return 0 ; +return !!(pevent->latency_format); +return false; }/**
tools/lib/traceevent/event-parse.c +13 -13
@@ -199,23 +199,23 @@ static const char *find_cmdline(struct tep_handle *pevent, int pid) }/** -* tep_pid_is_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 * @pid: The pid to check if it has a cmdline registered with. * -* Returns 1 if the pid has a cmdline mapped to it -* 0 otherwise. +* Returns true if the pid has a cmdline mapped to it +* false otherwise. */ -int tep_pid_is_registered (struct tep_handle *pevent,int pid) +bool tep_is_pid_registered (struct tep_handle *pevent,int pid) {const struct tep_cmdline *comm;struct tep_cmdline key;if (!pid) -return 1 ; +return true;if (!pevent->cmdlines &&cmdline_init (pevent)) -return 0 ; +return false; key.pid = pid;
@@ -223,8 +223,8 @@ int tep_pid_is_registered(struct tep_handle *pevent, int pid) sizeof(*pevent->cmdlines), cmdline_cmp);if (comm) -return 1 ; -return 0 ; +return true; +return false; }/*
@@ -5171,7 +5171,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_e }/** -* tep_data_lat_fmt - parse the data for the latency format +* tep_data_latency_format - parse the data for the latency format * @pevent: a handle to the pevent * @s: the trace_seq to write to * @record: the record to read from
@@ -5180,8 +5180,8 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_e* need rescheduling, in hard/soft interrupt, preempt count * and lock depth) and places it into the trace_seq. */ -void tep_data_lat_fmt (struct tep_handle *pevent, -struct trace_seq *s,struct tep_record *record) +void tep_data_latency_format (struct tep_handle *pevent, +struct trace_seq *s,struct tep_record *record) {static int check_lock_depth =1 ;static int check_migrate_disable =1 ;
@@ -5530,7 +5530,7 @@ void tep_print_event_time(struct tep_handle *pevent, struct trace_seq *s, }if (pevent->latency_format) { -tep_data_lat_fmt (pevent, s, record); +tep_data_latency_format (pevent, s, record); }if (use_usec_format) {
@@ -6760,7 +6760,7 @@ struct tep_handle *tep_alloc(void)if (pevent) { pevent->ref_count =1 ; - pevent->host_bigendian =tep_host_bigendian (); + pevent->host_bigendian =tep_is_bigendian (); }return pevent;
tools/lib/traceevent/event-parse.h +8 -8
@@ -412,7 +412,7 @@ void tep_set_flag(struct tep_handle *tep, int flag);void tep_clear_flag (struct tep_handle *tep,enum tep_flag flag);bool tep_test_flag (struct tep_handle *tep,enum tep_flag flags); -static inline int tep_host_bigendian (void ) +static inline int tep_is_bigendian (void ) {unsigned char str[] = {0x1 ,0x2 ,0x3 ,0x4 };unsigned int val;
@@ -440,7 +440,7 @@ int tep_register_function(struct tep_handle *pevent, char *name, unsigned long long addr, char *mod);int tep_register_print_string (struct tep_handle *pevent,const char *fmt,unsigned long long addr); -int tep_pid_is_registered (struct tep_handle *pevent,int pid); +bool tep_is_pid_registered (struct tep_handle *pevent,int pid); void tep_print_event_task(struct tep_handle *pevent, struct trace_seq *s, struct tep_event *event,
@@ -526,8 +526,8 @@ tep_find_event_by_name(struct tep_handle *pevent, const char *sys, const char *nstruct tep_event *tep_find_event_by_record (struct tep_handle *pevent,struct tep_record *record); -void tep_data_lat_fmt (struct tep_handle *pevent, -struct trace_seq *s,struct tep_record *record); +void tep_data_latency_format (struct tep_handle *pevent, +struct trace_seq *s,struct tep_record *record);int tep_data_type (struct tep_handle *pevent,struct tep_record *rec);int tep_data_pid (struct tep_handle *pevent,struct tep_record *rec);int tep_data_preempt_count (struct tep_handle *pevent,struct tep_record *rec);
@@ -561,11 +561,11 @@ int tep_get_long_size(struct tep_handle *pevent);void tep_set_long_size (struct tep_handle *pevent,int long_size);int tep_get_page_size (struct tep_handle *pevent);void tep_set_page_size (struct tep_handle *pevent,int _page_size); -int tep_file_bigendian (struct tep_handle *pevent); +bool tep_is_file_bigendian (struct tep_handle *pevent);void tep_set_file_bigendian (struct tep_handle *pevent,enum tep_endian endian); -int tep_is_host_bigendian (struct tep_handle *pevent); -void tep_set_host_bigendian (struct tep_handle *pevent,enum tep_endian endian); -int tep_is_latency_format (struct tep_handle *pevent); +bool tep_is_local_bigendian (struct tep_handle *pevent); +void tep_set_local_bigendian (struct tep_handle *pevent,enum tep_endian endian); +bool tep_is_latency_format (struct tep_handle *pevent);void tep_set_latency_format (struct tep_handle *pevent,int lat);int tep_get_header_page_size (struct tep_handle *pevent);int tep_get_header_timestamp_size (struct tep_handle *tep);
tools/lib/traceevent/plugin_kvm.c +2 -2
@@ -389,8 +389,8 @@ static int kvm_mmu_print_role(struct trace_seq *s, struct tep_record *record,* We can only use the structure if file is of the same * endianness. */ -if (tep_file_bigendian (event->pevent) == -tep_is_host_bigendian (event->pevent)) { +if (tep_is_file_bigendian (event->pevent) == +tep_is_local_bigendian (event->pevent)) { trace_seq_printf(s, "%u q%u%s %s%s %spae %snxe %swp%s%s%s", role.level,
tools/perf/util/trace-event-read.c +1 -1
@@ -442,7 +442,7 @@ ssize_t trace_report(int fd, struct trace_event *tevent, bool __repipe)tep_set_flag (pevent,TEP_NSEC_OUTPUT );tep_set_file_bigendian (pevent, file_bigendian); -tep_set_host_bigendian (pevent, host_bigendian); +tep_set_local_bigendian (pevent, host_bigendian);if (do_read (buf,1 ) <0 ) goto out;
tools/perf/util/trace-event.c +2 -2
@@ -40,7 +40,7 @@ int trace_event__init(struct trace_event *t)static int trace_event__init2 (void ) { -int be =tep_host_bigendian (); +int be =tep_is_bigendian ();struct tep_handle *pevent;if (trace_event__init (&tevent))
@@ -49,7 +49,7 @@ static int trace_event__init2(void) pevent = tevent.pevent;tep_set_flag (pevent,TEP_NSEC_OUTPUT );tep_set_file_bigendian (pevent, be); -tep_set_host_bigendian (pevent, be); +tep_set_local_bigendian (pevent, be); tevent_initialized = true;return 0 ; }
Signature · 1 line
2.20.1
Re: [PATCH 1/8] tools/perf,tools/lib/traceevent: Make traceevent APIs more consistent
Quoted 17 lines · On Tue, 26 Mar 2019 17:43:21 +0200 Tzvetomir Stoyanov <[email protected]>…
Rename some traceevent APIs for consistency:
tep_pid_is_registered()totep_is_pid_registered()tep_file_bigendian()totep_is_file_bigendian()
to make the names and return values consistent with othertep_is_... APIs
tep_data_lat_fmt()totep_data_latency_format()
to make the name more descriptive
tep_host_bigendian()totep_is_bigendian()tep_set_host_bigendian()totep_set_local_bigendian()tep_is_host_bigendian()totep_is_local_bigendian()
"host" can be confused with VMs, and "local" is about the local machine. All tep_is_..._bigendian(structtep_handle*tep) APIs return the saved data in the tep handle, whiletep_is_bigendian()returns the running machine's endianness.
Quoted 1 line
All
tep_is_... functions are modified to return bool value, instead of int.
Much nicer ;-)
Quoted 16 lines
Signed-off-by Tzvetomir Stoyanov <[email protected]>--- tools/lib/traceevent/event-parse-api.c | 44 +++++++++++++------------- tools/lib/traceevent/event-parse.c | 26 +++++++-------- tools/lib/traceevent/event-parse.h | 16 +++++----- tools/lib/traceevent/plugin_kvm.c | 4 +-- tools/perf/util/trace-event-read.c | 2 +- tools/perf/util/trace-event.c | 4 +-- 6 files changed, 48 insertions(+), 48 deletions(-)tools/lib/traceevent/event-parse-api.c +0
-0
tools/lib/traceevent/event-parse-api.c void tep_clear_flag(struct tep_handle *tep, enum tep_flag flag) · line 91
Quoted 5 lines
tools/lib/traceevent/event-parse-api.c +1
-1@@ -88,7 +88,7 @@ void tep_clear_flag(struct tep_handle *tep, enum tep_flag flag)bool tep_test_flag (struct tep_handle *tep,enum tep_flag flag) {if (tep) -return (tep->flags & flag); +return !!(tep->flags & flag);
This isn't needed. The fact hat this returns "bool", the compiler will handle thins the same regardless.
Quoted 11 lines
tools/lib/traceevent/event-parse-api.c +0
-2return false; }@@ -306,14 +306,14 @@ void tep_set_host_bigendian(struct tep_handle *pevent, enum tep_endian endian)* tep_is_latency_format - get if the latency output format is configured * @pevent: a handle to the tep_handle * -* This gets if the latency output format is configured -* If @pevent is NULL, 0 is returned.
tools/lib/traceevent/event-parse-api.c void tep_set_host_bigendian(struct tep_handle *pevent, enum tep_endian endian) · line 315
Quoted 10 lines
tools/lib/traceevent/event-parse-api.c +4
-3+* This returns true if the latency output format is configured +* If @pevent is NULL, false is returned. */ -int tep_is_latency_format (struct tep_handle *pevent) +bool tep_is_latency_format (struct tep_handle *pevent) {if (pevent) -return pevent->latency_format; -return 0 ; +return !!(pevent->latency_format);
Same here.
tools/lib/traceevent/event-parse-api.c void tep_set_page_size(struct tep_handle *pevent, int _page_size) · line 265
Quoted 4 lines
tools/lib/traceevent/event-parse-api.c +1
-0+return false; }/**
The rest looks good.
-- Steve
PATCH 2/8 tools/lib/traceevent: Add counter to track parsing failures
In reply to Tzvetomir StoyanovThis patch adds a parsing failures counter to struct tep_handle. The counter can be used to track failures on parsing event format files. It is updated automatically by tep_parse_event(), when failure is detected. The patch also adds two new APIs for accessing the counter:
tep_get_parsing_failures() - returns the current value of the counter. tep_clear_parsing_failures() - clears the counter.
--- tools/lib/traceevent/event-parse-api.c | 27 ++++++++++++++++++++++++ tools/lib/traceevent/event-parse-local.h | 2 ++ tools/lib/traceevent/event-parse.c | 8 ++++++- tools/lib/traceevent/event-parse.h | 2 ++ 4 files changed, 38 insertions(+), 1 deletion(-)
tools/lib/traceevent/event-parse-api.c +27 -0
@@ -371,3 +371,30 @@ void tep_set_test_filters(struct tep_handle *tep, int test_filters)if (tep) tep->test_filters = test_filters; } + +/** +* tep_get_parsing_failures - get the count of parsing failures +* @tep: a handle to a tep_handle +* +* Every time when tep_parse_event() fails to parse an event format file, +* a parsing failure is registered. This returns the parsing failures count. +*/ +int tep_get_parsing_failures (struct tep_handle *tep) +{ +if (tep) +return tep->parsing_failures; +return 0 ; +} + +/** +* tep_clear_parsing_failures - clear parsing failures count +* @tep: a handle to a tep_handle +* +* Every time when tep_parse_event() fails to parse an event format file, +* a parsing failure is registered. This clears the parsing failures counter. +*/ +void tep_clear_parsing_failures (struct tep_handle *tep) +{ +if (tep) + tep->parsing_failures =0 ; +}
tools/lib/traceevent/event-parse-local.h +2 -0
@@ -83,6 +83,8 @@ struct tep_handle {struct event_handler *handlers;struct tep_function_handler *func_handlers; +int parsing_failures; +/* cache */ struct tep_event *last_event;
tools/lib/traceevent/event-parse.c +7 -1
@@ -6230,7 +6230,13 @@ enum tep_errno tep_parse_event(struct tep_handle *pevent, const char *buf, unsigned long size, const char *sys) { struct tep_event *event = NULL; -return __parse_event (pevent, &event, buf, size, sys); +enum tep_errno ret; + + ret =__parse_event (pevent, &event, buf, size, sys); +if (ret !=TEP_ERRNO__SUCCESS ) + pevent->parsing_failures++; + +return ret; } int get_field_val(struct trace_seq *s, struct tep_format_field *field,
tools/lib/traceevent/event-parse.h +2 -0
@@ -464,6 +464,8 @@ enum tep_errno tep_parse_format(struct tep_handle *pevent,struct tep_event **eventp, const char *buf, unsigned long size, const char *sys); +int tep_get_parsing_failures (struct tep_handle *tep); +void tep_clear_parsing_failures (struct tep_handle *tep); void *tep_get_field_raw(struct trace_seq *s, struct tep_event *event, const char *name, struct tep_record *record,
Signature · 1 line
2.20.1
Re: [PATCH 2/8] tools/lib/traceevent: Add counter to track parsing failures
Quoted 7 lines · On Tue, 26 Mar 2019 17:43:22 +0200 Tzvetomir Stoyanov <[email protected]>…
This patch adds a parsing failures counter to struct
tep_handle. The counter can be used to track failures on parsing event format files. It is updated automatically bytep_parse_event(), when failure is detected. The patch also adds two new APIs for accessing the counter:
tep_get_parsing_failures()- returns the current value of the counter.tep_clear_parsing_failures()- clears the counter.
I think we can do the same thing here as we did test_filters.
I don't think we really need to put this into the tep interface. Let's see if we can move this into trace-cmd itself and have it just keep track of when parsing failed.
I mean, trace-cmd is just using the tep structure as place to store this variable.
-- Steve
PATCH 3/8 tools/lib/traceevent: Remove tep filter trivial APIs
In reply to Tzvetomir StoyanovThis patch removes trivial filter tep APIs:
enum tep_filter_trivial_type
tep_filter_event_has_trivial()
tep_update_trivial()
tep_filter_clear_trivial()
Trivial filters is an optimization, used only in the first version of KernelShark. The API is deprecated, the next KernelShark release does not use it.
--- tools/lib/traceevent/event-parse.h | 16 --- tools/lib/traceevent/parse-filter.c | 169 ---------------------------- 2 files changed, 185 deletions(-)
tools/lib/traceevent/event-parse.h +0 -16
@@ -732,12 +732,6 @@ struct tep_event_filter *tep_filter_alloc(struct tep_handle *pevent);#define FILTER_MISS TEP_ERRNO__FILTER_MISS#define FILTER_MATCH TEP_ERRNO__FILTER_MATCH -enum tep_filter_trivial_type { -TEP_FILTER_TRIVIAL_FALSE , -TEP_FILTER_TRIVIAL_TRUE , -TEP_FILTER_TRIVIAL_BOTH , -}; -enum tep_errno tep_filter_add_filter_str (struct tep_event_filter *filter,const char *filter_str);
@@ -752,9 +746,6 @@ int tep_event_filtered(struct tep_event_filter *filter,void tep_filter_reset (struct tep_event_filter *filter); -int tep_filter_clear_trivial (struct tep_event_filter *filter, -enum tep_filter_trivial_type type); -void tep_filter_free (struct tep_event_filter *filter);char *tep_filter_make_string (struct tep_event_filter *filter,int event_id);
@@ -762,15 +753,8 @@ char *tep_filter_make_string(struct tep_event_filter *filter, int event_id);int tep_filter_remove_event (struct tep_event_filter *filter,int event_id); -int tep_filter_event_has_trivial (struct tep_event_filter *filter, -int event_id, -enum tep_filter_trivial_type type); -int tep_filter_copy (struct tep_event_filter *dest,struct tep_event_filter *source); -int tep_update_trivial (struct tep_event_filter *dest,struct tep_event_filter *source, -enum tep_filter_trivial_type type); -int tep_filter_compare (struct tep_event_filter *filter1,struct tep_event_filter *filter2);#endif /* _PARSE_EVENTS_H */
tools/lib/traceevent/parse-filter.c +0 -169
181 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [PATCH 3/8] tools/lib/traceevent: Remove tep filter trivial APIs
Quoted 6 lines · On Tue, 26 Mar 2019 17:43:23 +0200 Tzvetomir Stoyanov <[email protected]>…
This patch removes trivial filter tep APIs:
enumtep_filter_trivial_type
tep_filter_event_has_trivial()
tep_update_trivial()
tep_filter_clear_trivial()
Quoted 6 lines
Trivial filters is an optimization, used only in the first version of KernelShark. The API is deprecated, the next KernelShark release does not use it.
Signed-off-by Tzvetomir Stoyanov <[email protected]>
This patch looks fine to me. I'm taking it now. You shouldn't need to send it again in newer series.
-- Steve
PATCH 4/8 tools/lib/traceevent: rename input arguments of libtraceevent APIs from pevent to tep
In reply to Tzvetomir StoyanovThis patch renames "struct tep_handle *pevent" input arguments of libtraceevent APIs to "struct tep_handle *tep". This makes the API consistent with the chosen naming convention: tep (trace event parser), instead of the old pevent.
--- tools/lib/traceevent/event-parse-api.c | 132 +++--- tools/lib/traceevent/event-parse-local.h | 6 +- tools/lib/traceevent/event-parse.c | 475 ++++++++++----------- tools/lib/traceevent/event-parse.h | 120 +++--- tools/lib/traceevent/event-plugin.c | 8 +- tools/lib/traceevent/parse-filter.c | 8 +- tools/lib/traceevent/plugin_cfg80211.c | 8 +- tools/lib/traceevent/plugin_function.c | 8 +- tools/lib/traceevent/plugin_hrtimer.c | 12 +- tools/lib/traceevent/plugin_jbd2.c | 12 +- tools/lib/traceevent/plugin_kmem.c | 28 +- tools/lib/traceevent/plugin_kvm.c | 44 +- tools/lib/traceevent/plugin_mac80211.c | 8 +- tools/lib/traceevent/plugin_sched_switch.c | 16 +- tools/lib/traceevent/plugin_scsi.c | 8 +- tools/lib/traceevent/plugin_xen.c | 8 +- 16 files changed, 450 insertions(+), 451 deletions(-)
tools/lib/traceevent/event-parse-api.c +66 -66
@@ -92,11 +92,11 @@ bool tep_test_flag(struct tep_handle *tep, enum tep_flag flag)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; -if (!pevent || pevent->host_bigendian == pevent->file_bigendian) +if (!tep || tep->host_bigendian == tep->file_bigendian)return data; swap = ((data & 0xffULL) << 8) |
@@ -105,11 +105,11 @@ unsigned short tep_data2host2(struct tep_handle *pevent, unsigned short data)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; -if (!pevent || pevent->host_bigendian == pevent->file_bigendian) +if (!tep || tep->host_bigendian == tep->file_bigendian)return data; swap = ((data & 0xffULL) << 24) |
@@ -121,11 +121,11 @@ unsigned int tep_data2host4(struct tep_handle *pevent, unsigned int data) }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; -if (!pevent || pevent->host_bigendian == pevent->file_bigendian) +if (!tep || tep->host_bigendian == tep->file_bigendian)return data; swap = ((data & 0xffULL) << 56) |
@@ -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 -* @pevent: a handle to the tep_handle +* @tep: a handle to the tep_handle * * 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) -return pevent->header_page_size_size; +if (tep) +return tep->header_page_size_size;return 0 ; }
@@ -170,163 +170,163 @@ int tep_get_header_timestamp_size(struct tep_handle *tep)/** * 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 -* 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) -return pevent->cpus; +if (tep) +return tep->cpus;return 0 ; }/** * 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 */ -void tep_set_cpus (struct tep_handle *pevent,int cpus) +void tep_set_cpus (struct tep_handle *tep,int cpus) { -if (pevent) - pevent->cpus = cpus; +if (tep) + tep->cpus = cpus; }/** * 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 -* 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) -return pevent->long_size; +if (tep) +return tep->long_size;return 0 ; }/** * 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 * * 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) - pevent->long_size = long_size; +if (tep) + tep->long_size = long_size; }/** * 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 -* 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) -return pevent->page_size; +if (tep) +return tep->page_size;return 0 ; }/** * 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 * * 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) - pevent->page_size = _page_size; +if (tep) + tep->page_size = _page_size; }/** * 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 -* 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) -return (pevent->file_bigendian ==TEP_BIG_ENDIAN ); +if (tep) +return (tep->file_bigendian ==TEP_BIG_ENDIAN );return false; }/** * 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 * * 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) - pevent->file_bigendian = endian; +if (tep) + tep->file_bigendian = endian; }/** * 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. -* If @pevent is NULL, false is returned. +* This returns true if the saved local machine in @tep is big endian. +* 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) -return (pevent->host_bigendian ==TEP_BIG_ENDIAN ); +if (tep) +return (tep->host_bigendian ==TEP_BIG_ENDIAN );return 0 ; }/** * 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 * * 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) - pevent->host_bigendian = endian; +if (tep) + tep->host_bigendian = endian; }/** * 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 -* 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) -return !!(pevent->latency_format); +if (tep) +return !!(tep->latency_format);return false; }/** * 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 * * 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) - pevent->latency_format = lat; +if (tep) + tep->latency_format = lat; }/**
tools/lib/traceevent/event-parse-local.h +3 -3
@@ -94,8 +94,8 @@ struct tep_handle {void tep_free_event (struct tep_event *event);void tep_free_format_field (struct tep_format_field *field); -unsigned short tep_data2host2 (struct tep_handle *pevent,unsigned short data); -unsigned int tep_data2host4 (struct tep_handle *pevent,unsigned int data); -unsigned long long tep_data2host8 (struct tep_handle *pevent,unsigned long long data); +unsigned short tep_data2host2 (struct tep_handle *tep,unsigned short data); +unsigned int tep_data2host4 (struct tep_handle *tep,unsigned int data); +unsigned long long tep_data2host8 (struct tep_handle *tep,unsigned long long data);#endif /* _PARSE_EVENTS_INT_H */
tools/lib/traceevent/event-parse.c +237 -238
1,206 lines not on this page · raw message
tools/lib/traceevent/event-parse.h +60 -60
230 lines not on this page · raw message
tools/lib/traceevent/event-plugin.c +4 -4
@@ -419,16 +419,16 @@ load_plugins(struct tep_handle *pevent, const char *suffix, }struct tep_plugin_list * -tep_load_plugins (struct tep_handle *pevent) +tep_load_plugins (struct tep_handle *tep) {struct tep_plugin_list *list =NULL ; -load_plugins (pevent,".so" , load_plugin, &list); +load_plugins (tep,".so" , load_plugin, &list);return list; }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;struct tep_plugin_list *list;
@@ -438,7 +438,7 @@ tep_unload_plugins(struct tep_plugin_list *plugin_list, struct tep_handle *peven plugin_list = list->next; func =dlsym (list->handle,TEP_PLUGIN_UNLOADER_NAME );if (func) -func (pevent); +func (tep);dlclose (list->handle);free (list->name);free (list);
tools/lib/traceevent/parse-filter.c +4 -4
@@ -164,9 +164,9 @@ add_filter_type(struct tep_event_filter *filter, int id)/** * 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;
@@ -175,8 +175,8 @@ struct tep_event_filter *tep_filter_alloc(struct tep_handle *pevent)return NULL ;memset (filter,0 ,sizeof (*filter)); - filter->pevent = pevent; -tep_ref (pevent); + filter->pevent = tep; +tep_ref (tep);return filter; }
tools/lib/traceevent/plugin_cfg80211.c +4 -4
@@ -25,9 +25,9 @@ process___le16_to_cpup(struct trace_seq *s, unsigned long long *args)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, TEP_FUNC_ARG_INT, "__le16_to_cpup",
@@ -36,8 +36,8 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)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" ); }
tools/lib/traceevent/plugin_function.c +4 -4
@@ -164,9 +164,9 @@ static int function_handler(struct trace_seq *s, struct tep_record *record,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 );tep_plugin_add_options ("ftrace" , plugin_options);
@@ -174,11 +174,11 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)return 0 ; } -void TEP_PLUGIN_UNLOADER (struct tep_handle *pevent) +void TEP_PLUGIN_UNLOADER (struct tep_handle *tep) {int i, x; -tep_unregister_event_handler (pevent,-1 ,"ftrace" ,"function" , +tep_unregister_event_handler (tep,-1 ,"ftrace" ,"function" , function_handler,NULL );for (i =0 ; i <= cpus; i++) {
tools/lib/traceevent/plugin_hrtimer.c +6 -6
@@ -67,23 +67,23 @@ static int timer_start_handler(struct trace_seq *s,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_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 );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_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 ); }
tools/lib/traceevent/plugin_jbd2.c +6 -6
@@ -48,16 +48,16 @@ process_jiffies_to_msecs(struct trace_seq *s, unsigned long long *args)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,TEP_FUNC_ARG_STRING ,"jbd2_dev_to_name" ,TEP_FUNC_ARG_INT ,TEP_FUNC_ARG_VOID ); - tep_register_print_function(pevent, + tep_register_print_function(tep, process_jiffies_to_msecs, TEP_FUNC_ARG_LONG, "jiffies_to_msecs",
@@ -66,11 +66,11 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)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" ); -tep_unregister_print_function (pevent, process_jiffies_to_msecs, +tep_unregister_print_function (tep, process_jiffies_to_msecs,"jiffies_to_msecs" ); }
tools/lib/traceevent/plugin_kmem.c +14 -14
@@ -49,47 +49,47 @@ static int call_site_handler(struct trace_seq *s, struct tep_record *record,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 ); -tep_register_event_handler (pevent,-1 ,"kmem" ,"kmalloc" , +tep_register_event_handler (tep,-1 ,"kmem" ,"kmalloc" , 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 ); -tep_register_event_handler (pevent,-1 ,"kmem" ,"kmem_cache_alloc" , +tep_register_event_handler (tep,-1 ,"kmem" ,"kmem_cache_alloc" , call_site_handler,NULL ); -tep_register_event_handler (pevent,-1 ,"kmem" , +tep_register_event_handler (tep,-1 ,"kmem" ,"kmem_cache_alloc_node" , 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 );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 ); -tep_unregister_event_handler (pevent,-1 ,"kmem" ,"kmalloc" , +tep_unregister_event_handler (tep,-1 ,"kmem" ,"kmalloc" , 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 ); -tep_unregister_event_handler (pevent,-1 ,"kmem" ,"kmem_cache_alloc" , +tep_unregister_event_handler (tep,-1 ,"kmem" ,"kmem_cache_alloc" , call_site_handler,NULL ); -tep_unregister_event_handler (pevent,-1 ,"kmem" , +tep_unregister_event_handler (tep,-1 ,"kmem" ,"kmem_cache_alloc_node" , 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 ); }
tools/lib/traceevent/plugin_kvm.c +22 -22
99 lines not on this page · raw message
tools/lib/traceevent/plugin_mac80211.c +4 -4
@@ -87,17 +87,17 @@ static int drv_bss_info_changed(struct trace_seq *s,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,NULL );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,NULL ); }
tools/lib/traceevent/plugin_sched_switch.c +8 -8
@@ -135,27 +135,27 @@ static int sched_switch_handler(struct trace_seq *s,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 ); -tep_register_event_handler (pevent,-1 ,"sched" ,"sched_wakeup" , +tep_register_event_handler (tep,-1 ,"sched" ,"sched_wakeup" , 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 );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 ); -tep_unregister_event_handler (pevent,-1 ,"sched" ,"sched_wakeup" , +tep_unregister_event_handler (tep,-1 ,"sched" ,"sched_wakeup" , 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 ); }
tools/lib/traceevent/plugin_scsi.c +4 -4
@@ -414,9 +414,9 @@ unsigned long long process_scsi_trace_parse_cdb(struct trace_seq *s,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, TEP_FUNC_ARG_STRING, "scsi_trace_parse_cdb",
@@ -427,8 +427,8 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)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" ); }
tools/lib/traceevent/plugin_xen.c +4 -4
@@ -120,9 +120,9 @@ unsigned long long process_xen_hypercall_name(struct trace_seq *s,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, TEP_FUNC_ARG_STRING, "xen_hypercall_name",
@@ -131,8 +131,8 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)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" ); }
Signature · 1 line
2.20.1
Re: [PATCH 4/8] tools/lib/traceevent: rename input arguments of libtraceevent APIs from pevent to tep
Quoted 5 lines · On Tue, 26 Mar 2019 17:43:24 +0200 Tzvetomir Stoyanov <[email protected]>…
This patch renames "struct
tep_handle*pevent" input arguments of libtraceevent APIs to "structtep_handle*tep". This makes the API consistent with the chosen naming convention: tep (trace event parser), instead of the old pevent.Signed-off-by Tzvetomir Stoyanov <[email protected]>
I have no problems with this patch, but as I didn't apply some of the earlier patches, this one doesn't apply, so you will need to send it again in the next series.
-- Steve
Re: [PATCH 4/8] tools/lib/traceevent: rename input arguments of libtraceevent APIs from pevent to tep
Quoted 7 lines · On Tue, 26 Mar 2019 15:57:41 -0400 Steven Rostedt <[email protected]> wrote:
Quoted 4 lines · On Tue, 26 Mar 2019 17:43:24 +0200 Tzvetomir Stoyanov <[email protected]>…
This patch renames "struct
tep_handle*pevent" input arguments of libtraceevent APIs to "structtep_handle*tep". This makes the API consistent with the chosen naming convention: tep (trace event parser), instead of the old pevent.
Quoted 5 lines
Quoted 1 line
Signed-off-by Tzvetomir Stoyanov <[email protected]>I have no problems with this patch, but as I didn't apply some of the earlier patches, this one doesn't apply, so you will need to send it again in the next series.
Oh, I do have one issue. Don't forget to capitalize the first word in the subject. "s/rename input/Rename input/"
That goes with the other patches as well.
-- Steve
PATCH 5/8 tools/perf,tools/lib/traceevent: rename "pevent" member of struct tep_event to "tep"
In reply to Tzvetomir StoyanovThis patch renames "pevent" member of the struct tep_event to "tep". This makes the struct consistent with the chosen naming convention:
tep (trace event parser), instead of the old pevent.
--- tools/lib/traceevent/event-parse.c | 32 +++++++++---------- tools/lib/traceevent/event-parse.h | 2 +- tools/lib/traceevent/parse-filter.c | 6 ++-- tools/lib/traceevent/plugin_function.c | 2 +- tools/lib/traceevent/plugin_kmem.c | 4 +-- tools/lib/traceevent/plugin_kvm.c | 4 +-- tools/lib/traceevent/plugin_sched_switch.c | 2 +- tools/perf/builtin-kmem.c | 2 +- tools/perf/util/data-convert-bt.c | 4 +-- tools/perf/util/python.c | 2 +- .../util/scripting-engines/trace-event-perl.c | 2 +- .../scripting-engines/trace-event-python.c | 2 +- tools/perf/util/trace-event-parse.c | 2 +- 13 files changed, 33 insertions(+), 33 deletions(-)
tools/lib/traceevent/event-parse.c +16 -16
@@ -804,7 +804,7 @@ static int add_event(struct tep_handle *pevent, struct tep_event *event) pevent->events[i] = event; pevent->nr_events++; - event->pevent = pevent; + event->tep = pevent;return 0 ; }
@@ -1656,8 +1656,8 @@ static int event_read_fields(struct tep_event *event, struct tep_format_field **else if (field->flags &TEP_FIELD_IS_STRING ) field->elementsize =1 ;else if (field->flags &TEP_FIELD_IS_LONG ) - field->elementsize = event->pevent ? - event->pevent->long_size : + field->elementsize = event->tep ? + event->tep->long_size :sizeof (long ); }else field->elementsize = field->size;
@@ -3075,7 +3075,7 @@ process_function(struct tep_event *event, struct tep_print_arg *arg,return process_dynamic_array_len (event, arg, tok); } - func =find_func_handler (event->pevent, token); + func =find_func_handler (event->tep, token);if (func) {free_token (token);return process_func_handler (event, func, arg, tok);
@@ -3405,7 +3405,7 @@ int tep_read_number_field(struct tep_format_field *field, const void *data,case 2 :case 4 :case 8 : - *value =tep_read_number (field->event->pevent, + *value =tep_read_number (field->event->tep, data + field->offset, field->size);return 0 ;default :
@@ -3566,7 +3566,7 @@ tep_find_event_by_name(struct tep_handle *tep,static unsigned long long eval_num_arg (void *data,int size,struct tep_event *event,struct tep_print_arg *arg) { -struct tep_handle *pevent = event->pevent; +struct tep_handle *pevent = event->tep;unsigned long long val =0 ;unsigned long long left, right;struct tep_print_arg *typearg =NULL ;
@@ -3907,7 +3907,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, struct tep_event *event, const char *format, int len_arg, struct tep_print_arg *arg) { - struct tep_handle *pevent = event->pevent; + struct tep_handle *pevent = event->tep;struct tep_print_flag_sym *flag;struct tep_format_field *field;struct printk_map *printk;
@@ -4256,7 +4256,7 @@ static void free_args(struct tep_print_arg *args)static struct tep_print_arg *make_bprint_args (char *fmt,void *data,int size,struct tep_event *event) { -struct tep_handle *pevent = event->pevent; +struct tep_handle *pevent = event->tep;struct tep_format_field *field, *ip_field;struct tep_print_arg *args, *arg, **next;unsigned long long ip, val;
@@ -4433,7 +4433,7 @@ static char * get_bprint_format(void *data, int size __maybe_unused, struct tep_event *event) { -struct tep_handle *pevent = event->pevent; +struct tep_handle *pevent = event->tep;unsigned long long addr;struct tep_format_field *field;struct printk_map *printk;
@@ -4834,7 +4834,7 @@ void tep_print_field(struct trace_seq *s, void *data, {unsigned long long val;unsigned int offset, len, i; -struct tep_handle *pevent = field->event->pevent; +struct tep_handle *pevent = field->event->tep;if (field->flags &TEP_FIELD_IS_ARRAY ) { offset = field->offset;
@@ -4909,7 +4909,7 @@ void tep_print_fields(struct trace_seq *s, void *data,static void pretty_print (struct trace_seq *s,void *data,int size,struct tep_event *event) { -struct tep_handle *pevent = event->pevent; +struct tep_handle *pevent = event->tep;struct tep_print_fmt *print_fmt = &event->print_fmt;struct tep_print_arg *arg = print_fmt->args;struct tep_print_arg *args =NULL ;
@@ -5423,7 +5423,7 @@ void tep_event_info(struct trace_seq *s, struct tep_event *event, {int print_pretty =1 ; -if (event->pevent->print_raw || (event->flags &TEP_EVENT_FL_PRINTRAW )) +if (event->tep->print_raw || (event->flags &TEP_EVENT_FL_PRINTRAW ))tep_print_fields (s, record->data, record->size, event);else {
@@ -6097,7 +6097,7 @@ enum tep_errno __tep_parse_format(struct tep_event **eventp, }/* Add pevent to event so that it can be referenced */ - event->pevent = pevent; + event->tep = pevent; ret =event_read_format (event);if (ret <0 ) {
@@ -6297,8 +6297,8 @@ void *tep_get_field_raw(struct trace_seq *s, struct tep_event *event, offset = field->offset;if (field->flags &TEP_FIELD_IS_DYNAMIC ) { - offset =tep_read_number (event->pevent, - data + offset, field->size); + offset =tep_read_number (event->tep, + data + offset, field->size); *len = offset >>16 ; offset &=0xffff ; }else
@@ -6432,7 +6432,7 @@ int tep_print_func_field(struct trace_seq *s, const char *fmt, struct tep_record *record, int err) {struct tep_format_field *field =tep_find_field (event, name); -struct tep_handle *pevent = event->pevent; +struct tep_handle *pevent = event->tep;unsigned long long val;struct func_map *func;char tmp[128 ];
tools/lib/traceevent/event-parse.h +1 -1
@@ -278,7 +278,7 @@ struct tep_print_fmt { };struct tep_event { -struct tep_handle *pevent; +struct tep_handle *tep;char *name;int id;int flags;
tools/lib/traceevent/parse-filter.c +3 -3
@@ -1531,8 +1531,8 @@ get_comm(struct tep_event *event, struct tep_record *record)const char *comm;int pid; - pid =tep_data_pid (event->pevent, record); - comm =tep_data_comm_from_pid (event->pevent, pid); + pid =tep_data_pid (event->tep, record); + comm =tep_data_comm_from_pid (event->tep, pid);return comm; }
@@ -1730,7 +1730,7 @@ static const char *get_field_str(struct tep_filter_arg *arg, struct tep_record * }else { event = arg->str.field->event; - pevent = event->pevent; + pevent = event->tep; addr =get_value (event, arg->str.field, record);if (arg->str.field->flags & (TEP_FIELD_IS_POINTER |TEP_FIELD_IS_LONG ))
tools/lib/traceevent/plugin_function.c +1 -1
@@ -126,7 +126,7 @@ static int add_and_get_index(const char *parent, const char *child, int cpu)static int function_handler (struct trace_seq *s,struct tep_record *record,struct tep_event *event,void *context) { -struct tep_handle *pevent = event->pevent; +struct tep_handle *pevent = event->tep;unsigned long long function;unsigned long long pfunction;const char *func;
tools/lib/traceevent/plugin_kmem.c +2 -2
@@ -39,11 +39,11 @@ static int call_site_handler(struct trace_seq *s, struct tep_record *record,if (tep_read_number_field (field, data, &val))return 1 ; - func =tep_find_function (event->pevent, val); + func =tep_find_function (event->tep, val);if (!func)return 1 ; - addr =tep_find_function_address (event->pevent, val); + addr =tep_find_function_address (event->tep, val);trace_seq_printf (s,"(%s+0x%x) " , func, (int )(val - addr));return 1 ;
tools/lib/traceevent/plugin_kvm.c +2 -2
@@ -389,8 +389,8 @@ static int kvm_mmu_print_role(struct trace_seq *s, struct tep_record *record,* We can only use the structure if file is of the same * endianness. */ -if (tep_is_file_bigendian (event->pevent) == -tep_is_local_bigendian (event->pevent)) { +if (tep_is_file_bigendian (event->tep) == +tep_is_local_bigendian (event->tep)) { trace_seq_printf(s, "%u q%u%s %s%s %spae %snxe %swp%s%s%s", role.level,
tools/lib/traceevent/plugin_sched_switch.c +1 -1
@@ -62,7 +62,7 @@ static void write_and_save_comm(struct tep_format_field *field, comm = &s->buffer[len];/* Help out the comm to ids. This will handle dups */ -tep_register_comm (field->event->pevent, comm, pid); +tep_register_comm (field->event->tep, comm, pid); } static int sched_wakeup_handler(struct trace_seq *s,
tools/perf/builtin-kmem.c +1 -1
@@ -1975,7 +1975,7 @@ int cmd_kmem(int argc, const char **argv) goto out_delete; } - kmem_page_size =tep_get_page_size (evsel->tp_format->pevent); + kmem_page_size =tep_get_page_size (evsel->tp_format->tep); symbol_conf.use_callchain = true; }
tools/perf/util/data-convert-bt.c +2 -2
@@ -310,7 +310,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw,if (flags &TEP_FIELD_IS_DYNAMIC ) {unsigned long long tmp_val; - tmp_val =tep_read_number (fmtf->event->pevent, + tmp_val =tep_read_number (fmtf->event->tep, data + offset, len); offset = tmp_val; len = offset >>16 ;
@@ -354,7 +354,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw,unsigned long long value_int; value_int =tep_read_number ( - fmtf->event->pevent, + fmtf->event->tep, data + offset + i * len, len);if (!(flags &TEP_FIELD_IS_SIGNED ))
tools/perf/util/python.c +1 -1
@@ -342,7 +342,7 @@ static bool is_tracepoint(struct pyrf_event *pevent)static PyObject *tracepoint_field (struct pyrf_event *pe,struct tep_format_field *field) { -struct tep_handle *pevent = field->event->pevent; +struct tep_handle *pevent = field->event->tep;void *data = pe->sample.raw_data;PyObject *ret =NULL ;unsigned long long val;
tools/perf/util/scripting-engines/trace-event-perl.c +1 -1
@@ -372,7 +372,7 @@ static void perl_process_tracepoint(struct perf_sample *sample, ns = nsecs - s *NSEC_PER_SEC ; scripting_context->event_data = data; - scripting_context->pevent = evsel->tp_format->pevent; + scripting_context->pevent = evsel->tp_format->tep;ENTER ;SAVETMPS ;
tools/perf/util/scripting-engines/trace-event-python.c +1 -1
@@ -837,7 +837,7 @@ static void python_process_tracepoint(struct perf_sample *sample, ns = nsecs - s *NSEC_PER_SEC ; scripting_context->event_data = data; - scripting_context->pevent = evsel->tp_format->pevent; + scripting_context->pevent = evsel->tp_format->tep; context =_PyCapsule_New (scripting_context,NULL ,NULL );
tools/perf/util/trace-event-parse.c +1 -1
@@ -111,7 +111,7 @@ raw_field_value(struct tep_event *event, const char *name, void *data)unsigned long long read_size (struct tep_event *event,void *ptr,int size) { -return tep_read_number (event->pevent, ptr, size); +return tep_read_number (event->tep, ptr, size); } void event_format__fprintf(struct tep_event *event,
Signature · 1 line
2.20.1
PATCH 6/8 tools/perf,tools/lib/traceevent: rename "pevent" member of struct tep_event_filter to "tep"
In reply to Tzvetomir StoyanovThis patch renames "pevent" member of the struct tep_event_filter to "tep". This makes the struct consistent with the chosen naming convention:
tep (trace event parser), instead of the old pevent.
--- tools/lib/traceevent/event-parse.h | 2 +- tools/lib/traceevent/parse-filter.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-)
tools/lib/traceevent/event-parse.h +1 -1
@@ -718,7 +718,7 @@ struct tep_filter_type {#define TEP_FILTER_ERROR_BUFSZ 1024struct tep_event_filter { -struct tep_handle *pevent; +struct tep_handle *tep;int filters;struct tep_filter_type *event_filters;char error_buffer[TEP_FILTER_ERROR_BUFSZ ];
tools/lib/traceevent/parse-filter.c +7 -7
@@ -154,7 +154,7 @@ add_filter_type(struct tep_event_filter *filter, int id) filter_type = &filter->event_filters[i]; filter_type->event_id = id; - filter_type->event =tep_find_event (filter->pevent, id); + filter_type->event =tep_find_event (filter->tep, id); filter_type->filter =NULL ; filter->filters++;
@@ -175,7 +175,7 @@ struct tep_event_filter *tep_filter_alloc(struct tep_handle *tep)return NULL ;memset (filter,0 ,sizeof (*filter)); - filter->pevent = tep; + filter->tep = tep;tep_ref (tep);return filter;
@@ -1257,7 +1257,7 @@ static void filter_init_error_buf(struct tep_event_filter *filter)enum tep_errno tep_filter_add_filter_str (struct tep_event_filter *filter,const char *filter_str) { -struct tep_handle *pevent = filter->pevent; +struct tep_handle *pevent = filter->tep;struct event_list *event;struct event_list *events =NULL ;const char *filter_start;
@@ -1380,7 +1380,7 @@ int tep_filter_strerror(struct tep_event_filter *filter, enum tep_errno err,return 0 ; } -return tep_strerror (filter->pevent, err, buf, buflen); +return tep_strerror (filter->tep, err, buf, buflen); }/**
@@ -1443,7 +1443,7 @@ void tep_filter_reset(struct tep_event_filter *filter)void tep_filter_free (struct tep_event_filter *filter) { -tep_unref (filter->pevent); +tep_unref (filter->tep);tep_filter_reset (filter);
@@ -1465,7 +1465,7 @@ static int copy_filter_type(struct tep_event_filter *filter,/* Can't assume that the pevent's are the same */ sys = filter_type->event->system; name = filter_type->event->name; - event =tep_find_event_by_name (filter->pevent, sys, name); + event =tep_find_event_by_name (filter->tep, sys, name);if (!event)return -1 ;
@@ -1875,7 +1875,7 @@ int tep_event_filtered(struct tep_event_filter *filter, int event_id)enum tep_errno tep_filter_match (struct tep_event_filter *filter,struct tep_record *record) { -struct tep_handle *pevent = filter->pevent; +struct tep_handle *pevent = filter->tep;struct tep_filter_type *filter_type;int event_id;int ret;
Signature · 1 line
2.20.1
PATCH 7/8 tools/lib/traceevent: rename input arguments and local variables of libtraceevent from pevent to tep
In reply to Tzvetomir StoyanovThis patch renames from "pevent" to "tep":
- all "pevent" input arguments of libtraceevent internal functions.
- all local "pevent" variables of libtraceevent.
This makes the implementation consistent with the chosen naming convention, tep (trace event parser), and will avoid any confusion with the old pevent name
--- tools/lib/traceevent/event-parse.c | 306 ++++++++++++------------- tools/lib/traceevent/event-plugin.c | 24 +- tools/lib/traceevent/parse-filter.c | 26 +-- tools/lib/traceevent/plugin_function.c | 6 +- 4 files changed, 181 insertions(+), 181 deletions(-)
tools/lib/traceevent/event-parse.c +153 -153
@@ -148,14 +148,14 @@ struct cmdline_list {int pid; }; -static int cmdline_init (struct tep_handle *pevent) +static int cmdline_init (struct tep_handle *tep) { -struct cmdline_list *cmdlist = pevent->cmdlist; +struct cmdline_list *cmdlist = tep->cmdlist;struct cmdline_list *item;struct tep_cmdline *cmdlines;int i; - cmdlines =malloc (sizeof (*cmdlines) * pevent->cmdline_count); + cmdlines =malloc (sizeof (*cmdlines) * tep->cmdline_count);if (!cmdlines)return -1 ;
@@ -169,15 +169,15 @@ static int cmdline_init(struct tep_handle *pevent)free (item); } -qsort (cmdlines, pevent->cmdline_count,sizeof (*cmdlines), cmdline_cmp); +qsort (cmdlines, tep->cmdline_count,sizeof (*cmdlines), cmdline_cmp); - pevent->cmdlines = cmdlines; - pevent->cmdlist =NULL ; + tep->cmdlines = cmdlines; + tep->cmdlist =NULL ;return 0 ; } -static const char *find_cmdline (struct tep_handle *pevent,int pid) +static const char *find_cmdline (struct tep_handle *tep,int pid) {const struct tep_cmdline *comm;struct tep_cmdline key;
@@ -185,13 +185,13 @@ static const char *find_cmdline(struct tep_handle *pevent, int pid)if (!pid)return "<idle>" ; -if (!pevent->cmdlines &&cmdline_init (pevent)) +if (!tep->cmdlines &&cmdline_init (tep))return "<not enough memory for cmdlines!>" ; key.pid = pid; - comm =bsearch (&key, pevent->cmdlines, pevent->cmdline_count, -sizeof (*pevent->cmdlines), cmdline_cmp); + comm =bsearch (&key, tep->cmdlines, tep->cmdline_count, +sizeof (*tep->cmdlines), cmdline_cmp);if (comm)return comm->comm;
@@ -232,10 +232,10 @@ bool tep_is_pid_registered(struct tep_handle *tep, int pid)* we must add this pid. This is much slower than when cmdlines * are added before the array is initialized. */ -static int add_new_comm (struct tep_handle *pevent, +static int add_new_comm (struct tep_handle *tep,const char *comm,int pid,bool override) { -struct tep_cmdline *cmdlines = pevent->cmdlines; +struct tep_cmdline *cmdlines = tep->cmdlines;struct tep_cmdline *cmdline;struct tep_cmdline key;char *new_comm;
@@ -246,8 +246,8 @@ static int add_new_comm(struct tep_handle *pevent,/* avoid duplicates */ key.pid = pid; - cmdline =bsearch (&key, pevent->cmdlines, pevent->cmdline_count, -sizeof (*pevent->cmdlines), cmdline_cmp); + cmdline =bsearch (&key, tep->cmdlines, tep->cmdline_count, +sizeof (*tep->cmdlines), cmdline_cmp);if (cmdline) {if (!override) { errno =EEXIST ;
@@ -264,26 +264,26 @@ static int add_new_comm(struct tep_handle *pevent,return 0 ; } - cmdlines =realloc (cmdlines,sizeof (*cmdlines) * (pevent->cmdline_count +1 )); + cmdlines =realloc (cmdlines,sizeof (*cmdlines) * (tep->cmdline_count +1 ));if (!cmdlines) { errno =ENOMEM ;return -1 ; } - cmdlines[pevent->cmdline_count].comm =strdup (comm); -if (!cmdlines[pevent->cmdline_count].comm) { + cmdlines[tep->cmdline_count].comm =strdup (comm); +if (!cmdlines[tep->cmdline_count].comm) {free (cmdlines); errno =ENOMEM ;return -1 ; } - cmdlines[pevent->cmdline_count].pid = pid; + cmdlines[tep->cmdline_count].pid = pid; -if (cmdlines[pevent->cmdline_count].comm) - pevent->cmdline_count++; +if (cmdlines[tep->cmdline_count].comm) + tep->cmdline_count++; -qsort (cmdlines, pevent->cmdline_count,sizeof (*cmdlines), cmdline_cmp); - pevent->cmdlines = cmdlines; +qsort (cmdlines, tep->cmdline_count,sizeof (*cmdlines), cmdline_cmp); + tep->cmdlines = cmdlines;return 0 ; }
@@ -408,18 +408,18 @@ static int func_bcmp(const void *a, const void *b)return 1 ; } -static int func_map_init (struct tep_handle *pevent) +static int func_map_init (struct tep_handle *tep) {struct func_list *funclist;struct func_list *item;struct func_map *func_map;int i; - func_map =malloc (sizeof (*func_map) * (pevent->func_count +1 )); + func_map =malloc (sizeof (*func_map) * (tep->func_count +1 ));if (!func_map)return -1 ; - funclist = pevent->funclist; + funclist = tep->funclist; i =0 ;while (funclist) {
@@ -432,34 +432,34 @@ static int func_map_init(struct tep_handle *pevent)free (item); } -qsort (func_map, pevent->func_count,sizeof (*func_map), func_cmp); +qsort (func_map, tep->func_count,sizeof (*func_map), func_cmp);/* * Add a special record at the end. */ - func_map[pevent->func_count].func =NULL ; - func_map[pevent->func_count].addr =0 ; - func_map[pevent->func_count].mod =NULL ; + func_map[tep->func_count].func =NULL ; + func_map[tep->func_count].addr =0 ; + func_map[tep->func_count].mod =NULL ; - pevent->func_map = func_map; - pevent->funclist =NULL ; + tep->func_map = func_map; + tep->funclist =NULL ;return 0 ; }static struct func_map * -__find_func (struct tep_handle *pevent,unsigned long long addr) +__find_func (struct tep_handle *tep,unsigned long long addr) {struct func_map *func;struct func_map key; -if (!pevent->func_map) -func_map_init (pevent); +if (!tep->func_map) +func_map_init (tep); key.addr = addr; - func =bsearch (&key, pevent->func_map, pevent->func_count, -sizeof (*pevent->func_map), func_bcmp); + func =bsearch (&key, tep->func_map, tep->func_count, +sizeof (*tep->func_map), func_bcmp);return func; }
@@ -510,18 +510,18 @@ void tep_reset_function_resolver(struct tep_handle *tep) }static struct func_map * -find_func (struct tep_handle *pevent,unsigned long long addr) +find_func (struct tep_handle *tep,unsigned long long addr) {struct func_map *map; -if (!pevent->func_resolver) -return __find_func (pevent, addr); +if (!tep->func_resolver) +return __find_func (tep, addr); - map = &pevent->func_resolver->map; + map = &tep->func_resolver->map; map->mod =NULL ; map->addr = addr; - map->func = pevent->func_resolver->func (pevent->func_resolver->priv, - &map->addr, &map->mod); + map->func = tep->func_resolver->func (tep->func_resolver->priv, + &map->addr, &map->mod);if (map->func ==NULL )return NULL ;
@@ -662,18 +662,18 @@ static int printk_cmp(const void *a, const void *b)return 0 ; } -static int printk_map_init (struct tep_handle *pevent) +static int printk_map_init (struct tep_handle *tep) {struct printk_list *printklist;struct printk_list *item;struct printk_map *printk_map;int i; - printk_map =malloc (sizeof (*printk_map) * (pevent->printk_count +1 )); + printk_map =malloc (sizeof (*printk_map) * (tep->printk_count +1 ));if (!printk_map)return -1 ; - printklist = pevent->printklist; + printklist = tep->printklist; i =0 ;while (printklist) {
@@ -685,27 +685,27 @@ static int printk_map_init(struct tep_handle *pevent)free (item); } -qsort (printk_map, pevent->printk_count,sizeof (*printk_map), printk_cmp); +qsort (printk_map, tep->printk_count,sizeof (*printk_map), printk_cmp); - pevent->printk_map = printk_map; - pevent->printklist =NULL ; + tep->printk_map = printk_map; + tep->printklist =NULL ;return 0 ; }static struct printk_map * -find_printk (struct tep_handle *pevent,unsigned long long addr) +find_printk (struct tep_handle *tep,unsigned long long addr) {struct printk_map *printk;struct printk_map key; -if (!pevent->printk_map &&printk_map_init (pevent)) +if (!tep->printk_map &&printk_map_init (tep))return NULL ; key.addr = addr; - printk =bsearch (&key, pevent->printk_map, pevent->printk_count, -sizeof (*pevent->printk_map), printk_cmp); + printk =bsearch (&key, tep->printk_map, tep->printk_count, +sizeof (*tep->printk_map), printk_cmp);return printk; }
@@ -782,29 +782,29 @@ static struct tep_event *alloc_event(void)return calloc (1 ,sizeof (struct tep_event )); } -static int add_event (struct tep_handle *pevent,struct tep_event *event) +static int add_event (struct tep_handle *tep,struct tep_event *event) {int i; -struct tep_event **events =realloc (pevent->events,sizeof (event) * - (pevent->nr_events +1 )); +struct tep_event **events =realloc (tep->events,sizeof (event) * + (tep->nr_events +1 ));if (!events)return -1 ; - pevent->events = events; + tep->events = events; -for (i =0 ; i < pevent->nr_events; i++) { -if (pevent->events[i]->id > event->id) +for (i =0 ; i < tep->nr_events; i++) { +if (tep->events[i]->id > event->id)break ; } -if (i < pevent->nr_events) -memmove (&pevent->events[i +1 ], - &pevent->events[i], -sizeof (event) * (pevent->nr_events - i)); +if (i < tep->nr_events) +memmove (&tep->events[i +1 ], + &tep->events[i], +sizeof (event) * (tep->nr_events - i)); - pevent->events[i] = event; - pevent->nr_events++; + tep->events[i] = event; + tep->nr_events++; - event->tep = pevent; + event->tep = tep;return 0 ; }
@@ -2941,14 +2941,14 @@ process_bitmask(struct tep_event *event __maybe_unused, struct tep_print_arg *ar }static struct tep_function_handler * -find_func_handler (struct tep_handle *pevent,char *func_name) +find_func_handler (struct tep_handle *tep,char *func_name) {struct tep_function_handler *func; -if (!pevent) +if (!tep)return NULL ; -for (func = pevent->func_handlers; func; func = func->next) { +for (func = tep->func_handlers; func; func = func->next) {if (strcmp (func->name, func_name) ==0 )break ; }
@@ -2956,12 +2956,12 @@ find_func_handler(struct tep_handle *pevent, char *func_name)return func; } -static void remove_func_handler (struct tep_handle *pevent,char *func_name) +static void remove_func_handler (struct tep_handle *tep,char *func_name) {struct tep_function_handler *func;struct tep_function_handler **next; - next = &pevent->func_handlers; + next = &tep->func_handlers;while ((func = *next)) {if (strcmp (func->name, func_name) ==0 ) { *next = func->next;
@@ -3413,7 +3413,7 @@ int tep_read_number_field(struct tep_format_field *field, const void *data, } } -static int get_common_info (struct tep_handle *pevent, +static int get_common_info (struct tep_handle *tep,const char *type,int *offset,int *size) {struct tep_event *event;
@@ -3423,12 +3423,12 @@ static int get_common_info(struct tep_handle *pevent,* All events should have the same common elements. * Pick any event to find where the type is; */ -if (!pevent->events) { +if (!tep->events) {do_warning ("no event_list!" );return -1 ; } - event = pevent->events[0 ]; + event = tep->events[0 ]; field =tep_find_common_field (event, type);if (!field)return -1 ;
@@ -3439,58 +3439,58 @@ static int get_common_info(struct tep_handle *pevent,return 0 ; } -static int __parse_common (struct tep_handle *pevent,void *data, +static int __parse_common (struct tep_handle *tep,void *data,int *size,int *offset,const char *name) {int ret;if (!*size) { - ret =get_common_info (pevent, name, offset, size); + ret =get_common_info (tep, name, offset, size);if (ret <0 )return ret; } -return tep_read_number (pevent, data + *offset, *size); +return tep_read_number (tep, data + *offset, *size); } -static int trace_parse_common_type (struct tep_handle *pevent,void *data) +static int trace_parse_common_type (struct tep_handle *tep,void *data) { -return __parse_common (pevent, data, - &pevent->type_size, &pevent->type_offset, +return __parse_common (tep, data, + &tep->type_size, &tep->type_offset,"common_type" ); } -static int parse_common_pid (struct tep_handle *pevent,void *data) +static int parse_common_pid (struct tep_handle *tep,void *data) { -return __parse_common (pevent, data, - &pevent->pid_size, &pevent->pid_offset, +return __parse_common (tep, data, + &tep->pid_size, &tep->pid_offset,"common_pid" ); } -static int parse_common_pc (struct tep_handle *pevent,void *data) +static int parse_common_pc (struct tep_handle *tep,void *data) { -return __parse_common (pevent, data, - &pevent->pc_size, &pevent->pc_offset, +return __parse_common (tep, data, + &tep->pc_size, &tep->pc_offset,"common_preempt_count" ); } -static int parse_common_flags (struct tep_handle *pevent,void *data) +static int parse_common_flags (struct tep_handle *tep,void *data) { -return __parse_common (pevent, data, - &pevent->flags_size, &pevent->flags_offset, +return __parse_common (tep, data, + &tep->flags_size, &tep->flags_offset,"common_flags" ); } -static int parse_common_lock_depth (struct tep_handle *pevent,void *data) +static int parse_common_lock_depth (struct tep_handle *tep,void *data) { -return __parse_common (pevent, data, - &pevent->ld_size, &pevent->ld_offset, +return __parse_common (tep, data, + &tep->ld_size, &tep->ld_offset,"common_lock_depth" ); } -static int parse_common_migrate_disable (struct tep_handle *pevent,void *data) +static int parse_common_migrate_disable (struct tep_handle *tep,void *data) { -return __parse_common (pevent, data, - &pevent->ld_size, &pevent->ld_offset, +return __parse_common (tep, data, + &tep->ld_size, &tep->ld_offset,"common_migrate_disable" ); }
@@ -3566,7 +3566,7 @@ tep_find_event_by_name(struct tep_handle *tep,static unsigned long long eval_num_arg (void *data,int size,struct tep_event *event,struct tep_print_arg *arg) { -struct tep_handle *pevent = event->tep; +struct tep_handle *tep = event->tep;unsigned long long val =0 ;unsigned long long left, right;struct tep_print_arg *typearg =NULL ;
@@ -3588,7 +3588,7 @@ eval_num_arg(void *data, int size, struct tep_event *event, struct tep_print_arg }/* must be a number */ - val =tep_read_number (pevent, data + arg->field.field->offset, + val =tep_read_number (tep, data + arg->field.field->offset, arg->field.field->size);break ;case TEP_PRINT_FLAGS :
@@ -3628,11 +3628,11 @@ eval_num_arg(void *data, int size, struct tep_event *event, struct tep_print_arg }/* Default to long size */ - field_size = pevent->long_size; + field_size = tep->long_size;switch (larg->type) {case TEP_PRINT_DYNAMIC_ARRAY : - offset =tep_read_number (pevent, + offset =tep_read_number (tep, data + larg->dynarray.field->offset, larg->dynarray.field->size);if (larg->dynarray.field->elementsize)
@@ -3661,7 +3661,7 @@ eval_num_arg(void *data, int size, struct tep_event *event, struct tep_print_argdefault : goto default_op;/* oops, all bets off */ } - val =tep_read_number (pevent, + val =tep_read_number (tep, data + offset, field_size);if (typearg) val =eval_type (val, typearg,1 );
@@ -3762,7 +3762,7 @@ eval_num_arg(void *data, int size, struct tep_event *event, struct tep_print_arg }break ;case TEP_PRINT_DYNAMIC_ARRAY_LEN : - offset =tep_read_number (pevent, + offset =tep_read_number (tep, data + arg->dynarray.field->offset, arg->dynarray.field->size);/*
@@ -3774,7 +3774,7 @@ eval_num_arg(void *data, int size, struct tep_event *event, struct tep_print_argbreak ;case TEP_PRINT_DYNAMIC_ARRAY :/* Without [], we pass the address to the dynamic data */ - offset =tep_read_number (pevent, + offset =tep_read_number (tep, data + arg->dynarray.field->offset, arg->dynarray.field->size);/*
@@ -3849,7 +3849,7 @@ static void print_str_to_seq(struct trace_seq *s, const char *format,trace_seq_printf (s, format, str); } -static void print_bitmask_to_seq (struct tep_handle *pevent, +static void print_bitmask_to_seq (struct tep_handle *tep,struct trace_seq *s,const char *format,int len_arg,const void *data,int size) {
@@ -3881,7 +3881,7 @@ static void print_bitmask_to_seq(struct tep_handle *pevent,* In the kernel, this is an array of long words, thus * endianness is very important. */ -if (pevent->file_bigendian) +if (tep->file_bigendian) index = size - (len +1 );else index = len;
@@ -3907,7 +3907,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, struct tep_event *event, const char *format, int len_arg, struct tep_print_arg *arg) { - struct tep_handle *pevent = event->tep; + struct tep_handle *tep = event->tep;struct tep_print_flag_sym *flag;struct tep_format_field *field;struct printk_map *printk;
@@ -3944,7 +3944,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,* is a pointer. */ if (!(field->flags &TEP_FIELD_IS_ARRAY ) && - field->size == pevent->long_size) { + field->size == tep->long_size) {/* Handle heterogeneous recording and processing * architectures
@@ -3959,12 +3959,12 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,* on 32-bit devices: * In this case, 64 bits must be read. */ - addr = (pevent->long_size ==8 ) ? + addr = (tep->long_size ==8 ) ? *(unsigned long long *)(data + field->offset) : (unsigned long long )*(unsigned int *)(data + field->offset);/* Check if it matches a print format */ - printk =find_printk (pevent, addr); + printk =find_printk (tep, addr);if (printk)trace_seq_puts (s, printk->printk);else
@@ -4021,7 +4021,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,case TEP_PRINT_HEX_STR :if (arg->hex.field->type ==TEP_PRINT_DYNAMIC_ARRAY ) {unsigned long offset; - offset =tep_read_number (pevent, + offset =tep_read_number (tep, data + arg->hex.field->dynarray.field->offset, arg->hex.field->dynarray.field->size); hex = data + (offset &0xffff );
@@ -4052,7 +4052,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,unsigned long offset;struct tep_format_field *field = arg->int_array.field->dynarray.field; - offset =tep_read_number (pevent, + offset =tep_read_number (tep, data + field->offset, field->size); num = data + (offset &0xffff );
@@ -4103,7 +4103,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, f =tep_find_any_field (event, arg->string.string); arg->string.offset = f->offset; } - str_offset =tep_data2host4 (pevent, *(unsigned int *)(data + arg->string.offset)); + str_offset =tep_data2host4 (tep, *(unsigned int *)(data + arg->string.offset)); str_offset &=0xffff ;print_str_to_seq (s, format, len_arg, ((char *)data) + str_offset);break ;
@@ -4121,10 +4121,10 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, f =tep_find_any_field (event, arg->bitmask.bitmask); arg->bitmask.offset = f->offset; } - bitmask_offset =tep_data2host4 (pevent, *(unsigned int *)(data + arg->bitmask.offset)); + bitmask_offset =tep_data2host4 (tep, *(unsigned int *)(data + arg->bitmask.offset)); bitmask_size = bitmask_offset >>16 ; bitmask_offset &=0xffff ; -print_bitmask_to_seq (pevent, s, format, len_arg, +print_bitmask_to_seq (tep, s, format, len_arg, data + bitmask_offset, bitmask_size);break ; }
@@ -4256,7 +4256,7 @@ static void free_args(struct tep_print_arg *args)static struct tep_print_arg *make_bprint_args (char *fmt,void *data,int size,struct tep_event *event) { -struct tep_handle *pevent = event->tep; +struct tep_handle *tep = event->tep;struct tep_format_field *field, *ip_field;struct tep_print_arg *args, *arg, **next;unsigned long long ip, val;
@@ -4264,8 +4264,8 @@ static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, svoid *bptr;int vsize =0 ; - field = pevent->bprint_buf_field; - ip_field = pevent->bprint_ip_field; + field = tep->bprint_buf_field; + ip_field = tep->bprint_ip_field;if (!field) { field =tep_find_field (event,"buf" );
@@ -4278,11 +4278,11 @@ static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, sdo_warning_event (event,"can't find ip field for binary printk" );return NULL ; } - pevent->bprint_buf_field = field; - pevent->bprint_ip_field = ip_field; + tep->bprint_buf_field = field; + tep->bprint_ip_field = ip_field; } - ip =tep_read_number (pevent, data + ip_field->offset, ip_field->size); + ip =tep_read_number (tep, data + ip_field->offset, ip_field->size);/* * The first arg is the IP pointer.
@@ -4359,7 +4359,7 @@ static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, s vsize =4 ;break ;case 1 : - vsize = pevent->long_size; + vsize = tep->long_size;break ;case 2 : vsize =8 ;
@@ -4376,7 +4376,7 @@ static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, s/* the pointers are always 4 bytes aligned */ bptr = (void *)(((unsigned long )bptr +3 ) & ~3 ); - val =tep_read_number (pevent, bptr, vsize); + val =tep_read_number (tep, bptr, vsize); bptr += vsize; arg =alloc_arg ();if (!arg) {
@@ -4433,13 +4433,13 @@ static char * get_bprint_format(void *data, int size __maybe_unused, struct tep_event *event) { -struct tep_handle *pevent = event->tep; +struct tep_handle *tep = event->tep;unsigned long long addr;struct tep_format_field *field;struct printk_map *printk;char *format; - field = pevent->bprint_fmt_field; + field = tep->bprint_fmt_field;if (!field) { field =tep_find_field (event,"fmt" );
@@ -4447,12 +4447,12 @@ get_bprint_format(void *data, int size __maybe_unused,do_warning_event (event,"can't find format field for binary printk" );return NULL ; } - pevent->bprint_fmt_field = field; + tep->bprint_fmt_field = field; } - addr =tep_read_number (pevent, data + field->offset, field->size); + addr =tep_read_number (tep, data + field->offset, field->size); - printk =find_printk (pevent, addr); + printk =find_printk (tep, addr);if (!printk) {if (asprintf (&format,"%%pf: (NO FORMAT FOUND at %llx)\n" , addr) <0 )return NULL ;
@@ -4834,13 +4834,13 @@ void tep_print_field(struct trace_seq *s, void *data, {unsigned long long val;unsigned int offset, len, i; -struct tep_handle *pevent = field->event->tep; +struct tep_handle *tep = field->event->tep;if (field->flags &TEP_FIELD_IS_ARRAY ) { offset = field->offset; len = field->size;if (field->flags &TEP_FIELD_IS_DYNAMIC ) { - val =tep_read_number (pevent, data + offset, len); + val =tep_read_number (tep, data + offset, len); offset = val; len = offset >>16 ; offset &=0xffff ;
@@ -4860,7 +4860,7 @@ void tep_print_field(struct trace_seq *s, void *data, field->flags &= ~TEP_FIELD_IS_STRING ; } }else { - val =tep_read_number (pevent, data + field->offset, + val =tep_read_number (tep, data + field->offset, field->size);if (field->flags &TEP_FIELD_IS_POINTER ) {trace_seq_printf (s,"0x%llx" , val);
@@ -4909,7 +4909,7 @@ void tep_print_fields(struct trace_seq *s, void *data,static void pretty_print (struct trace_seq *s,void *data,int size,struct tep_event *event) { -struct tep_handle *pevent = event->tep; +struct tep_handle *tep = event->tep;struct tep_print_fmt *print_fmt = &event->print_fmt;struct tep_print_arg *arg = print_fmt->args;struct tep_print_arg *args =NULL ;
@@ -5001,7 +5001,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_ecase '-' : goto cont_process;case 'p' : -if (pevent->long_size ==4 ) +if (tep->long_size ==4 ) ls =1 ;else ls =2 ;
@@ -5062,7 +5062,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_e arg = arg->next;if (show_func) { - func =find_func (pevent, val); + func =find_func (tep, val);if (func) {trace_seq_puts (s, func->func);if (show_func =='F' )
@@ -5072,7 +5072,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_ebreak ; } } -if (pevent->long_size ==8 && ls ==1 && +if (tep->long_size ==8 && ls ==1 &&sizeof (long ) !=8 ) {char *p;
@@ -5319,14 +5319,14 @@ const char *tep_data_comm_from_pid(struct tep_handle *tep, int pid) }static struct tep_cmdline * -pid_from_cmdlist (struct tep_handle *pevent,const char *comm,struct tep_cmdline *next) +pid_from_cmdlist (struct tep_handle *tep,const char *comm,struct tep_cmdline *next) {struct cmdline_list *cmdlist = (struct cmdline_list *)next;if (cmdlist) cmdlist = cmdlist->next;else - cmdlist = pevent->cmdlist; + cmdlist = tep->cmdlist;while (cmdlist &&strcmp (cmdlist->comm, comm) !=0 ) cmdlist = cmdlist->next;
@@ -6012,11 +6012,11 @@ static void free_handler(struct event_handler *handle)free (handle); } -static int find_event_handle (struct tep_handle *pevent,struct tep_event *event) +static int find_event_handle (struct tep_handle *tep,struct tep_event *event) {struct event_handler *handle, **next; -for (next = &pevent->handlers; *next; +for (next = &tep->handlers; *next; next = &(*next)->next) { handle = *next; if (event_matches(event, handle->id,
@@ -6054,7 +6054,7 @@ static int find_event_handle(struct tep_handle *pevent, struct tep_event *event)* /sys/kernel/debug/tracing/events/.../.../format */ enum tep_errno __tep_parse_format (struct tep_event **eventp, -struct tep_handle *pevent,const char *buf, +struct tep_handle *tep,const char *buf,unsigned long size,const char *sys) {struct tep_event *event;
@@ -6096,8 +6096,8 @@ enum tep_errno __tep_parse_format(struct tep_event **eventp, goto event_alloc_failed; } -/* Add pevent to event so that it can be referenced */ - event->tep = pevent; +/* Add tep to event so that it can be referenced */ + event->tep = tep; ret =event_read_format (event);if (ret <0 ) {
@@ -6109,7 +6109,7 @@ enum tep_errno __tep_parse_format(struct tep_event **eventp,* If the event has an override, don't print warnings if the event * print format fails to parse. */ -if (pevent &&find_event_handle (pevent, event)) +if (tep &&find_event_handle (tep, event)) show_warning =0 ; ret =event_read_print (event);
@@ -6161,18 +6161,18 @@ enum tep_errno __tep_parse_format(struct tep_event **eventp, }static enum tep_errno -__parse_event (struct tep_handle *pevent, +__parse_event (struct tep_handle *tep,struct tep_event **eventp,const char *buf,unsigned long size,const char *sys) { -int ret =__tep_parse_format (eventp, pevent, buf, size, sys); +int ret =__tep_parse_format (eventp, tep, buf, size, sys);struct tep_event *event = *eventp;if (event ==NULL )return ret; -if (pevent &&add_event (pevent, event)) { +if (tep &&add_event (tep, event)) { ret =TEP_ERRNO__MEM_ALLOC_FAILED ; goto event_add_failed; }
@@ -6432,7 +6432,7 @@ int tep_print_func_field(struct trace_seq *s, const char *fmt, struct tep_record *record, int err) {struct tep_format_field *field =tep_find_field (event, name); -struct tep_handle *pevent = event->tep; +struct tep_handle *tep = event->tep;unsigned long long val;struct func_map *func;char tmp[128 ];
@@ -6443,7 +6443,7 @@ int tep_print_func_field(struct trace_seq *s, const char *fmt,if (tep_read_number_field (field, record->data, &val)) goto failed; - func =find_func (pevent, val); + func =find_func (tep, val);if (func)snprintf (tmp,128 ,"%s/0x%llx" , func->func, func->addr - val);
@@ -6588,7 +6588,7 @@ int tep_unregister_print_function(struct tep_handle *tep,return -1 ; } -static struct tep_event *search_event (struct tep_handle *pevent,int id, +static struct tep_event *search_event (struct tep_handle *tep,int id,const char *sys_name,const char *event_name) {
@@ -6596,7 +6596,7 @@ static struct tep_event *search_event(struct tep_handle *pevent, int id,if (id >=0 ) {/* search by id */ - event =tep_find_event (pevent, id); + event =tep_find_event (tep, id);if (!event)return NULL ;if (event_name && (strcmp (event_name, event->name) !=0 ))
@@ -6604,7 +6604,7 @@ static struct tep_event *search_event(struct tep_handle *pevent, int id,if (sys_name && (strcmp (sys_name, event->system) !=0 ))return NULL ; }else { - event =tep_find_event_by_name (pevent, sys_name, event_name); + event =tep_find_event_by_name (tep, sys_name, event_name);if (!event)return NULL ; }
@@ -6761,14 +6761,14 @@ int tep_unregister_event_handler(struct tep_handle *tep, int id,*/ struct tep_handle *tep_alloc (void ) { -struct tep_handle *pevent =calloc (1 ,sizeof (*pevent)); +struct tep_handle *tep =calloc (1 ,sizeof (*tep)); -if (pevent) { - pevent->ref_count =1 ; - pevent->host_bigendian =tep_is_bigendian (); +if (tep) { + tep->ref_count =1 ; + tep->host_bigendian =tep_is_bigendian (); } -return pevent; +return tep; }void tep_ref (struct tep_handle *tep)
tools/lib/traceevent/event-plugin.c +12 -12
@@ -269,7 +269,7 @@ void tep_print_plugins(struct trace_seq *s, }static void -load_plugin (struct tep_handle *pevent,const char *path, +load_plugin (struct tep_handle *tep,const char *path,const char *file,void *data) {struct tep_plugin_list **plugin_list = data;
@@ -316,7 +316,7 @@ load_plugin(struct tep_handle *pevent, const char *path, *plugin_list = list;pr_stat ("registering plugin: %s" , plugin); -func (pevent); +func (tep);return ; out_free:
@@ -324,9 +324,9 @@ load_plugin(struct tep_handle *pevent, const char *path, } static void -load_plugins_dir(struct tep_handle *pevent, const char *suffix, +load_plugins_dir(struct tep_handle *tep, const char *suffix, const char *path, - void (*load_plugin)(struct tep_handle *pevent, + void (*load_plugin)(struct tep_handle *tep, const char *path, const char *name, void *data),
@@ -359,15 +359,15 @@ load_plugins_dir(struct tep_handle *pevent, const char *suffix,if (strcmp (name + (strlen (name) -strlen (suffix)), suffix) !=0 )continue ; -load_plugin (pevent, path, name, data); +load_plugin (tep, path, name, data); }closedir (dir); } static void -load_plugins(struct tep_handle *pevent, const char *suffix, - void (*load_plugin)(struct tep_handle *pevent, +load_plugins(struct tep_handle *tep, const char *suffix, + void (*load_plugin)(struct tep_handle *tep, const char *path, const char *name, void *data),
@@ -378,7 +378,7 @@ load_plugins(struct tep_handle *pevent, const char *suffix,char *envdir;int ret; -if (pevent->flags &TEP_DISABLE_PLUGINS ) +if (tep->flags &TEP_DISABLE_PLUGINS )return ;/*
@@ -386,8 +386,8 @@ load_plugins(struct tep_handle *pevent, const char *suffix,* check that first. */ #ifdef PLUGIN_DIR -if (!(pevent->flags &TEP_DISABLE_SYS_PLUGINS )) -load_plugins_dir (pevent, suffix,PLUGIN_DIR , +if (!(tep->flags &TEP_DISABLE_SYS_PLUGINS )) +load_plugins_dir (tep, suffix,PLUGIN_DIR , load_plugin, data);#endif
@@ -397,7 +397,7 @@ load_plugins(struct tep_handle *pevent, const char *suffix,*/ envdir =getenv ("TRACEEVENT_PLUGIN_DIR" );if (envdir) -load_plugins_dir (pevent, suffix, envdir, load_plugin, data); +load_plugins_dir (tep, suffix, envdir, load_plugin, data);/* * Now let the home directory override the environment
@@ -413,7 +413,7 @@ load_plugins(struct tep_handle *pevent, const char *suffix,return ; } -load_plugins_dir (pevent, suffix, path, load_plugin, data); +load_plugins_dir (tep, suffix, path, load_plugin, data);free (path); }
tools/lib/traceevent/parse-filter.c +13 -13
@@ -256,7 +256,7 @@ static int event_match(struct tep_event *event, }static enum tep_errno -find_event (struct tep_handle *pevent,struct event_list **events, +find_event (struct tep_handle *tep,struct event_list **events,char *sys_name,char *event_name) {struct tep_event *event;
@@ -299,8 +299,8 @@ find_event(struct tep_handle *pevent, struct event_list **events, } } -for (i =0 ; i < pevent->nr_events; i++) { - event = pevent->events[i]; +for (i =0 ; i < tep->nr_events; i++) { + event = tep->events[i];if (event_match (event, sys_name ? &sreg :NULL , &ereg)) { match =1 ;if (add_event (events, event) <0 ) {
@@ -1257,7 +1257,7 @@ static void filter_init_error_buf(struct tep_event_filter *filter)enum tep_errno tep_filter_add_filter_str (struct tep_event_filter *filter,const char *filter_str) { -struct tep_handle *pevent = filter->tep; +struct tep_handle *tep = filter->tep;struct event_list *event;struct event_list *events =NULL ;const char *filter_start;
@@ -1313,7 +1313,7 @@ enum tep_errno tep_filter_add_filter_str(struct tep_event_filter *filter, }/* Find this event */ - ret =find_event (pevent, &events,strim (sys_name),strim (event_name)); + ret =find_event (tep, &events,strim (sys_name),strim (event_name));if (ret <0 ) {free_events (events);free (this_event);
@@ -1334,7 +1334,7 @@ enum tep_errno tep_filter_add_filter_str(struct tep_event_filter *filter,if (ret <0 ) rtn = ret; -if (ret >=0 && pevent->test_filters) { +if (ret >=0 && tep->test_filters) {char *test; test =tep_filter_make_string (filter, event->event->id);if (test) {
@@ -1346,7 +1346,7 @@ enum tep_errno tep_filter_add_filter_str(struct tep_event_filter *filter,free_events (events); -if (rtn >=0 && pevent->test_filters) +if (rtn >=0 && tep->test_filters)exit (0 );return rtn;
@@ -1462,7 +1462,7 @@ static int copy_filter_type(struct tep_event_filter *filter,const char *name;char *str; -/* Can't assume that the pevent's are the same */ +/* Can't assume that the tep's are the same */ sys = filter_type->event->system; name = filter_type->event->name; event =tep_find_event_by_name (filter->tep, sys, name);
@@ -1700,7 +1700,7 @@ static int test_num(struct tep_event *event, struct tep_filter_arg *arg,static const char *get_field_str (struct tep_filter_arg *arg,struct tep_record *record) {struct tep_event *event; -struct tep_handle *pevent; +struct tep_handle *tep;unsigned long long addr;const char *val =NULL ;unsigned int size;
@@ -1730,12 +1730,12 @@ static const char *get_field_str(struct tep_filter_arg *arg, struct tep_record * }else { event = arg->str.field->event; - pevent = event->tep; + tep = event->tep; addr =get_value (event, arg->str.field, record);if (arg->str.field->flags & (TEP_FIELD_IS_POINTER |TEP_FIELD_IS_LONG ))/* convert to a kernel symbol */ - val =tep_find_function (pevent, addr); + val =tep_find_function (tep, addr);if (val ==NULL ) {/* just use the hex of the string name */
@@ -1875,7 +1875,7 @@ int tep_event_filtered(struct tep_event_filter *filter, int event_id)enum tep_errno tep_filter_match (struct tep_event_filter *filter,struct tep_record *record) { -struct tep_handle *pevent = filter->tep; +struct tep_handle *tep = filter->tep;struct tep_filter_type *filter_type;int event_id;int ret;
@@ -1886,7 +1886,7 @@ enum tep_errno tep_filter_match(struct tep_event_filter *filter,if (!filter->filters)return TEP_ERRNO__NO_FILTER ; - event_id =tep_data_type (pevent, record); + event_id =tep_data_type (tep, record); filter_type =find_filter_type (filter, event_id);if (!filter_type)
tools/lib/traceevent/plugin_function.c +3 -3
@@ -126,7 +126,7 @@ static int add_and_get_index(const char *parent, const char *child, int cpu)static int function_handler (struct trace_seq *s,struct tep_record *record,struct tep_event *event,void *context) { -struct tep_handle *pevent = event->tep; +struct tep_handle *tep = event->tep;unsigned long long function;unsigned long long pfunction;const char *func;
@@ -136,12 +136,12 @@ static int function_handler(struct trace_seq *s, struct tep_record *record,if (tep_get_field_val (s, event,"ip" , record, &function,1 ))return trace_seq_putc (s,'!' ); - func =tep_find_function (pevent, function); + func =tep_find_function (tep, function);if (tep_get_field_val (s, event,"parent_ip" , record, &pfunction,1 ))return trace_seq_putc (s,'!' ); - parent =tep_find_function (pevent, pfunction); + parent =tep_find_function (tep, pfunction);if (parent && ftrace_indent->set) index =add_and_get_index (parent, func, record->cpu);
Signature · 1 line
2.20.1
PATCH 8/8 tools/lib/traceevent: remove call to exit() from tep_filter_add_filter_str()
In reply to Tzvetomir StoyanovThis patch removes call to exit() from tep_filter_add_filter_str(). A library function should not force the application to exit. In the current implementation tep_filter_add_filter_str() calls exit() when a special "test_filters" mode is set, used only for debugging purposes. When this mode is set and a filter is added - its string is printed to the console and exit() is called. This patch changes the logic - when in "test_filters" mode, the filter string is still printed, but the exit() is not called. It is up to the application to track when "test_filters" mode is set and to call exit, if needed.
--- tools/lib/traceevent/parse-filter.c | 3 --- 1 file changed, 3 deletions(-)
tools/lib/traceevent/parse-filter.c +0 -3
@@ -1346,9 +1346,6 @@ enum tep_errno tep_filter_add_filter_str(struct tep_event_filter *filter,free_events (events); -if (rtn >=0 && tep->test_filters) -exit (0 ); -return rtn; }
Signature · 1 line
2.20.1
Steven Rostedt
AppliedRe: [PATCH 8/8] tools/lib/traceevent: remove call to exit() from tep_filter_add_filter_str()
Quoted 8 lines · On Tue, 26 Mar 2019 17:43:28 +0200 Tzvetomir Stoyanov <[email protected]>…
This patch removes call to
exit()fromtep_filter_add_filter_str(). A library function should not force the application to exit. In the current implementationtep_filter_add_filter_str()callsexit()when a special "test_filters" mode is set, used only for debugging purposes. When this mode is set and a filter is added - its string is printed to the console andexit()is called. This patch changes the logic - when in "test_filters" mode, the filter string is still printed, but theexit()is not called. It is up to the application to track when "test_filters" mode is set and to call exit, if needed.
I applied this one too (after changing tep back to pevent so that it will apply without the other patches).
I'll start testing these and then send them to Arnaldo when complete.
Thanks!
-- Steve
Quoted 20 lines
Signed-off-by Tzvetomir Stoyanov <[email protected]>--- tools/lib/traceevent/parse-filter.c | 3 --- 1 file changed, 3 deletions(-)tools/lib/traceevent/parse-filter.c +0
-3@@ -1346,9 +1346,6 @@ enum tep_errno tep_filter_add_filter_str(struct tep_event_filter *filter,free_events (events); -if (rtn >=0 && tep->test_filters) -exit (0 ); -return rtn; }
v2 cover Cleanup traceevent API and make it more consistent
[
v2 changes:
- Excluded patches:
"tools/lib/traceevent: Remove tep filter trivial APIs" "tools/lib/traceevent: remove call to exit() from tep_filter_add_filter_str()"
from the series, as they are already merged.
- Dropped patch "tools/lib/traceevent: Add counter to track parsing failures", this functionality will not be part of the traceevent library. Applications should track parsing failures themselves.
- Few minor changes, to address Steven Rostedt comments
]
This patch series does a cleanup of traceevent implementation and APIs:
- All "pevent" function parameters and local variables are renamed to "tep". This makes the implementation consistent with the chosen naming convention, tep (trace event parser), and avoids any confusion with the old "pevent" name.
- Renamed a bunch of tracevent APIs, to make names consistent and descriptive.
- Unified all tep_is_... APIs to return bool value, instead of int.
Changes depend on "Few patches, related to libtracevent APIs" patchset and should be applied on top of it.
Tzvetomir Stoyanov (5):
tools/perf,tools/lib/traceevent: Make traceevent APIs more consistent tools/lib/traceevent: Rename input arguments of libtraceevent APIs
from pevent to tep
tools/perf,tools/lib/traceevent: Rename "pevent" member of struct
tep_event to "tep"
tools/perf,tools/lib/traceevent: Rename "pevent" member of struct
tep_event_filter to "tep"
tools/lib/traceevent: Rename input arguments and local variables of
libtraceevent from pevent to tep
tools/lib/traceevent/event-parse-api.c | 152 ++-- tools/lib/traceevent/event-parse-local.h | 6 +- tools/lib/traceevent/event-parse.c | 811 +++++++++--------- tools/lib/traceevent/event-parse.h | 130 +-- tools/lib/traceevent/event-plugin.c | 32 +- tools/lib/traceevent/parse-filter.c | 46 +- tools/lib/traceevent/plugin_cfg80211.c | 8 +- tools/lib/traceevent/plugin_function.c | 14 +- tools/lib/traceevent/plugin_hrtimer.c | 12 +- tools/lib/traceevent/plugin_jbd2.c | 12 +- tools/lib/traceevent/plugin_kmem.c | 32 +- tools/lib/traceevent/plugin_kvm.c | 48 +- tools/lib/traceevent/plugin_mac80211.c | 8 +- tools/lib/traceevent/plugin_sched_switch.c | 18 +- tools/lib/traceevent/plugin_scsi.c | 8 +- tools/lib/traceevent/plugin_xen.c | 8 +- tools/perf/builtin-kmem.c | 2 +- tools/perf/util/data-convert-bt.c | 4 +- tools/perf/util/python.c | 2 +- .../util/scripting-engines/trace-event-perl.c | 2 +- .../scripting-engines/trace-event-python.c | 2 +- tools/perf/util/trace-event-parse.c | 2 +- tools/perf/util/trace-event-read.c | 2 +- tools/perf/util/trace-event.c | 4 +- 24 files changed, 682 insertions(+), 683 deletions(-)
Signature · 1 line
2.20.1
PATCH v2 1/5 tools/perf,tools/lib/traceevent: Make traceevent APIs more consistent
Rename some traceevent APIs for consistency:
tep_pid_is_registered() to tep_is_pid_registered() tep_file_bigendian() to tep_is_file_bigendian()
to make the names and return values consistent with other tep_is_... APIs
tep_data_lat_fmt() to tep_data_latency_format()
to make the name more descriptive
tep_host_bigendian() to tep_is_bigendian() tep_set_host_bigendian() to tep_set_local_bigendian() tep_is_host_bigendian() to tep_is_local_bigendian()
"host" can be confused with VMs, and "local" is about the local machine. All tep_is_..._bigendian(struct tep_handle *tep) APIs return the saved data in the tep handle, while tep_is_bigendian() returns the running machine's endianness.
All tep_is_... functions are modified to return bool value, instead of int.
--- tools/lib/traceevent/event-parse-api.c | 42 +++++++++++++------------- tools/lib/traceevent/event-parse.c | 26 ++++++++-------- tools/lib/traceevent/event-parse.h | 16 +++++----- tools/lib/traceevent/plugin_kvm.c | 4 +-- tools/perf/util/trace-event-read.c | 2 +- tools/perf/util/trace-event.c | 4 +-- 6 files changed, 47 insertions(+), 47 deletions(-)
tools/lib/traceevent/event-parse-api.c +21 -21
@@ -155,10 +155,10 @@ int tep_get_header_page_size(struct tep_handle *pevent) }/** -* tep_get_header_timestamp_size - get size of the time stamp in the header page +* tep_get_header_timestamp_size - get size of the timestamp in the header page * @tep: a handle to the tep_handle * -* This returns size of the time stamp in the header page +* This returns size of the timestamp in the header page * If @tep is NULL, 0 is returned. */ int tep_get_header_timestamp_size (struct tep_handle *tep)
@@ -249,17 +249,17 @@ void tep_set_page_size(struct tep_handle *pevent, int _page_size) }/** -* tep_file_bigendian - get if the file is in big endian order +* tep_is_file_bigendian - return the endian of the file * @pevent: a handle to the tep_handle * -* This returns if the file is in big endian order -* If @pevent is NULL, 0 is returned. +* This returns true if the file is in big endian order +* If @pevent is NULL, false is returned. */ -int tep_file_bigendian (struct tep_handle *pevent) +bool tep_is_file_bigendian (struct tep_handle *pevent) {if (pevent) -return pevent->file_bigendian; -return 0 ; +return (pevent->file_bigendian ==TEP_BIG_ENDIAN ); +return false; }/**
@@ -276,27 +276,27 @@ void tep_set_file_bigendian(struct tep_handle *pevent, enum tep_endian endian) }/** -* tep_is_host_bigendian - get if the order of the current host is big endian +* tep_is_local_bigendian - return the endian of the saved local machine * @pevent: a handle to the tep_handle * -* This gets if the order of the current host is big endian -* If @pevent is NULL, 0 is returned. +* This returns true if the saved local machine in @pevent is big endian. +* If @pevent is NULL, false is returned. */ -int tep_is_host_bigendian (struct tep_handle *pevent) +bool tep_is_local_bigendian (struct tep_handle *pevent) {if (pevent) -return pevent->host_bigendian; +return (pevent->host_bigendian ==TEP_BIG_ENDIAN );return 0 ; }/** -* tep_set_host_bigendian - set the order of the local host +* tep_set_local_bigendian - set the stored local machine endian order * @pevent: a handle to the tep_handle * @endian: non zero, if the local host has big endian order * -* This sets the order of the local host +* This sets the endian order for the local machine. */ -void tep_set_host_bigendian (struct tep_handle *pevent,enum tep_endian endian) +void tep_set_local_bigendian (struct tep_handle *pevent,enum tep_endian endian) {if (pevent) pevent->host_bigendian = endian;
@@ -306,14 +306,14 @@ void tep_set_host_bigendian(struct tep_handle *pevent, enum tep_endian endian)* tep_is_latency_format - get if the latency output format is configured * @pevent: a handle to the tep_handle * -* This gets if the latency output format is configured -* If @pevent is NULL, 0 is returned. +* This returns true if the latency output format is configured +* If @pevent is NULL, false is returned. */ -int tep_is_latency_format (struct tep_handle *pevent) +bool tep_is_latency_format (struct tep_handle *pevent) {if (pevent) -return pevent->latency_format; -return 0 ; +return (pevent->latency_format); +return false; }/**
tools/lib/traceevent/event-parse.c +13 -13
@@ -199,23 +199,23 @@ static const char *find_cmdline(struct tep_handle *pevent, int pid) }/** -* tep_pid_is_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 * @pid: The pid to check if it has a cmdline registered with. * -* Returns 1 if the pid has a cmdline mapped to it -* 0 otherwise. +* Returns true if the pid has a cmdline mapped to it +* false otherwise. */ -int tep_pid_is_registered (struct tep_handle *pevent,int pid) +bool tep_is_pid_registered (struct tep_handle *pevent,int pid) {const struct tep_cmdline *comm;struct tep_cmdline key;if (!pid) -return 1 ; +return true;if (!pevent->cmdlines &&cmdline_init (pevent)) -return 0 ; +return false; key.pid = pid;
@@ -223,8 +223,8 @@ int tep_pid_is_registered(struct tep_handle *pevent, int pid) sizeof(*pevent->cmdlines), cmdline_cmp);if (comm) -return 1 ; -return 0 ; +return true; +return false; }/*
@@ -5171,7 +5171,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_e }/** -* tep_data_lat_fmt - parse the data for the latency format +* tep_data_latency_format - parse the data for the latency format * @pevent: a handle to the pevent * @s: the trace_seq to write to * @record: the record to read from
@@ -5180,8 +5180,8 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_e* need rescheduling, in hard/soft interrupt, preempt count * and lock depth) and places it into the trace_seq. */ -void tep_data_lat_fmt (struct tep_handle *pevent, -struct trace_seq *s,struct tep_record *record) +void tep_data_latency_format (struct tep_handle *pevent, +struct trace_seq *s,struct tep_record *record) {static int check_lock_depth =1 ;static int check_migrate_disable =1 ;
@@ -5530,7 +5530,7 @@ void tep_print_event_time(struct tep_handle *pevent, struct trace_seq *s, }if (pevent->latency_format) { -tep_data_lat_fmt (pevent, s, record); +tep_data_latency_format (pevent, s, record); }if (use_usec_format) {
@@ -6760,7 +6760,7 @@ struct tep_handle *tep_alloc(void)if (pevent) { pevent->ref_count =1 ; - pevent->host_bigendian =tep_host_bigendian (); + pevent->host_bigendian =tep_is_bigendian (); }return pevent;
tools/lib/traceevent/event-parse.h +8 -8
@@ -412,7 +412,7 @@ void tep_set_flag(struct tep_handle *tep, int flag);void tep_clear_flag (struct tep_handle *tep,enum tep_flag flag);bool tep_test_flag (struct tep_handle *tep,enum tep_flag flags); -static inline int tep_host_bigendian (void ) +static inline int tep_is_bigendian (void ) {unsigned char str[] = {0x1 ,0x2 ,0x3 ,0x4 };unsigned int val;
@@ -440,7 +440,7 @@ int tep_register_function(struct tep_handle *pevent, char *name, unsigned long long addr, char *mod);int tep_register_print_string (struct tep_handle *pevent,const char *fmt,unsigned long long addr); -int tep_pid_is_registered (struct tep_handle *pevent,int pid); +bool tep_is_pid_registered (struct tep_handle *pevent,int pid); void tep_print_event_task(struct tep_handle *pevent, struct trace_seq *s, struct tep_event *event,
@@ -526,8 +526,8 @@ tep_find_event_by_name(struct tep_handle *pevent, const char *sys, const char *nstruct tep_event *tep_find_event_by_record (struct tep_handle *pevent,struct tep_record *record); -void tep_data_lat_fmt (struct tep_handle *pevent, -struct trace_seq *s,struct tep_record *record); +void tep_data_latency_format (struct tep_handle *pevent, +struct trace_seq *s,struct tep_record *record);int tep_data_type (struct tep_handle *pevent,struct tep_record *rec);int tep_data_pid (struct tep_handle *pevent,struct tep_record *rec);int tep_data_preempt_count (struct tep_handle *pevent,struct tep_record *rec);
@@ -561,11 +561,11 @@ int tep_get_long_size(struct tep_handle *pevent);void tep_set_long_size (struct tep_handle *pevent,int long_size);int tep_get_page_size (struct tep_handle *pevent);void tep_set_page_size (struct tep_handle *pevent,int _page_size); -int tep_file_bigendian (struct tep_handle *pevent); +bool tep_is_file_bigendian (struct tep_handle *pevent);void tep_set_file_bigendian (struct tep_handle *pevent,enum tep_endian endian); -int tep_is_host_bigendian (struct tep_handle *pevent); -void tep_set_host_bigendian (struct tep_handle *pevent,enum tep_endian endian); -int tep_is_latency_format (struct tep_handle *pevent); +bool tep_is_local_bigendian (struct tep_handle *pevent); +void tep_set_local_bigendian (struct tep_handle *pevent,enum tep_endian endian); +bool tep_is_latency_format (struct tep_handle *pevent);void tep_set_latency_format (struct tep_handle *pevent,int lat);int tep_get_header_page_size (struct tep_handle *pevent);int tep_get_header_timestamp_size (struct tep_handle *tep);
tools/lib/traceevent/plugin_kvm.c +2 -2
@@ -389,8 +389,8 @@ static int kvm_mmu_print_role(struct trace_seq *s, struct tep_record *record,* We can only use the structure if file is of the same * endianness. */ -if (tep_file_bigendian (event->pevent) == -tep_is_host_bigendian (event->pevent)) { +if (tep_is_file_bigendian (event->pevent) == +tep_is_local_bigendian (event->pevent)) { trace_seq_printf(s, "%u q%u%s %s%s %spae %snxe %swp%s%s%s", role.level,
tools/perf/util/trace-event-read.c +1 -1
@@ -442,7 +442,7 @@ ssize_t trace_report(int fd, struct trace_event *tevent, bool __repipe)tep_set_flag (pevent,TEP_NSEC_OUTPUT );tep_set_file_bigendian (pevent, file_bigendian); -tep_set_host_bigendian (pevent, host_bigendian); +tep_set_local_bigendian (pevent, host_bigendian);if (do_read (buf,1 ) <0 ) goto out;
tools/perf/util/trace-event.c +2 -2
@@ -40,7 +40,7 @@ int trace_event__init(struct trace_event *t)static int trace_event__init2 (void ) { -int be =tep_host_bigendian (); +int be =tep_is_bigendian ();struct tep_handle *pevent;if (trace_event__init (&tevent))
@@ -49,7 +49,7 @@ static int trace_event__init2(void) pevent = tevent.pevent;tep_set_flag (pevent,TEP_NSEC_OUTPUT );tep_set_file_bigendian (pevent, be); -tep_set_host_bigendian (pevent, be); +tep_set_local_bigendian (pevent, be); tevent_initialized = true;return 0 ; }
Signature · 1 line
2.20.1
Re: [PATCH v2 1/5] tools/perf,tools/lib/traceevent: Make traceevent APIs more consistent
Quoted 10 lines · On Wed, 27 Mar 2019 16:19:42 +0200 Tzvetomir Stoyanov <[email protected]>…
/**
- *tep_file_bigendian- get if the file is in big endian order
+ *tep_is_file_bigendian- return the endian of the file
* @pevent: a handle to thetep_handle
*
- * This returns if the file is in big endian order
- * If @pevent is NULL, 0 is returned.
+ * This returns true if the file is in big endian order
+ * If @pevent is NULL, false is returned.
*/
tools/lib/traceevent/event-parse-api.c void tep_set_page_size(struct tep_handle *pevent, int _page_size) · line 261
Quoted 7 lines
tools/lib/traceevent/event-parse-api.c +2
-3-int tep_file_bigendian (struct tep_handle *pevent) +bool tep_is_file_bigendian (struct tep_handle *pevent) {if (pevent) -return pevent->file_bigendian; -return 0 ; +return (pevent->file_bigendian ==TEP_BIG_ENDIAN );
One thing I should have mentioned before, is that, when people write returns like this to the Linux kernel mailing list, you might get a comment like: "return is not a function, lose the parenthesis".
That is, it should be:
return pevent->file_bigendian == TEP_BIG_ENDIAN;
not
return (pevent->file_bigendian == TEP_BIG_ENDIAN);
If this is the only issue, I may just fix it myself. Just remember that returns should never have an outside parenthesis.
-- Steve
Quoted 3 lines
(quoted diff) +1
-0+ return false; }
PATCH v2 2/5 tools/lib/traceevent: Rename input arguments of libtraceevent APIs from pevent to tep
In reply to Tzvetomir StoyanovThis patch renames "struct tep_handle *pevent" input arguments of libtraceevent APIs to "struct tep_handle *tep". This makes the API consistent with the chosen naming convention: tep (trace event parser), instead of the old pevent.
--- tools/lib/traceevent/event-parse-api.c | 132 +++--- tools/lib/traceevent/event-parse-local.h | 6 +- tools/lib/traceevent/event-parse.c | 473 ++++++++++----------- tools/lib/traceevent/event-parse.h | 120 +++--- tools/lib/traceevent/event-plugin.c | 8 +- tools/lib/traceevent/parse-filter.c | 8 +- tools/lib/traceevent/plugin_cfg80211.c | 8 +- tools/lib/traceevent/plugin_function.c | 8 +- tools/lib/traceevent/plugin_hrtimer.c | 12 +- tools/lib/traceevent/plugin_jbd2.c | 12 +- tools/lib/traceevent/plugin_kmem.c | 28 +- tools/lib/traceevent/plugin_kvm.c | 44 +- tools/lib/traceevent/plugin_mac80211.c | 8 +- tools/lib/traceevent/plugin_sched_switch.c | 16 +- tools/lib/traceevent/plugin_scsi.c | 8 +- tools/lib/traceevent/plugin_xen.c | 8 +- 16 files changed, 449 insertions(+), 450 deletions(-)
tools/lib/traceevent/event-parse-api.c +66 -66
@@ -92,11 +92,11 @@ bool tep_test_flag(struct tep_handle *tep, enum tep_flag flag)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; -if (!pevent || pevent->host_bigendian == pevent->file_bigendian) +if (!tep || tep->host_bigendian == tep->file_bigendian)return data; swap = ((data & 0xffULL) << 8) |
@@ -105,11 +105,11 @@ unsigned short tep_data2host2(struct tep_handle *pevent, unsigned short data)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; -if (!pevent || pevent->host_bigendian == pevent->file_bigendian) +if (!tep || tep->host_bigendian == tep->file_bigendian)return data; swap = ((data & 0xffULL) << 24) |
@@ -121,11 +121,11 @@ unsigned int tep_data2host4(struct tep_handle *pevent, unsigned int data) }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; -if (!pevent || pevent->host_bigendian == pevent->file_bigendian) +if (!tep || tep->host_bigendian == tep->file_bigendian)return data; swap = ((data & 0xffULL) << 56) |
@@ -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 -* @pevent: a handle to the tep_handle +* @tep: a handle to the tep_handle * * 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) -return pevent->header_page_size_size; +if (tep) +return tep->header_page_size_size;return 0 ; }
@@ -170,163 +170,163 @@ int tep_get_header_timestamp_size(struct tep_handle *tep)/** * 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 -* 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) -return pevent->cpus; +if (tep) +return tep->cpus;return 0 ; }/** * 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 */ -void tep_set_cpus (struct tep_handle *pevent,int cpus) +void tep_set_cpus (struct tep_handle *tep,int cpus) { -if (pevent) - pevent->cpus = cpus; +if (tep) + tep->cpus = cpus; }/** * 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 -* 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) -return pevent->long_size; +if (tep) +return tep->long_size;return 0 ; }/** * 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 * * 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) - pevent->long_size = long_size; +if (tep) + tep->long_size = long_size; }/** * 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 -* 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) -return pevent->page_size; +if (tep) +return tep->page_size;return 0 ; }/** * 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 * * 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) - pevent->page_size = _page_size; +if (tep) + tep->page_size = _page_size; }/** * 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 -* 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) -return (pevent->file_bigendian ==TEP_BIG_ENDIAN ); +if (tep) +return (tep->file_bigendian ==TEP_BIG_ENDIAN );return false; }/** * 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 * * 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) - pevent->file_bigendian = endian; +if (tep) + tep->file_bigendian = endian; }/** * 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. -* If @pevent is NULL, false is returned. +* This returns true if the saved local machine in @tep is big endian. +* 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) -return (pevent->host_bigendian ==TEP_BIG_ENDIAN ); +if (tep) +return (tep->host_bigendian ==TEP_BIG_ENDIAN );return 0 ; }/** * 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 * * 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) - pevent->host_bigendian = endian; +if (tep) + tep->host_bigendian = endian; }/** * 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 -* 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) -return (pevent->latency_format); +if (tep) +return (tep->latency_format);return false; }/** * 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 * * 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) - pevent->latency_format = lat; +if (tep) + tep->latency_format = lat; }/**
tools/lib/traceevent/event-parse-local.h +3 -3
@@ -92,8 +92,8 @@ struct tep_handle {void tep_free_event (struct tep_event *event);void tep_free_format_field (struct tep_format_field *field); -unsigned short tep_data2host2 (struct tep_handle *pevent,unsigned short data); -unsigned int tep_data2host4 (struct tep_handle *pevent,unsigned int data); -unsigned long long tep_data2host8 (struct tep_handle *pevent,unsigned long long data); +unsigned short tep_data2host2 (struct tep_handle *tep,unsigned short data); +unsigned int tep_data2host4 (struct tep_handle *tep,unsigned int data); +unsigned long long tep_data2host8 (struct tep_handle *tep,unsigned long long data);#endif /* _PARSE_EVENTS_INT_H */
tools/lib/traceevent/event-parse.c +236 -237
1,201 lines not on this page · raw message
tools/lib/traceevent/event-parse.h +60 -60
230 lines not on this page · raw message
tools/lib/traceevent/event-plugin.c +4 -4
@@ -419,16 +419,16 @@ load_plugins(struct tep_handle *pevent, const char *suffix, }struct tep_plugin_list * -tep_load_plugins (struct tep_handle *pevent) +tep_load_plugins (struct tep_handle *tep) {struct tep_plugin_list *list =NULL ; -load_plugins (pevent,".so" , load_plugin, &list); +load_plugins (tep,".so" , load_plugin, &list);return list; }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;struct tep_plugin_list *list;
@@ -438,7 +438,7 @@ tep_unload_plugins(struct tep_plugin_list *plugin_list, struct tep_handle *peven plugin_list = list->next; func =dlsym (list->handle,TEP_PLUGIN_UNLOADER_NAME );if (func) -func (pevent); +func (tep);dlclose (list->handle);free (list->name);free (list);
tools/lib/traceevent/parse-filter.c +4 -4
@@ -164,9 +164,9 @@ add_filter_type(struct tep_event_filter *filter, int id)/** * 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;
@@ -175,8 +175,8 @@ struct tep_event_filter *tep_filter_alloc(struct tep_handle *pevent)return NULL ;memset (filter,0 ,sizeof (*filter)); - filter->pevent = pevent; -tep_ref (pevent); + filter->pevent = tep; +tep_ref (tep);return filter; }
tools/lib/traceevent/plugin_cfg80211.c +4 -4
@@ -25,9 +25,9 @@ process___le16_to_cpup(struct trace_seq *s, unsigned long long *args)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, TEP_FUNC_ARG_INT, "__le16_to_cpup",
@@ -36,8 +36,8 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)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" ); }
tools/lib/traceevent/plugin_function.c +4 -4
@@ -164,9 +164,9 @@ static int function_handler(struct trace_seq *s, struct tep_record *record,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 );tep_plugin_add_options ("ftrace" , plugin_options);
@@ -174,11 +174,11 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)return 0 ; } -void TEP_PLUGIN_UNLOADER (struct tep_handle *pevent) +void TEP_PLUGIN_UNLOADER (struct tep_handle *tep) {int i, x; -tep_unregister_event_handler (pevent,-1 ,"ftrace" ,"function" , +tep_unregister_event_handler (tep,-1 ,"ftrace" ,"function" , function_handler,NULL );for (i =0 ; i <= cpus; i++) {
tools/lib/traceevent/plugin_hrtimer.c +6 -6
@@ -67,23 +67,23 @@ static int timer_start_handler(struct trace_seq *s,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_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 );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_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 ); }
tools/lib/traceevent/plugin_jbd2.c +6 -6
@@ -48,16 +48,16 @@ process_jiffies_to_msecs(struct trace_seq *s, unsigned long long *args)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,TEP_FUNC_ARG_STRING ,"jbd2_dev_to_name" ,TEP_FUNC_ARG_INT ,TEP_FUNC_ARG_VOID ); - tep_register_print_function(pevent, + tep_register_print_function(tep, process_jiffies_to_msecs, TEP_FUNC_ARG_LONG, "jiffies_to_msecs",
@@ -66,11 +66,11 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)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" ); -tep_unregister_print_function (pevent, process_jiffies_to_msecs, +tep_unregister_print_function (tep, process_jiffies_to_msecs,"jiffies_to_msecs" ); }
tools/lib/traceevent/plugin_kmem.c +14 -14
@@ -49,47 +49,47 @@ static int call_site_handler(struct trace_seq *s, struct tep_record *record,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 ); -tep_register_event_handler (pevent,-1 ,"kmem" ,"kmalloc" , +tep_register_event_handler (tep,-1 ,"kmem" ,"kmalloc" , 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 ); -tep_register_event_handler (pevent,-1 ,"kmem" ,"kmem_cache_alloc" , +tep_register_event_handler (tep,-1 ,"kmem" ,"kmem_cache_alloc" , call_site_handler,NULL ); -tep_register_event_handler (pevent,-1 ,"kmem" , +tep_register_event_handler (tep,-1 ,"kmem" ,"kmem_cache_alloc_node" , 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 );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 ); -tep_unregister_event_handler (pevent,-1 ,"kmem" ,"kmalloc" , +tep_unregister_event_handler (tep,-1 ,"kmem" ,"kmalloc" , 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 ); -tep_unregister_event_handler (pevent,-1 ,"kmem" ,"kmem_cache_alloc" , +tep_unregister_event_handler (tep,-1 ,"kmem" ,"kmem_cache_alloc" , call_site_handler,NULL ); -tep_unregister_event_handler (pevent,-1 ,"kmem" , +tep_unregister_event_handler (tep,-1 ,"kmem" ,"kmem_cache_alloc_node" , 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 ); }
tools/lib/traceevent/plugin_kvm.c +22 -22
99 lines not on this page · raw message
tools/lib/traceevent/plugin_mac80211.c +4 -4
@@ -87,17 +87,17 @@ static int drv_bss_info_changed(struct trace_seq *s,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,NULL );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,NULL ); }
tools/lib/traceevent/plugin_sched_switch.c +8 -8
@@ -135,27 +135,27 @@ static int sched_switch_handler(struct trace_seq *s,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 ); -tep_register_event_handler (pevent,-1 ,"sched" ,"sched_wakeup" , +tep_register_event_handler (tep,-1 ,"sched" ,"sched_wakeup" , 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 );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 ); -tep_unregister_event_handler (pevent,-1 ,"sched" ,"sched_wakeup" , +tep_unregister_event_handler (tep,-1 ,"sched" ,"sched_wakeup" , 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 ); }
tools/lib/traceevent/plugin_scsi.c +4 -4
@@ -414,9 +414,9 @@ unsigned long long process_scsi_trace_parse_cdb(struct trace_seq *s,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, TEP_FUNC_ARG_STRING, "scsi_trace_parse_cdb",
@@ -427,8 +427,8 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)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" ); }
tools/lib/traceevent/plugin_xen.c +4 -4
@@ -120,9 +120,9 @@ unsigned long long process_xen_hypercall_name(struct trace_seq *s,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, TEP_FUNC_ARG_STRING, "xen_hypercall_name",
@@ -131,8 +131,8 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)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" ); }
Signature · 1 line
2.20.1
Re: [PATCH v2 2/5] tools/lib/traceevent: Rename input arguments of libtraceevent APIs from pevent to tep
Quoted 15 lines · On Wed, 27 Mar 2019 16:19:43 +0200 Tzvetomir Stoyanov <[email protected]>…
This patch renames "struct
tep_handle*pevent" input arguments of libtraceevent APIs to "structtep_handle*tep". This makes the API consistent with the chosen naming convention: tep (trace event parser), instead of the old pevent.Signed-off-by Tzvetomir Stoyanov <[email protected]>--- tools/lib/traceevent/event-parse-api.c | 132 +++--- tools/lib/traceevent/event-parse-local.h | 6 +- tools/lib/traceevent/event-parse.c | 473 ++++++++++----------- tools/lib/traceevent/event-parse.h | 120 +++--- tools/lib/traceevent/event-plugin.c | 8 +- tools/lib/traceevent/parse-filter.c | 8 +- tools/lib/traceevent/plugin_cfg80211.c | 8 +- tools/lib/traceevent/plugin_function.c | 8 +- tools/lib/traceevent/plugin_hrtimer.c | 12 +-
Quoted 10 lines
tools/lib/traceevent/plugin_jbd2.c | 12 +- tools/lib/traceevent/plugin_kmem.c | 28 +- tools/lib/traceevent/plugin_kvm.c | 44 +- tools/lib/traceevent/plugin_mac80211.c | 8 +- tools/lib/traceevent/plugin_sched_switch.c | 16 +- tools/lib/traceevent/plugin_scsi.c | 8 +- tools/lib/traceevent/plugin_xen.c | 8 +- 16 files changed, 449 insertions(+), 450 deletions(-)
Can you rebase the rest of these patches off of my repo:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
Branch: tip/perf/core
Thanks,
-- Steve
PATCH v2 3/5 tools/perf,tools/lib/traceevent: Rename "pevent" member of struct tep_event to "tep"
In reply to Tzvetomir StoyanovThis patch renames "pevent" member of the struct tep_event to "tep". This makes the struct consistent with the chosen naming convention:
tep (trace event parser), instead of the old pevent.
--- tools/lib/traceevent/event-parse.c | 32 +++++++++---------- tools/lib/traceevent/event-parse.h | 2 +- tools/lib/traceevent/parse-filter.c | 6 ++-- tools/lib/traceevent/plugin_function.c | 2 +- tools/lib/traceevent/plugin_kmem.c | 4 +-- tools/lib/traceevent/plugin_kvm.c | 4 +-- tools/lib/traceevent/plugin_sched_switch.c | 2 +- tools/perf/builtin-kmem.c | 2 +- tools/perf/util/data-convert-bt.c | 4 +-- tools/perf/util/python.c | 2 +- .../util/scripting-engines/trace-event-perl.c | 2 +- .../scripting-engines/trace-event-python.c | 2 +- tools/perf/util/trace-event-parse.c | 2 +- 13 files changed, 33 insertions(+), 33 deletions(-)
tools/lib/traceevent/event-parse.c +16 -16
@@ -804,7 +804,7 @@ static int add_event(struct tep_handle *pevent, struct tep_event *event) pevent->events[i] = event; pevent->nr_events++; - event->pevent = pevent; + event->tep = pevent;return 0 ; }
@@ -1656,8 +1656,8 @@ static int event_read_fields(struct tep_event *event, struct tep_format_field **else if (field->flags &TEP_FIELD_IS_STRING ) field->elementsize =1 ;else if (field->flags &TEP_FIELD_IS_LONG ) - field->elementsize = event->pevent ? - event->pevent->long_size : + field->elementsize = event->tep ? + event->tep->long_size :sizeof (long ); }else field->elementsize = field->size;
@@ -3075,7 +3075,7 @@ process_function(struct tep_event *event, struct tep_print_arg *arg,return process_dynamic_array_len (event, arg, tok); } - func =find_func_handler (event->pevent, token); + func =find_func_handler (event->tep, token);if (func) {free_token (token);return process_func_handler (event, func, arg, tok);
@@ -3405,7 +3405,7 @@ int tep_read_number_field(struct tep_format_field *field, const void *data,case 2 :case 4 :case 8 : - *value =tep_read_number (field->event->pevent, + *value =tep_read_number (field->event->tep, data + field->offset, field->size);return 0 ;default :
@@ -3566,7 +3566,7 @@ tep_find_event_by_name(struct tep_handle *tep,static unsigned long long eval_num_arg (void *data,int size,struct tep_event *event,struct tep_print_arg *arg) { -struct tep_handle *pevent = event->pevent; +struct tep_handle *pevent = event->tep;unsigned long long val =0 ;unsigned long long left, right;struct tep_print_arg *typearg =NULL ;
@@ -3907,7 +3907,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, struct tep_event *event, const char *format, int len_arg, struct tep_print_arg *arg) { - struct tep_handle *pevent = event->pevent; + struct tep_handle *pevent = event->tep;struct tep_print_flag_sym *flag;struct tep_format_field *field;struct printk_map *printk;
@@ -4256,7 +4256,7 @@ static void free_args(struct tep_print_arg *args)static struct tep_print_arg *make_bprint_args (char *fmt,void *data,int size,struct tep_event *event) { -struct tep_handle *pevent = event->pevent; +struct tep_handle *pevent = event->tep;struct tep_format_field *field, *ip_field;struct tep_print_arg *args, *arg, **next;unsigned long long ip, val;
@@ -4433,7 +4433,7 @@ static char * get_bprint_format(void *data, int size __maybe_unused, struct tep_event *event) { -struct tep_handle *pevent = event->pevent; +struct tep_handle *pevent = event->tep;unsigned long long addr;struct tep_format_field *field;struct printk_map *printk;
@@ -4834,7 +4834,7 @@ void tep_print_field(struct trace_seq *s, void *data, {unsigned long long val;unsigned int offset, len, i; -struct tep_handle *pevent = field->event->pevent; +struct tep_handle *pevent = field->event->tep;if (field->flags &TEP_FIELD_IS_ARRAY ) { offset = field->offset;
@@ -4909,7 +4909,7 @@ void tep_print_fields(struct trace_seq *s, void *data,static void pretty_print (struct trace_seq *s,void *data,int size,struct tep_event *event) { -struct tep_handle *pevent = event->pevent; +struct tep_handle *pevent = event->tep;struct tep_print_fmt *print_fmt = &event->print_fmt;struct tep_print_arg *arg = print_fmt->args;struct tep_print_arg *args =NULL ;
@@ -5423,7 +5423,7 @@ void tep_event_info(struct trace_seq *s, struct tep_event *event, {int print_pretty =1 ; -if (event->pevent->print_raw || (event->flags &TEP_EVENT_FL_PRINTRAW )) +if (event->tep->print_raw || (event->flags &TEP_EVENT_FL_PRINTRAW ))tep_print_fields (s, record->data, record->size, event);else {
@@ -6097,7 +6097,7 @@ enum tep_errno __tep_parse_format(struct tep_event **eventp, }/* Add pevent to event so that it can be referenced */ - event->pevent = pevent; + event->tep = pevent; ret =event_read_format (event);if (ret <0 ) {
@@ -6291,8 +6291,8 @@ void *tep_get_field_raw(struct trace_seq *s, struct tep_event *event, offset = field->offset;if (field->flags &TEP_FIELD_IS_DYNAMIC ) { - offset =tep_read_number (event->pevent, - data + offset, field->size); + offset =tep_read_number (event->tep, + data + offset, field->size); *len = offset >>16 ; offset &=0xffff ; }else
@@ -6426,7 +6426,7 @@ int tep_print_func_field(struct trace_seq *s, const char *fmt, struct tep_record *record, int err) {struct tep_format_field *field =tep_find_field (event, name); -struct tep_handle *pevent = event->pevent; +struct tep_handle *pevent = event->tep;unsigned long long val;struct func_map *func;char tmp[128 ];
tools/lib/traceevent/event-parse.h +1 -1
@@ -278,7 +278,7 @@ struct tep_print_fmt { };struct tep_event { -struct tep_handle *pevent; +struct tep_handle *tep;char *name;int id;int flags;
tools/lib/traceevent/parse-filter.c +3 -3
@@ -1531,8 +1531,8 @@ get_comm(struct tep_event *event, struct tep_record *record)const char *comm;int pid; - pid =tep_data_pid (event->pevent, record); - comm =tep_data_comm_from_pid (event->pevent, pid); + pid =tep_data_pid (event->tep, record); + comm =tep_data_comm_from_pid (event->tep, pid);return comm; }
@@ -1730,7 +1730,7 @@ static const char *get_field_str(struct tep_filter_arg *arg, struct tep_record * }else { event = arg->str.field->event; - pevent = event->pevent; + pevent = event->tep; addr =get_value (event, arg->str.field, record);if (arg->str.field->flags & (TEP_FIELD_IS_POINTER |TEP_FIELD_IS_LONG ))
tools/lib/traceevent/plugin_function.c +1 -1
@@ -126,7 +126,7 @@ static int add_and_get_index(const char *parent, const char *child, int cpu)static int function_handler (struct trace_seq *s,struct tep_record *record,struct tep_event *event,void *context) { -struct tep_handle *pevent = event->pevent; +struct tep_handle *pevent = event->tep;unsigned long long function;unsigned long long pfunction;const char *func;
tools/lib/traceevent/plugin_kmem.c +2 -2
@@ -39,11 +39,11 @@ static int call_site_handler(struct trace_seq *s, struct tep_record *record,if (tep_read_number_field (field, data, &val))return 1 ; - func =tep_find_function (event->pevent, val); + func =tep_find_function (event->tep, val);if (!func)return 1 ; - addr =tep_find_function_address (event->pevent, val); + addr =tep_find_function_address (event->tep, val);trace_seq_printf (s,"(%s+0x%x) " , func, (int )(val - addr));return 1 ;
tools/lib/traceevent/plugin_kvm.c +2 -2
@@ -389,8 +389,8 @@ static int kvm_mmu_print_role(struct trace_seq *s, struct tep_record *record,* We can only use the structure if file is of the same * endianness. */ -if (tep_is_file_bigendian (event->pevent) == -tep_is_local_bigendian (event->pevent)) { +if (tep_is_file_bigendian (event->tep) == +tep_is_local_bigendian (event->tep)) { trace_seq_printf(s, "%u q%u%s %s%s %spae %snxe %swp%s%s%s", role.level,
tools/lib/traceevent/plugin_sched_switch.c +1 -1
@@ -62,7 +62,7 @@ static void write_and_save_comm(struct tep_format_field *field, comm = &s->buffer[len];/* Help out the comm to ids. This will handle dups */ -tep_register_comm (field->event->pevent, comm, pid); +tep_register_comm (field->event->tep, comm, pid); } static int sched_wakeup_handler(struct trace_seq *s,
tools/perf/builtin-kmem.c +1 -1
@@ -1975,7 +1975,7 @@ int cmd_kmem(int argc, const char **argv) goto out_delete; } - kmem_page_size =tep_get_page_size (evsel->tp_format->pevent); + kmem_page_size =tep_get_page_size (evsel->tp_format->tep); symbol_conf.use_callchain = true; }
tools/perf/util/data-convert-bt.c +2 -2
@@ -310,7 +310,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw,if (flags &TEP_FIELD_IS_DYNAMIC ) {unsigned long long tmp_val; - tmp_val =tep_read_number (fmtf->event->pevent, + tmp_val =tep_read_number (fmtf->event->tep, data + offset, len); offset = tmp_val; len = offset >>16 ;
@@ -354,7 +354,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw,unsigned long long value_int; value_int =tep_read_number ( - fmtf->event->pevent, + fmtf->event->tep, data + offset + i * len, len);if (!(flags &TEP_FIELD_IS_SIGNED ))
tools/perf/util/python.c +1 -1
@@ -342,7 +342,7 @@ static bool is_tracepoint(struct pyrf_event *pevent)static PyObject *tracepoint_field (struct pyrf_event *pe,struct tep_format_field *field) { -struct tep_handle *pevent = field->event->pevent; +struct tep_handle *pevent = field->event->tep;void *data = pe->sample.raw_data;PyObject *ret =NULL ;unsigned long long val;
tools/perf/util/scripting-engines/trace-event-perl.c +1 -1
@@ -372,7 +372,7 @@ static void perl_process_tracepoint(struct perf_sample *sample, ns = nsecs - s *NSEC_PER_SEC ; scripting_context->event_data = data; - scripting_context->pevent = evsel->tp_format->pevent; + scripting_context->pevent = evsel->tp_format->tep;ENTER ;SAVETMPS ;
tools/perf/util/scripting-engines/trace-event-python.c +1 -1
@@ -837,7 +837,7 @@ static void python_process_tracepoint(struct perf_sample *sample, ns = nsecs - s *NSEC_PER_SEC ; scripting_context->event_data = data; - scripting_context->pevent = evsel->tp_format->pevent; + scripting_context->pevent = evsel->tp_format->tep; context =_PyCapsule_New (scripting_context,NULL ,NULL );
tools/perf/util/trace-event-parse.c +1 -1
@@ -111,7 +111,7 @@ raw_field_value(struct tep_event *event, const char *name, void *data)unsigned long long read_size (struct tep_event *event,void *ptr,int size) { -return tep_read_number (event->pevent, ptr, size); +return tep_read_number (event->tep, ptr, size); } void event_format__fprintf(struct tep_event *event,
Signature · 1 line
2.20.1
PATCH v2 4/5 tools/perf,tools/lib/traceevent: Rename "pevent" member of struct tep_event_filter to "tep"
In reply to Tzvetomir StoyanovThis patch renames "pevent" member of the struct tep_event_filter to "tep". This makes the struct consistent with the chosen naming convention:
tep (trace event parser), instead of the old pevent.
--- tools/lib/traceevent/event-parse.h | 2 +- tools/lib/traceevent/parse-filter.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-)
tools/lib/traceevent/event-parse.h +1 -1
@@ -716,7 +716,7 @@ struct tep_filter_type {#define TEP_FILTER_ERROR_BUFSZ 1024struct tep_event_filter { -struct tep_handle *pevent; +struct tep_handle *tep;int filters;struct tep_filter_type *event_filters;char error_buffer[TEP_FILTER_ERROR_BUFSZ ];
tools/lib/traceevent/parse-filter.c +7 -7
@@ -154,7 +154,7 @@ add_filter_type(struct tep_event_filter *filter, int id) filter_type = &filter->event_filters[i]; filter_type->event_id = id; - filter_type->event =tep_find_event (filter->pevent, id); + filter_type->event =tep_find_event (filter->tep, id); filter_type->filter =NULL ; filter->filters++;
@@ -175,7 +175,7 @@ struct tep_event_filter *tep_filter_alloc(struct tep_handle *tep)return NULL ;memset (filter,0 ,sizeof (*filter)); - filter->pevent = tep; + filter->tep = tep;tep_ref (tep);return filter;
@@ -1257,7 +1257,7 @@ static void filter_init_error_buf(struct tep_event_filter *filter)enum tep_errno tep_filter_add_filter_str (struct tep_event_filter *filter,const char *filter_str) { -struct tep_handle *pevent = filter->pevent; +struct tep_handle *pevent = filter->tep;struct event_list *event;struct event_list *events =NULL ;const char *filter_start;
@@ -1380,7 +1380,7 @@ int tep_filter_strerror(struct tep_event_filter *filter, enum tep_errno err,return 0 ; } -return tep_strerror (filter->pevent, err, buf, buflen); +return tep_strerror (filter->tep, err, buf, buflen); }/**
@@ -1443,7 +1443,7 @@ void tep_filter_reset(struct tep_event_filter *filter)void tep_filter_free (struct tep_event_filter *filter) { -tep_unref (filter->pevent); +tep_unref (filter->tep);tep_filter_reset (filter);
@@ -1465,7 +1465,7 @@ static int copy_filter_type(struct tep_event_filter *filter,/* Can't assume that the pevent's are the same */ sys = filter_type->event->system; name = filter_type->event->name; - event =tep_find_event_by_name (filter->pevent, sys, name); + event =tep_find_event_by_name (filter->tep, sys, name);if (!event)return -1 ;
@@ -1875,7 +1875,7 @@ int tep_event_filtered(struct tep_event_filter *filter, int event_id)enum tep_errno tep_filter_match (struct tep_event_filter *filter,struct tep_record *record) { -struct tep_handle *pevent = filter->pevent; +struct tep_handle *pevent = filter->tep;struct tep_filter_type *filter_type;int event_id;int ret;
Signature · 1 line
2.20.1
PATCH v2 5/5 tools/lib/traceevent: Rename input arguments and local variables of libtraceevent from pevent to tep
In reply to Tzvetomir StoyanovThis patch renames from "pevent" to "tep":
- all "pevent" input arguments of libtraceevent internal functions.
- all local "pevent" variables of libtraceevent.
This makes the implementation consistent with the chosen naming convention, tep (trace event parser), and will avoid any confusion with the old pevent name
--- tools/lib/traceevent/event-parse.c | 306 ++++++++++++------------- tools/lib/traceevent/event-plugin.c | 24 +- tools/lib/traceevent/parse-filter.c | 26 +-- tools/lib/traceevent/plugin_function.c | 6 +- 4 files changed, 181 insertions(+), 181 deletions(-)
tools/lib/traceevent/event-parse.c +153 -153
@@ -148,14 +148,14 @@ struct cmdline_list {int pid; }; -static int cmdline_init (struct tep_handle *pevent) +static int cmdline_init (struct tep_handle *tep) { -struct cmdline_list *cmdlist = pevent->cmdlist; +struct cmdline_list *cmdlist = tep->cmdlist;struct cmdline_list *item;struct tep_cmdline *cmdlines;int i; - cmdlines =malloc (sizeof (*cmdlines) * pevent->cmdline_count); + cmdlines =malloc (sizeof (*cmdlines) * tep->cmdline_count);if (!cmdlines)return -1 ;
@@ -169,15 +169,15 @@ static int cmdline_init(struct tep_handle *pevent)free (item); } -qsort (cmdlines, pevent->cmdline_count,sizeof (*cmdlines), cmdline_cmp); +qsort (cmdlines, tep->cmdline_count,sizeof (*cmdlines), cmdline_cmp); - pevent->cmdlines = cmdlines; - pevent->cmdlist =NULL ; + tep->cmdlines = cmdlines; + tep->cmdlist =NULL ;return 0 ; } -static const char *find_cmdline (struct tep_handle *pevent,int pid) +static const char *find_cmdline (struct tep_handle *tep,int pid) {const struct tep_cmdline *comm;struct tep_cmdline key;
@@ -185,13 +185,13 @@ static const char *find_cmdline(struct tep_handle *pevent, int pid)if (!pid)return "<idle>" ; -if (!pevent->cmdlines &&cmdline_init (pevent)) +if (!tep->cmdlines &&cmdline_init (tep))return "<not enough memory for cmdlines!>" ; key.pid = pid; - comm =bsearch (&key, pevent->cmdlines, pevent->cmdline_count, -sizeof (*pevent->cmdlines), cmdline_cmp); + comm =bsearch (&key, tep->cmdlines, tep->cmdline_count, +sizeof (*tep->cmdlines), cmdline_cmp);if (comm)return comm->comm;
@@ -232,10 +232,10 @@ bool tep_is_pid_registered(struct tep_handle *tep, int pid)* we must add this pid. This is much slower than when cmdlines * are added before the array is initialized. */ -static int add_new_comm (struct tep_handle *pevent, +static int add_new_comm (struct tep_handle *tep,const char *comm,int pid,bool override) { -struct tep_cmdline *cmdlines = pevent->cmdlines; +struct tep_cmdline *cmdlines = tep->cmdlines;struct tep_cmdline *cmdline;struct tep_cmdline key;char *new_comm;
@@ -246,8 +246,8 @@ static int add_new_comm(struct tep_handle *pevent,/* avoid duplicates */ key.pid = pid; - cmdline =bsearch (&key, pevent->cmdlines, pevent->cmdline_count, -sizeof (*pevent->cmdlines), cmdline_cmp); + cmdline =bsearch (&key, tep->cmdlines, tep->cmdline_count, +sizeof (*tep->cmdlines), cmdline_cmp);if (cmdline) {if (!override) { errno =EEXIST ;
@@ -264,26 +264,26 @@ static int add_new_comm(struct tep_handle *pevent,return 0 ; } - cmdlines =realloc (cmdlines,sizeof (*cmdlines) * (pevent->cmdline_count +1 )); + cmdlines =realloc (cmdlines,sizeof (*cmdlines) * (tep->cmdline_count +1 ));if (!cmdlines) { errno =ENOMEM ;return -1 ; } - cmdlines[pevent->cmdline_count].comm =strdup (comm); -if (!cmdlines[pevent->cmdline_count].comm) { + cmdlines[tep->cmdline_count].comm =strdup (comm); +if (!cmdlines[tep->cmdline_count].comm) {free (cmdlines); errno =ENOMEM ;return -1 ; } - cmdlines[pevent->cmdline_count].pid = pid; + cmdlines[tep->cmdline_count].pid = pid; -if (cmdlines[pevent->cmdline_count].comm) - pevent->cmdline_count++; +if (cmdlines[tep->cmdline_count].comm) + tep->cmdline_count++; -qsort (cmdlines, pevent->cmdline_count,sizeof (*cmdlines), cmdline_cmp); - pevent->cmdlines = cmdlines; +qsort (cmdlines, tep->cmdline_count,sizeof (*cmdlines), cmdline_cmp); + tep->cmdlines = cmdlines;return 0 ; }
@@ -408,18 +408,18 @@ static int func_bcmp(const void *a, const void *b)return 1 ; } -static int func_map_init (struct tep_handle *pevent) +static int func_map_init (struct tep_handle *tep) {struct func_list *funclist;struct func_list *item;struct func_map *func_map;int i; - func_map =malloc (sizeof (*func_map) * (pevent->func_count +1 )); + func_map =malloc (sizeof (*func_map) * (tep->func_count +1 ));if (!func_map)return -1 ; - funclist = pevent->funclist; + funclist = tep->funclist; i =0 ;while (funclist) {
@@ -432,34 +432,34 @@ static int func_map_init(struct tep_handle *pevent)free (item); } -qsort (func_map, pevent->func_count,sizeof (*func_map), func_cmp); +qsort (func_map, tep->func_count,sizeof (*func_map), func_cmp);/* * Add a special record at the end. */ - func_map[pevent->func_count].func =NULL ; - func_map[pevent->func_count].addr =0 ; - func_map[pevent->func_count].mod =NULL ; + func_map[tep->func_count].func =NULL ; + func_map[tep->func_count].addr =0 ; + func_map[tep->func_count].mod =NULL ; - pevent->func_map = func_map; - pevent->funclist =NULL ; + tep->func_map = func_map; + tep->funclist =NULL ;return 0 ; }static struct func_map * -__find_func (struct tep_handle *pevent,unsigned long long addr) +__find_func (struct tep_handle *tep,unsigned long long addr) {struct func_map *func;struct func_map key; -if (!pevent->func_map) -func_map_init (pevent); +if (!tep->func_map) +func_map_init (tep); key.addr = addr; - func =bsearch (&key, pevent->func_map, pevent->func_count, -sizeof (*pevent->func_map), func_bcmp); + func =bsearch (&key, tep->func_map, tep->func_count, +sizeof (*tep->func_map), func_bcmp);return func; }
@@ -510,18 +510,18 @@ void tep_reset_function_resolver(struct tep_handle *tep) }static struct func_map * -find_func (struct tep_handle *pevent,unsigned long long addr) +find_func (struct tep_handle *tep,unsigned long long addr) {struct func_map *map; -if (!pevent->func_resolver) -return __find_func (pevent, addr); +if (!tep->func_resolver) +return __find_func (tep, addr); - map = &pevent->func_resolver->map; + map = &tep->func_resolver->map; map->mod =NULL ; map->addr = addr; - map->func = pevent->func_resolver->func (pevent->func_resolver->priv, - &map->addr, &map->mod); + map->func = tep->func_resolver->func (tep->func_resolver->priv, + &map->addr, &map->mod);if (map->func ==NULL )return NULL ;
@@ -662,18 +662,18 @@ static int printk_cmp(const void *a, const void *b)return 0 ; } -static int printk_map_init (struct tep_handle *pevent) +static int printk_map_init (struct tep_handle *tep) {struct printk_list *printklist;struct printk_list *item;struct printk_map *printk_map;int i; - printk_map =malloc (sizeof (*printk_map) * (pevent->printk_count +1 )); + printk_map =malloc (sizeof (*printk_map) * (tep->printk_count +1 ));if (!printk_map)return -1 ; - printklist = pevent->printklist; + printklist = tep->printklist; i =0 ;while (printklist) {
@@ -685,27 +685,27 @@ static int printk_map_init(struct tep_handle *pevent)free (item); } -qsort (printk_map, pevent->printk_count,sizeof (*printk_map), printk_cmp); +qsort (printk_map, tep->printk_count,sizeof (*printk_map), printk_cmp); - pevent->printk_map = printk_map; - pevent->printklist =NULL ; + tep->printk_map = printk_map; + tep->printklist =NULL ;return 0 ; }static struct printk_map * -find_printk (struct tep_handle *pevent,unsigned long long addr) +find_printk (struct tep_handle *tep,unsigned long long addr) {struct printk_map *printk;struct printk_map key; -if (!pevent->printk_map &&printk_map_init (pevent)) +if (!tep->printk_map &&printk_map_init (tep))return NULL ; key.addr = addr; - printk =bsearch (&key, pevent->printk_map, pevent->printk_count, -sizeof (*pevent->printk_map), printk_cmp); + printk =bsearch (&key, tep->printk_map, tep->printk_count, +sizeof (*tep->printk_map), printk_cmp);return printk; }
@@ -782,29 +782,29 @@ static struct tep_event *alloc_event(void)return calloc (1 ,sizeof (struct tep_event )); } -static int add_event (struct tep_handle *pevent,struct tep_event *event) +static int add_event (struct tep_handle *tep,struct tep_event *event) {int i; -struct tep_event **events =realloc (pevent->events,sizeof (event) * - (pevent->nr_events +1 )); +struct tep_event **events =realloc (tep->events,sizeof (event) * + (tep->nr_events +1 ));if (!events)return -1 ; - pevent->events = events; + tep->events = events; -for (i =0 ; i < pevent->nr_events; i++) { -if (pevent->events[i]->id > event->id) +for (i =0 ; i < tep->nr_events; i++) { +if (tep->events[i]->id > event->id)break ; } -if (i < pevent->nr_events) -memmove (&pevent->events[i +1 ], - &pevent->events[i], -sizeof (event) * (pevent->nr_events - i)); +if (i < tep->nr_events) +memmove (&tep->events[i +1 ], + &tep->events[i], +sizeof (event) * (tep->nr_events - i)); - pevent->events[i] = event; - pevent->nr_events++; + tep->events[i] = event; + tep->nr_events++; - event->tep = pevent; + event->tep = tep;return 0 ; }
@@ -2941,14 +2941,14 @@ process_bitmask(struct tep_event *event __maybe_unused, struct tep_print_arg *ar }static struct tep_function_handler * -find_func_handler (struct tep_handle *pevent,char *func_name) +find_func_handler (struct tep_handle *tep,char *func_name) {struct tep_function_handler *func; -if (!pevent) +if (!tep)return NULL ; -for (func = pevent->func_handlers; func; func = func->next) { +for (func = tep->func_handlers; func; func = func->next) {if (strcmp (func->name, func_name) ==0 )break ; }
@@ -2956,12 +2956,12 @@ find_func_handler(struct tep_handle *pevent, char *func_name)return func; } -static void remove_func_handler (struct tep_handle *pevent,char *func_name) +static void remove_func_handler (struct tep_handle *tep,char *func_name) {struct tep_function_handler *func;struct tep_function_handler **next; - next = &pevent->func_handlers; + next = &tep->func_handlers;while ((func = *next)) {if (strcmp (func->name, func_name) ==0 ) { *next = func->next;
@@ -3413,7 +3413,7 @@ int tep_read_number_field(struct tep_format_field *field, const void *data, } } -static int get_common_info (struct tep_handle *pevent, +static int get_common_info (struct tep_handle *tep,const char *type,int *offset,int *size) {struct tep_event *event;
@@ -3423,12 +3423,12 @@ static int get_common_info(struct tep_handle *pevent,* All events should have the same common elements. * Pick any event to find where the type is; */ -if (!pevent->events) { +if (!tep->events) {do_warning ("no event_list!" );return -1 ; } - event = pevent->events[0 ]; + event = tep->events[0 ]; field =tep_find_common_field (event, type);if (!field)return -1 ;
@@ -3439,58 +3439,58 @@ static int get_common_info(struct tep_handle *pevent,return 0 ; } -static int __parse_common (struct tep_handle *pevent,void *data, +static int __parse_common (struct tep_handle *tep,void *data,int *size,int *offset,const char *name) {int ret;if (!*size) { - ret =get_common_info (pevent, name, offset, size); + ret =get_common_info (tep, name, offset, size);if (ret <0 )return ret; } -return tep_read_number (pevent, data + *offset, *size); +return tep_read_number (tep, data + *offset, *size); } -static int trace_parse_common_type (struct tep_handle *pevent,void *data) +static int trace_parse_common_type (struct tep_handle *tep,void *data) { -return __parse_common (pevent, data, - &pevent->type_size, &pevent->type_offset, +return __parse_common (tep, data, + &tep->type_size, &tep->type_offset,"common_type" ); } -static int parse_common_pid (struct tep_handle *pevent,void *data) +static int parse_common_pid (struct tep_handle *tep,void *data) { -return __parse_common (pevent, data, - &pevent->pid_size, &pevent->pid_offset, +return __parse_common (tep, data, + &tep->pid_size, &tep->pid_offset,"common_pid" ); } -static int parse_common_pc (struct tep_handle *pevent,void *data) +static int parse_common_pc (struct tep_handle *tep,void *data) { -return __parse_common (pevent, data, - &pevent->pc_size, &pevent->pc_offset, +return __parse_common (tep, data, + &tep->pc_size, &tep->pc_offset,"common_preempt_count" ); } -static int parse_common_flags (struct tep_handle *pevent,void *data) +static int parse_common_flags (struct tep_handle *tep,void *data) { -return __parse_common (pevent, data, - &pevent->flags_size, &pevent->flags_offset, +return __parse_common (tep, data, + &tep->flags_size, &tep->flags_offset,"common_flags" ); } -static int parse_common_lock_depth (struct tep_handle *pevent,void *data) +static int parse_common_lock_depth (struct tep_handle *tep,void *data) { -return __parse_common (pevent, data, - &pevent->ld_size, &pevent->ld_offset, +return __parse_common (tep, data, + &tep->ld_size, &tep->ld_offset,"common_lock_depth" ); } -static int parse_common_migrate_disable (struct tep_handle *pevent,void *data) +static int parse_common_migrate_disable (struct tep_handle *tep,void *data) { -return __parse_common (pevent, data, - &pevent->ld_size, &pevent->ld_offset, +return __parse_common (tep, data, + &tep->ld_size, &tep->ld_offset,"common_migrate_disable" ); }
@@ -3566,7 +3566,7 @@ tep_find_event_by_name(struct tep_handle *tep,static unsigned long long eval_num_arg (void *data,int size,struct tep_event *event,struct tep_print_arg *arg) { -struct tep_handle *pevent = event->tep; +struct tep_handle *tep = event->tep;unsigned long long val =0 ;unsigned long long left, right;struct tep_print_arg *typearg =NULL ;
@@ -3588,7 +3588,7 @@ eval_num_arg(void *data, int size, struct tep_event *event, struct tep_print_arg }/* must be a number */ - val =tep_read_number (pevent, data + arg->field.field->offset, + val =tep_read_number (tep, data + arg->field.field->offset, arg->field.field->size);break ;case TEP_PRINT_FLAGS :
@@ -3628,11 +3628,11 @@ eval_num_arg(void *data, int size, struct tep_event *event, struct tep_print_arg }/* Default to long size */ - field_size = pevent->long_size; + field_size = tep->long_size;switch (larg->type) {case TEP_PRINT_DYNAMIC_ARRAY : - offset =tep_read_number (pevent, + offset =tep_read_number (tep, data + larg->dynarray.field->offset, larg->dynarray.field->size);if (larg->dynarray.field->elementsize)
@@ -3661,7 +3661,7 @@ eval_num_arg(void *data, int size, struct tep_event *event, struct tep_print_argdefault : goto default_op;/* oops, all bets off */ } - val =tep_read_number (pevent, + val =tep_read_number (tep, data + offset, field_size);if (typearg) val =eval_type (val, typearg,1 );
@@ -3762,7 +3762,7 @@ eval_num_arg(void *data, int size, struct tep_event *event, struct tep_print_arg }break ;case TEP_PRINT_DYNAMIC_ARRAY_LEN : - offset =tep_read_number (pevent, + offset =tep_read_number (tep, data + arg->dynarray.field->offset, arg->dynarray.field->size);/*
@@ -3774,7 +3774,7 @@ eval_num_arg(void *data, int size, struct tep_event *event, struct tep_print_argbreak ;case TEP_PRINT_DYNAMIC_ARRAY :/* Without [], we pass the address to the dynamic data */ - offset =tep_read_number (pevent, + offset =tep_read_number (tep, data + arg->dynarray.field->offset, arg->dynarray.field->size);/*
@@ -3849,7 +3849,7 @@ static void print_str_to_seq(struct trace_seq *s, const char *format,trace_seq_printf (s, format, str); } -static void print_bitmask_to_seq (struct tep_handle *pevent, +static void print_bitmask_to_seq (struct tep_handle *tep,struct trace_seq *s,const char *format,int len_arg,const void *data,int size) {
@@ -3881,7 +3881,7 @@ static void print_bitmask_to_seq(struct tep_handle *pevent,* In the kernel, this is an array of long words, thus * endianness is very important. */ -if (pevent->file_bigendian) +if (tep->file_bigendian) index = size - (len +1 );else index = len;
@@ -3907,7 +3907,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, struct tep_event *event, const char *format, int len_arg, struct tep_print_arg *arg) { - struct tep_handle *pevent = event->tep; + struct tep_handle *tep = event->tep;struct tep_print_flag_sym *flag;struct tep_format_field *field;struct printk_map *printk;
@@ -3944,7 +3944,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,* is a pointer. */ if (!(field->flags &TEP_FIELD_IS_ARRAY ) && - field->size == pevent->long_size) { + field->size == tep->long_size) {/* Handle heterogeneous recording and processing * architectures
@@ -3959,12 +3959,12 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,* on 32-bit devices: * In this case, 64 bits must be read. */ - addr = (pevent->long_size ==8 ) ? + addr = (tep->long_size ==8 ) ? *(unsigned long long *)(data + field->offset) : (unsigned long long )*(unsigned int *)(data + field->offset);/* Check if it matches a print format */ - printk =find_printk (pevent, addr); + printk =find_printk (tep, addr);if (printk)trace_seq_puts (s, printk->printk);else
@@ -4021,7 +4021,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,case TEP_PRINT_HEX_STR :if (arg->hex.field->type ==TEP_PRINT_DYNAMIC_ARRAY ) {unsigned long offset; - offset =tep_read_number (pevent, + offset =tep_read_number (tep, data + arg->hex.field->dynarray.field->offset, arg->hex.field->dynarray.field->size); hex = data + (offset &0xffff );
@@ -4052,7 +4052,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,unsigned long offset;struct tep_format_field *field = arg->int_array.field->dynarray.field; - offset =tep_read_number (pevent, + offset =tep_read_number (tep, data + field->offset, field->size); num = data + (offset &0xffff );
@@ -4103,7 +4103,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, f =tep_find_any_field (event, arg->string.string); arg->string.offset = f->offset; } - str_offset =tep_data2host4 (pevent, *(unsigned int *)(data + arg->string.offset)); + str_offset =tep_data2host4 (tep, *(unsigned int *)(data + arg->string.offset)); str_offset &=0xffff ;print_str_to_seq (s, format, len_arg, ((char *)data) + str_offset);break ;
@@ -4121,10 +4121,10 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, f =tep_find_any_field (event, arg->bitmask.bitmask); arg->bitmask.offset = f->offset; } - bitmask_offset =tep_data2host4 (pevent, *(unsigned int *)(data + arg->bitmask.offset)); + bitmask_offset =tep_data2host4 (tep, *(unsigned int *)(data + arg->bitmask.offset)); bitmask_size = bitmask_offset >>16 ; bitmask_offset &=0xffff ; -print_bitmask_to_seq (pevent, s, format, len_arg, +print_bitmask_to_seq (tep, s, format, len_arg, data + bitmask_offset, bitmask_size);break ; }
@@ -4256,7 +4256,7 @@ static void free_args(struct tep_print_arg *args)static struct tep_print_arg *make_bprint_args (char *fmt,void *data,int size,struct tep_event *event) { -struct tep_handle *pevent = event->tep; +struct tep_handle *tep = event->tep;struct tep_format_field *field, *ip_field;struct tep_print_arg *args, *arg, **next;unsigned long long ip, val;
@@ -4264,8 +4264,8 @@ static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, svoid *bptr;int vsize =0 ; - field = pevent->bprint_buf_field; - ip_field = pevent->bprint_ip_field; + field = tep->bprint_buf_field; + ip_field = tep->bprint_ip_field;if (!field) { field =tep_find_field (event,"buf" );
@@ -4278,11 +4278,11 @@ static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, sdo_warning_event (event,"can't find ip field for binary printk" );return NULL ; } - pevent->bprint_buf_field = field; - pevent->bprint_ip_field = ip_field; + tep->bprint_buf_field = field; + tep->bprint_ip_field = ip_field; } - ip =tep_read_number (pevent, data + ip_field->offset, ip_field->size); + ip =tep_read_number (tep, data + ip_field->offset, ip_field->size);/* * The first arg is the IP pointer.
@@ -4359,7 +4359,7 @@ static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, s vsize =4 ;break ;case 1 : - vsize = pevent->long_size; + vsize = tep->long_size;break ;case 2 : vsize =8 ;
@@ -4376,7 +4376,7 @@ static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, s/* the pointers are always 4 bytes aligned */ bptr = (void *)(((unsigned long )bptr +3 ) & ~3 ); - val =tep_read_number (pevent, bptr, vsize); + val =tep_read_number (tep, bptr, vsize); bptr += vsize; arg =alloc_arg ();if (!arg) {
@@ -4433,13 +4433,13 @@ static char * get_bprint_format(void *data, int size __maybe_unused, struct tep_event *event) { -struct tep_handle *pevent = event->tep; +struct tep_handle *tep = event->tep;unsigned long long addr;struct tep_format_field *field;struct printk_map *printk;char *format; - field = pevent->bprint_fmt_field; + field = tep->bprint_fmt_field;if (!field) { field =tep_find_field (event,"fmt" );
@@ -4447,12 +4447,12 @@ get_bprint_format(void *data, int size __maybe_unused,do_warning_event (event,"can't find format field for binary printk" );return NULL ; } - pevent->bprint_fmt_field = field; + tep->bprint_fmt_field = field; } - addr =tep_read_number (pevent, data + field->offset, field->size); + addr =tep_read_number (tep, data + field->offset, field->size); - printk =find_printk (pevent, addr); + printk =find_printk (tep, addr);if (!printk) {if (asprintf (&format,"%%pf: (NO FORMAT FOUND at %llx)\n" , addr) <0 )return NULL ;
@@ -4834,13 +4834,13 @@ void tep_print_field(struct trace_seq *s, void *data, {unsigned long long val;unsigned int offset, len, i; -struct tep_handle *pevent = field->event->tep; +struct tep_handle *tep = field->event->tep;if (field->flags &TEP_FIELD_IS_ARRAY ) { offset = field->offset; len = field->size;if (field->flags &TEP_FIELD_IS_DYNAMIC ) { - val =tep_read_number (pevent, data + offset, len); + val =tep_read_number (tep, data + offset, len); offset = val; len = offset >>16 ; offset &=0xffff ;
@@ -4860,7 +4860,7 @@ void tep_print_field(struct trace_seq *s, void *data, field->flags &= ~TEP_FIELD_IS_STRING ; } }else { - val =tep_read_number (pevent, data + field->offset, + val =tep_read_number (tep, data + field->offset, field->size);if (field->flags &TEP_FIELD_IS_POINTER ) {trace_seq_printf (s,"0x%llx" , val);
@@ -4909,7 +4909,7 @@ void tep_print_fields(struct trace_seq *s, void *data,static void pretty_print (struct trace_seq *s,void *data,int size,struct tep_event *event) { -struct tep_handle *pevent = event->tep; +struct tep_handle *tep = event->tep;struct tep_print_fmt *print_fmt = &event->print_fmt;struct tep_print_arg *arg = print_fmt->args;struct tep_print_arg *args =NULL ;
@@ -5001,7 +5001,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_ecase '-' : goto cont_process;case 'p' : -if (pevent->long_size ==4 ) +if (tep->long_size ==4 ) ls =1 ;else ls =2 ;
@@ -5062,7 +5062,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_e arg = arg->next;if (show_func) { - func =find_func (pevent, val); + func =find_func (tep, val);if (func) {trace_seq_puts (s, func->func);if (show_func =='F' )
@@ -5072,7 +5072,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_ebreak ; } } -if (pevent->long_size ==8 && ls ==1 && +if (tep->long_size ==8 && ls ==1 &&sizeof (long ) !=8 ) {char *p;
@@ -5319,14 +5319,14 @@ const char *tep_data_comm_from_pid(struct tep_handle *tep, int pid) }static struct tep_cmdline * -pid_from_cmdlist (struct tep_handle *pevent,const char *comm,struct tep_cmdline *next) +pid_from_cmdlist (struct tep_handle *tep,const char *comm,struct tep_cmdline *next) {struct cmdline_list *cmdlist = (struct cmdline_list *)next;if (cmdlist) cmdlist = cmdlist->next;else - cmdlist = pevent->cmdlist; + cmdlist = tep->cmdlist;while (cmdlist &&strcmp (cmdlist->comm, comm) !=0 ) cmdlist = cmdlist->next;
@@ -6012,11 +6012,11 @@ static void free_handler(struct event_handler *handle)free (handle); } -static int find_event_handle (struct tep_handle *pevent,struct tep_event *event) +static int find_event_handle (struct tep_handle *tep,struct tep_event *event) {struct event_handler *handle, **next; -for (next = &pevent->handlers; *next; +for (next = &tep->handlers; *next; next = &(*next)->next) { handle = *next; if (event_matches(event, handle->id,
@@ -6054,7 +6054,7 @@ static int find_event_handle(struct tep_handle *pevent, struct tep_event *event)* /sys/kernel/debug/tracing/events/.../.../format */ enum tep_errno __tep_parse_format (struct tep_event **eventp, -struct tep_handle *pevent,const char *buf, +struct tep_handle *tep,const char *buf,unsigned long size,const char *sys) {struct tep_event *event;
@@ -6096,8 +6096,8 @@ enum tep_errno __tep_parse_format(struct tep_event **eventp, goto event_alloc_failed; } -/* Add pevent to event so that it can be referenced */ - event->tep = pevent; +/* Add tep to event so that it can be referenced */ + event->tep = tep; ret =event_read_format (event);if (ret <0 ) {
@@ -6109,7 +6109,7 @@ enum tep_errno __tep_parse_format(struct tep_event **eventp,* If the event has an override, don't print warnings if the event * print format fails to parse. */ -if (pevent &&find_event_handle (pevent, event)) +if (tep &&find_event_handle (tep, event)) show_warning =0 ; ret =event_read_print (event);
@@ -6161,18 +6161,18 @@ enum tep_errno __tep_parse_format(struct tep_event **eventp, }static enum tep_errno -__parse_event (struct tep_handle *pevent, +__parse_event (struct tep_handle *tep,struct tep_event **eventp,const char *buf,unsigned long size,const char *sys) { -int ret =__tep_parse_format (eventp, pevent, buf, size, sys); +int ret =__tep_parse_format (eventp, tep, buf, size, sys);struct tep_event *event = *eventp;if (event ==NULL )return ret; -if (pevent &&add_event (pevent, event)) { +if (tep &&add_event (tep, event)) { ret =TEP_ERRNO__MEM_ALLOC_FAILED ; goto event_add_failed; }
@@ -6426,7 +6426,7 @@ int tep_print_func_field(struct trace_seq *s, const char *fmt, struct tep_record *record, int err) {struct tep_format_field *field =tep_find_field (event, name); -struct tep_handle *pevent = event->tep; +struct tep_handle *tep = event->tep;unsigned long long val;struct func_map *func;char tmp[128 ];
@@ -6437,7 +6437,7 @@ int tep_print_func_field(struct trace_seq *s, const char *fmt,if (tep_read_number_field (field, record->data, &val)) goto failed; - func =find_func (pevent, val); + func =find_func (tep, val);if (func)snprintf (tmp,128 ,"%s/0x%llx" , func->func, func->addr - val);
@@ -6582,7 +6582,7 @@ int tep_unregister_print_function(struct tep_handle *tep,return -1 ; } -static struct tep_event *search_event (struct tep_handle *pevent,int id, +static struct tep_event *search_event (struct tep_handle *tep,int id,const char *sys_name,const char *event_name) {
@@ -6590,7 +6590,7 @@ static struct tep_event *search_event(struct tep_handle *pevent, int id,if (id >=0 ) {/* search by id */ - event =tep_find_event (pevent, id); + event =tep_find_event (tep, id);if (!event)return NULL ;if (event_name && (strcmp (event_name, event->name) !=0 ))
@@ -6598,7 +6598,7 @@ static struct tep_event *search_event(struct tep_handle *pevent, int id,if (sys_name && (strcmp (sys_name, event->system) !=0 ))return NULL ; }else { - event =tep_find_event_by_name (pevent, sys_name, event_name); + event =tep_find_event_by_name (tep, sys_name, event_name);if (!event)return NULL ; }
@@ -6755,14 +6755,14 @@ int tep_unregister_event_handler(struct tep_handle *tep, int id,*/ struct tep_handle *tep_alloc (void ) { -struct tep_handle *pevent =calloc (1 ,sizeof (*pevent)); +struct tep_handle *tep =calloc (1 ,sizeof (*tep)); -if (pevent) { - pevent->ref_count =1 ; - pevent->host_bigendian =tep_is_bigendian (); +if (tep) { + tep->ref_count =1 ; + tep->host_bigendian =tep_is_bigendian (); } -return pevent; +return tep; }void tep_ref (struct tep_handle *tep)
tools/lib/traceevent/event-plugin.c +12 -12
@@ -269,7 +269,7 @@ void tep_print_plugins(struct trace_seq *s, }static void -load_plugin (struct tep_handle *pevent,const char *path, +load_plugin (struct tep_handle *tep,const char *path,const char *file,void *data) {struct tep_plugin_list **plugin_list = data;
@@ -316,7 +316,7 @@ load_plugin(struct tep_handle *pevent, const char *path, *plugin_list = list;pr_stat ("registering plugin: %s" , plugin); -func (pevent); +func (tep);return ; out_free:
@@ -324,9 +324,9 @@ load_plugin(struct tep_handle *pevent, const char *path, } static void -load_plugins_dir(struct tep_handle *pevent, const char *suffix, +load_plugins_dir(struct tep_handle *tep, const char *suffix, const char *path, - void (*load_plugin)(struct tep_handle *pevent, + void (*load_plugin)(struct tep_handle *tep, const char *path, const char *name, void *data),
@@ -359,15 +359,15 @@ load_plugins_dir(struct tep_handle *pevent, const char *suffix,if (strcmp (name + (strlen (name) -strlen (suffix)), suffix) !=0 )continue ; -load_plugin (pevent, path, name, data); +load_plugin (tep, path, name, data); }closedir (dir); } static void -load_plugins(struct tep_handle *pevent, const char *suffix, - void (*load_plugin)(struct tep_handle *pevent, +load_plugins(struct tep_handle *tep, const char *suffix, + void (*load_plugin)(struct tep_handle *tep, const char *path, const char *name, void *data),
@@ -378,7 +378,7 @@ load_plugins(struct tep_handle *pevent, const char *suffix,char *envdir;int ret; -if (pevent->flags &TEP_DISABLE_PLUGINS ) +if (tep->flags &TEP_DISABLE_PLUGINS )return ;/*
@@ -386,8 +386,8 @@ load_plugins(struct tep_handle *pevent, const char *suffix,* check that first. */ #ifdef PLUGIN_DIR -if (!(pevent->flags &TEP_DISABLE_SYS_PLUGINS )) -load_plugins_dir (pevent, suffix,PLUGIN_DIR , +if (!(tep->flags &TEP_DISABLE_SYS_PLUGINS )) +load_plugins_dir (tep, suffix,PLUGIN_DIR , load_plugin, data);#endif
@@ -397,7 +397,7 @@ load_plugins(struct tep_handle *pevent, const char *suffix,*/ envdir =getenv ("TRACEEVENT_PLUGIN_DIR" );if (envdir) -load_plugins_dir (pevent, suffix, envdir, load_plugin, data); +load_plugins_dir (tep, suffix, envdir, load_plugin, data);/* * Now let the home directory override the environment
@@ -413,7 +413,7 @@ load_plugins(struct tep_handle *pevent, const char *suffix,return ; } -load_plugins_dir (pevent, suffix, path, load_plugin, data); +load_plugins_dir (tep, suffix, path, load_plugin, data);free (path); }
tools/lib/traceevent/parse-filter.c +13 -13
@@ -256,7 +256,7 @@ static int event_match(struct tep_event *event, }static enum tep_errno -find_event (struct tep_handle *pevent,struct event_list **events, +find_event (struct tep_handle *tep,struct event_list **events,char *sys_name,char *event_name) {struct tep_event *event;
@@ -299,8 +299,8 @@ find_event(struct tep_handle *pevent, struct event_list **events, } } -for (i =0 ; i < pevent->nr_events; i++) { - event = pevent->events[i]; +for (i =0 ; i < tep->nr_events; i++) { + event = tep->events[i];if (event_match (event, sys_name ? &sreg :NULL , &ereg)) { match =1 ;if (add_event (events, event) <0 ) {
@@ -1257,7 +1257,7 @@ static void filter_init_error_buf(struct tep_event_filter *filter)enum tep_errno tep_filter_add_filter_str (struct tep_event_filter *filter,const char *filter_str) { -struct tep_handle *pevent = filter->tep; +struct tep_handle *tep = filter->tep;struct event_list *event;struct event_list *events =NULL ;const char *filter_start;
@@ -1313,7 +1313,7 @@ enum tep_errno tep_filter_add_filter_str(struct tep_event_filter *filter, }/* Find this event */ - ret =find_event (pevent, &events,strim (sys_name),strim (event_name)); + ret =find_event (tep, &events,strim (sys_name),strim (event_name));if (ret <0 ) {free_events (events);free (this_event);
@@ -1334,7 +1334,7 @@ enum tep_errno tep_filter_add_filter_str(struct tep_event_filter *filter,if (ret <0 ) rtn = ret; -if (ret >=0 && pevent->test_filters) { +if (ret >=0 && tep->test_filters) {char *test; test =tep_filter_make_string (filter, event->event->id);if (test) {
@@ -1346,7 +1346,7 @@ enum tep_errno tep_filter_add_filter_str(struct tep_event_filter *filter,free_events (events); -if (rtn >=0 && pevent->test_filters) +if (rtn >=0 && tep->test_filters)exit (0 );return rtn;
@@ -1462,7 +1462,7 @@ static int copy_filter_type(struct tep_event_filter *filter,const char *name;char *str; -/* Can't assume that the pevent's are the same */ +/* Can't assume that the tep's are the same */ sys = filter_type->event->system; name = filter_type->event->name; event =tep_find_event_by_name (filter->tep, sys, name);
@@ -1700,7 +1700,7 @@ static int test_num(struct tep_event *event, struct tep_filter_arg *arg,static const char *get_field_str (struct tep_filter_arg *arg,struct tep_record *record) {struct tep_event *event; -struct tep_handle *pevent; +struct tep_handle *tep;unsigned long long addr;const char *val =NULL ;unsigned int size;
@@ -1730,12 +1730,12 @@ static const char *get_field_str(struct tep_filter_arg *arg, struct tep_record * }else { event = arg->str.field->event; - pevent = event->tep; + tep = event->tep; addr =get_value (event, arg->str.field, record);if (arg->str.field->flags & (TEP_FIELD_IS_POINTER |TEP_FIELD_IS_LONG ))/* convert to a kernel symbol */ - val =tep_find_function (pevent, addr); + val =tep_find_function (tep, addr);if (val ==NULL ) {/* just use the hex of the string name */
@@ -1875,7 +1875,7 @@ int tep_event_filtered(struct tep_event_filter *filter, int event_id)enum tep_errno tep_filter_match (struct tep_event_filter *filter,struct tep_record *record) { -struct tep_handle *pevent = filter->tep; +struct tep_handle *tep = filter->tep;struct tep_filter_type *filter_type;int event_id;int ret;
@@ -1886,7 +1886,7 @@ enum tep_errno tep_filter_match(struct tep_event_filter *filter,if (!filter->filters)return TEP_ERRNO__NO_FILTER ; - event_id =tep_data_type (pevent, record); + event_id =tep_data_type (tep, record); filter_type =find_filter_type (filter, event_id);if (!filter_type)
tools/lib/traceevent/plugin_function.c +3 -3
@@ -126,7 +126,7 @@ static int add_and_get_index(const char *parent, const char *child, int cpu)static int function_handler (struct trace_seq *s,struct tep_record *record,struct tep_event *event,void *context) { -struct tep_handle *pevent = event->tep; +struct tep_handle *tep = event->tep;unsigned long long function;unsigned long long pfunction;const char *func;
@@ -136,12 +136,12 @@ static int function_handler(struct trace_seq *s, struct tep_record *record,if (tep_get_field_val (s, event,"ip" , record, &function,1 ))return trace_seq_putc (s,'!' ); - func =tep_find_function (pevent, function); + func =tep_find_function (tep, function);if (tep_get_field_val (s, event,"parent_ip" , record, &pfunction,1 ))return trace_seq_putc (s,'!' ); - parent =tep_find_function (pevent, pfunction); + parent =tep_find_function (tep, pfunction);if (parent && ftrace_indent->set) index =add_and_get_index (parent, func, record->cpu);
Signature · 1 line
2.20.1
cover tools/lib/traceevent: Continuing on the path to a stand alone library
Arnaldo,
These contain more patches to make libtraceevent a stand alone library. It also brings in some changes that are in the trace-cmd library.
There's a few name changes to the API function names to be more descriptive as well as closer to what they actually do.
The "pevent" has been renamed to "tep" as we no longer use "pevent" to represent the handle to the libtraceevent library descriptor. "tep" now stands for "Trace Event Parser".
The reason for the "(Red Hat)" in one of my patches is that the code was written when I was working for Red Hat, but added when working for VMware (which is in the Signed-off-by).
Steven Rostedt (Red Hat) (1):
tools/lib/traceevent: Add more debugging to see various internal ring buffer entries
Steven Rostedt (VMware) (3):
tools lib traceevent: Handle trace_printk() "%px" tools/lib/traceevent: Add mono clocks to be parsed in seconds tools/lib/traceevent: Removed unneeded !! and return parenthesis
Tzvetomir Stoyanov (11):
tools lib traceevent: Implement a new API, tep_list_events_copy() tools/lib/traceevent: Change description of few APIs
tools/lib/traceevent: Coding style fixes
tools/lib/traceevent: Implement new traceevent APIs for accessing struct tep_handler fields tools/lib/traceevent: Remove tep filter trivial APIs
tools/lib/traceevent: Remove call to exit() from tep_filter_add_filter_str() tools/perf,tools/lib/traceevent: Make traceevent APIs more consistent tools/lib/traceevent: Rename input arguments of libtraceevent APIs from pevent to tep tools/perf,tools/lib/traceevent: Rename "pevent" member of struct tep_event to "tep" tools/perf,tools/lib/traceevent: Rename "pevent" member of struct tep_event_filter to "tep" tools/lib/traceevent: Rename input arguments and local variables of libtraceevent from pevent to tep
----
tools/lib/traceevent/event-parse-api.c | 278 +++++-- tools/lib/traceevent/event-parse-local.h | 6 +- tools/lib/traceevent/event-parse.c | 909 +++++++++++---------- tools/lib/traceevent/event-parse.h | 154 ++-- tools/lib/traceevent/event-plugin.c | 32 +- tools/lib/traceevent/kbuffer-parse.c | 49 ++ tools/lib/traceevent/kbuffer.h | 13 + tools/lib/traceevent/parse-filter.c | 216 +---- tools/lib/traceevent/plugin_cfg80211.c | 8 +- tools/lib/traceevent/plugin_function.c | 14 +- tools/lib/traceevent/plugin_hrtimer.c | 12 +- tools/lib/traceevent/plugin_jbd2.c | 12 +- tools/lib/traceevent/plugin_kmem.c | 32 +- tools/lib/traceevent/plugin_kvm.c | 48 +- tools/lib/traceevent/plugin_mac80211.c | 8 +- tools/lib/traceevent/plugin_sched_switch.c | 18 +- tools/lib/traceevent/plugin_scsi.c | 8 +- tools/lib/traceevent/plugin_xen.c | 8 +- tools/perf/builtin-kmem.c | 2 +- tools/perf/util/data-convert-bt.c | 4 +- tools/perf/util/python.c | 2 +- .../perf/util/scripting-engines/trace-event-perl.c | 2 +- .../util/scripting-engines/trace-event-python.c | 2 +- tools/perf/util/trace-event-parse.c | 2 +- tools/perf/util/trace-event-read.c | 2 +- tools/perf/util/trace-event.c | 4 +- 26 files changed, 946 insertions(+), 899 deletions(-)
PATCH 1/15 tools lib traceevent: Handle trace_printk() "%px"
From: "Steven Rostedt (VMware)" <[email protected]>
With security updates, %p in the kernel is hashed to protect true kernel locations. But trace_printk() is not allowed in production systems, and when a pointer is used, there are many times that the actual address is needed. "%px" produces the real address. But libtraceevent does not know how to handle that extension. Add it.
--- tools/lib/traceevent/event-parse.c | 1 + 1 file changed, 1 insertion(+)
tools/lib/traceevent/event-parse.c +1 -0
@@ -4338,6 +4338,7 @@ static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, scase 'S' :case 'f' :case 'F' : +case 'x' :break ;default :/*
Signature · 1 line
2.20.1
tip-bot for Steven Rostedt (VMware)
merge bot[tip:perf/core] tools lib traceevent: Handle trace_printk() "%px"
tools lib traceevent: Handle trace_printk() "%px"
Commit-ID: 328b82b7497787cf4e4856a216dbf4e8a54c06a6 Gitweb: https://git.kernel.org/tip/328b82b7497787cf4e4856a216dbf4e8a54c06a6 Author: Steven Rostedt (VMware) <[email protected]> AuthorDate: Mon, 1 Apr 2019 12:43:06 -0400 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 1 Apr 2019 15:18:08 -0300
tools lib traceevent: Handle trace_printk() "%px"
With security updates, %p in the kernel is hashed to protect true kernel locations. But trace_printk() is not allowed in production systems, and when a pointer is used, there are many times that the actual address is needed. "%px" produces the real address. But libtraceevent does not know how to handle that extension. Add it.
--- tools/lib/traceevent/event-parse.c | 1 + 1 file changed, 1 insertion(+)
tools/lib/traceevent/event-parse.c +1 -0
@@ -4338,6 +4338,7 @@ static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, scase 'S' :case 'f' :case 'F' : +case 'x' :break ;default :/*
PATCH 2/15 tools/lib/traceevent: Add mono clocks to be parsed in seconds
In reply to Steven RostedtFrom: "Steven Rostedt (VMware)" <[email protected]>
The mono clocks can display in seconds instead of whole numbers:
trace-cmd-521 [001] 99176715281005: sched_waking: comm=kworker/u16:2 pid=32118 prio=120 target_cpu=002
trace-cmd-521 [001] 99176715286349: sched_wake_idle_without_ipi: cpu=2
trace-cmd-521 [001] 99176715288047: sched_wakeup: kworker/u16:2:32118 [120] success=1 CPU:002
trace-cmd-521 [001] 99176715290022: sched_waking: comm=trace-cmd pid=523 prio=120 target_cpu=000
trace-cmd-521 [001] 99176715292332: sched_wake_idle_without_ipi: cpu=0
trace-cmd-521 [001] 99176715292855: sched_wakeup: trace-cmd:523 [120] success=1 CPU:000
trace-cmd-521 [001] 99176715300697: sched_stat_runtime: comm=trace-cmd pid=521 runtime=80233 [ns] vruntime=66705540554 [nsBreak it up in seconds:
trace-cmd-521 [001] 99176.715281: sched_waking: comm=kworker/u16:2 pid=32118 prio=120 target_cpu=002
trace-cmd-521 [001] 99176.715286: sched_wake_idle_without_ipi: cpu=2
trace-cmd-521 [001] 99176.715288: sched_wakeup: kworker/u16:2:32118 [120] success=1 CPU:002
trace-cmd-521 [001] 99176.715290: sched_waking: comm=trace-cmd pid=523 prio=120 target_cpu=000
trace-cmd-521 [001] 99176.715292: sched_wake_idle_without_ipi: cpu=0
trace-cmd-521 [001] 99176.715293: sched_wakeup: trace-cmd:523 [120] success=1 CPU:000
trace-cmd-521 [001] 99176.715301: sched_stat_runtime: comm=trace-cmd pid=521 runtime=80233 [ns] vruntime=66705540554 [ns]--- tools/lib/traceevent/event-parse.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/lib/traceevent/event-parse.c +2 -1
@@ -5445,7 +5445,8 @@ static bool is_timestamp_in_us(char *trace_clock, bool use_trace_clock)return true;if (!strcmp (trace_clock,"local" ) || !strcmp (trace_clock,"global" ) - || !strcmp (trace_clock,"uptime" ) || !strcmp (trace_clock,"perf" )) + || !strcmp (trace_clock,"uptime" ) || !strcmp (trace_clock,"perf" ) + || !strncmp (trace_clock,"mono" ,4 ))return true;/* trace_clock is setting in tsc or counter mode */
Signature · 1 line
2.20.1
tip-bot for Steven Rostedt (VMware)
merge bot[tip:perf/core] tools lib traceevent: Add mono clocks to be parsed in seconds
tools lib traceevent: Add mono clocks to be parsed in seconds
Commit-ID: fed33e905c4beea96a066686f8be2b489eb5068e Gitweb: https://git.kernel.org/tip/fed33e905c4beea96a066686f8be2b489eb5068e Author: Steven Rostedt (VMware) <[email protected]> AuthorDate: Mon, 1 Apr 2019 12:43:07 -0400 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 1 Apr 2019 15:18:08 -0300
tools lib traceevent: Add mono clocks to be parsed in seconds
The mono clocks can display in seconds instead of whole numbers:
trace-cmd-521 [001] 99176715281005: sched_waking: comm=kworker/u16:2 pid=32118 prio=120 target_cpu=002
trace-cmd-521 [001] 99176715286349: sched_wake_idle_without_ipi: cpu=2
trace-cmd-521 [001] 99176715288047: sched_wakeup: kworker/u16:2:32118 [120] success=1 CPU:002
trace-cmd-521 [001] 99176715290022: sched_waking: comm=trace-cmd pid=523 prio=120 target_cpu=000
trace-cmd-521 [001] 99176715292332: sched_wake_idle_without_ipi: cpu=0
trace-cmd-521 [001] 99176715292855: sched_wakeup: trace-cmd:523 [120] success=1 CPU:000
trace-cmd-521 [001] 99176715300697: sched_stat_runtime: comm=trace-cmd pid=521 runtime=80233 [ns] vruntime=66705540554 [nsBreak it up in seconds:
trace-cmd-521 [001] 99176.715281: sched_waking: comm=kworker/u16:2 pid=32118 prio=120 target_cpu=002
trace-cmd-521 [001] 99176.715286: sched_wake_idle_without_ipi: cpu=2
trace-cmd-521 [001] 99176.715288: sched_wakeup: kworker/u16:2:32118 [120] success=1 CPU:002
trace-cmd-521 [001] 99176.715290: sched_waking: comm=trace-cmd pid=523 prio=120 target_cpu=000
trace-cmd-521 [001] 99176.715292: sched_wake_idle_without_ipi: cpu=0
trace-cmd-521 [001] 99176.715293: sched_wakeup: trace-cmd:523 [120] success=1 CPU:000
trace-cmd-521 [001] 99176.715301: sched_stat_runtime: comm=trace-cmd pid=521 runtime=80233 [ns] vruntime=66705540554 [ns]--- tools/lib/traceevent/event-parse.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/lib/traceevent/event-parse.c +2 -1
@@ -5445,7 +5445,8 @@ static bool is_timestamp_in_us(char *trace_clock, bool use_trace_clock)return true;if (!strcmp (trace_clock,"local" ) || !strcmp (trace_clock,"global" ) - || !strcmp (trace_clock,"uptime" ) || !strcmp (trace_clock,"perf" )) + || !strcmp (trace_clock,"uptime" ) || !strcmp (trace_clock,"perf" ) + || !strncmp (trace_clock,"mono" ,4 ))return true;/* trace_clock is setting in tsc or counter mode */
PATCH 3/15 tools lib traceevent: Implement a new API, tep_list_events_copy()
In reply to Steven RostedtFrom: Tzvetomir Stoyanov <[email protected]>
Existing API tep_list_events() is not thread safe, it uses the internal array sort_events to keep cache of the sorted events and reuses it. This patch implements a new API, tep_list_events_copy(), which allocates new sorted array each time it is called. It could be used when a sorted events functionality is needed in thread safe use cases. It is up to the caller to free the array.
--- tools/lib/traceevent/event-parse.c | 109 +++++++++++++++++++++++------ tools/lib/traceevent/event-parse.h | 5 +- 2 files changed, 91 insertions(+), 23 deletions(-)
tools/lib/traceevent/event-parse.c +87 -22
@@ -5651,32 +5651,26 @@ static int events_system_cmp(const void *a, const void *b)return events_id_cmp (a, b); } -struct tep_event **tep_list_events (struct tep_handle *pevent,enum tep_event_sort_type sort_type) +static struct tep_event **list_events_copy (struct tep_handle *tep) {struct tep_event **events; -int (*sort)(const void *a,const void *b); - - events = pevent->sort_events; - -if (events && pevent->last_type == sort_type) -return events; -if (!events) { - events =malloc (sizeof (*events) * (pevent->nr_events +1 )); -if (!events) -return NULL ; +if (!tep) +return NULL ; -memcpy (events, pevent->events,sizeof (*events) * pevent->nr_events); - events[pevent->nr_events] =NULL ; + events =malloc (sizeof (*events) * (tep->nr_events +1 )); +if (!events) +return NULL ; - pevent->sort_events = events; +memcpy (events, tep->events,sizeof (*events) * tep->nr_events); + events[tep->nr_events] =NULL ; +return events; +} -/* the internal events are sorted by id */ -if (sort_type ==TEP_EVENT_SORT_ID ) { - pevent->last_type = sort_type; -return events; - } - } +static void list_events_sort (struct tep_event **events,int nr_events, +enum tep_event_sort_type sort_type) +{ +int (*sort)(const void *a,const void *b);switch (sort_type) {case TEP_EVENT_SORT_ID :
@@ -5689,11 +5683,82 @@ struct tep_event **tep_list_events(struct tep_handle *pevent, enum tep_event_sor sort = events_system_cmp;break ;default : + sort =NULL ; + } + +if (sort) +qsort (events, nr_events,sizeof (*events), sort); +} + +/** +* tep_list_events - Get events, sorted by given criteria. +* @tep: a handle to the tep context +* @sort_type: desired sort order of the events in the array +* +* Returns an array of pointers to all events, sorted by the given +* @sort_type criteria. The last element of the array is NULL. The returned +* memory must not be freed, it is managed by the library. +* The function is not thread safe. +*/ +struct tep_event **tep_list_events (struct tep_handle *tep, +enum tep_event_sort_type sort_type) +{ +struct tep_event **events; + +if (!tep) +return NULL ; + + events = tep->sort_events; +if (events && tep->last_type == sort_type)return events; + +if (!events) { + events =list_events_copy (tep); +if (!events) +return NULL ; + + tep->sort_events = events; + +/* the internal events are sorted by id */ +if (sort_type ==TEP_EVENT_SORT_ID ) { + tep->last_type = sort_type; +return events; + } } -qsort (events, pevent->nr_events,sizeof (*events), sort); - pevent->last_type = sort_type; +list_events_sort (events, tep->nr_events, sort_type); + tep->last_type = sort_type; + +return events; +} + + +/** +* tep_list_events_copy - Thread safe version of tep_list_events() +* @tep: a handle to the tep context +* @sort_type: desired sort order of the events in the array +* +* Returns an array of pointers to all events, sorted by the given +* @sort_type criteria. The last element of the array is NULL. The returned +* array is newly allocated inside the function and must be freed by the caller +*/ +struct tep_event **tep_list_events_copy (struct tep_handle *tep, +enum tep_event_sort_type sort_type) +{ +struct tep_event **events; + +if (!tep) +return NULL ; + + events =list_events_copy (tep); +if (!events) +return NULL ; + +/* the internal events are sorted by id */ +if (sort_type ==TEP_EVENT_SORT_ID ) +return events; + +list_events_sort (events, tep->nr_events, sort_type);return events; }
tools/lib/traceevent/event-parse.h +4 -1
@@ -544,7 +544,10 @@ void tep_event_info(struct trace_seq *s, struct tep_event *event,int tep_strerror (struct tep_handle *pevent,enum tep_errno errnum,char *buf,size_t buflen); -struct tep_event **tep_list_events (struct tep_handle *pevent,enum tep_event_sort_type ); +struct tep_event **tep_list_events (struct tep_handle *tep, +enum tep_event_sort_type ); +struct tep_event **tep_list_events_copy (struct tep_handle *tep, +enum tep_event_sort_type );struct tep_format_field **tep_event_common_fields (struct tep_event *event);struct tep_format_field **tep_event_fields (struct tep_event *event);
Signature · 1 line
2.20.1
tip-bot for Tzvetomir Stoyanov
merge bot[tip:perf/core] tools lib traceevent: Implement a new API, tep_list_events_copy()
tools lib traceevent: Implement a new API, tep_list_events_copy()
Commit-ID: 6699ed712a97f70267e017f509126b890f6f6b28 Gitweb: https://git.kernel.org/tip/6699ed712a97f70267e017f509126b890f6f6b28 Author: Tzvetomir Stoyanov <[email protected]> AuthorDate: Mon, 1 Apr 2019 12:43:08 -0400 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 1 Apr 2019 15:18:09 -0300
tools lib traceevent: Implement a new API, tep_list_events_copy()
Existing API tep_list_events() is not thread safe, it uses the internal array sort_events to keep cache of the sorted events and reuses it. This patch implements a new API, tep_list_events_copy(), which allocates new sorted array each time it is called. It could be used when a sorted events functionality is needed in thread safe use cases. It is up to the caller to free the array.
--- tools/lib/traceevent/event-parse.c | 109 +++++++++++++++++++++++++++++-------- tools/lib/traceevent/event-parse.h | 5 +- 2 files changed, 91 insertions(+), 23 deletions(-)
tools/lib/traceevent/event-parse.c +87 -22
@@ -5651,32 +5651,26 @@ static int events_system_cmp(const void *a, const void *b)return events_id_cmp (a, b); } -struct tep_event **tep_list_events (struct tep_handle *pevent,enum tep_event_sort_type sort_type) +static struct tep_event **list_events_copy (struct tep_handle *tep) {struct tep_event **events; -int (*sort)(const void *a,const void *b); - - events = pevent->sort_events; - -if (events && pevent->last_type == sort_type) -return events; -if (!events) { - events =malloc (sizeof (*events) * (pevent->nr_events +1 )); -if (!events) -return NULL ; +if (!tep) +return NULL ; -memcpy (events, pevent->events,sizeof (*events) * pevent->nr_events); - events[pevent->nr_events] =NULL ; + events =malloc (sizeof (*events) * (tep->nr_events +1 )); +if (!events) +return NULL ; - pevent->sort_events = events; +memcpy (events, tep->events,sizeof (*events) * tep->nr_events); + events[tep->nr_events] =NULL ; +return events; +} -/* the internal events are sorted by id */ -if (sort_type ==TEP_EVENT_SORT_ID ) { - pevent->last_type = sort_type; -return events; - } - } +static void list_events_sort (struct tep_event **events,int nr_events, +enum tep_event_sort_type sort_type) +{ +int (*sort)(const void *a,const void *b);switch (sort_type) {case TEP_EVENT_SORT_ID :
@@ -5689,11 +5683,82 @@ struct tep_event **tep_list_events(struct tep_handle *pevent, enum tep_event_sor sort = events_system_cmp;break ;default : + sort =NULL ; + } + +if (sort) +qsort (events, nr_events,sizeof (*events), sort); +} + +/** +* tep_list_events - Get events, sorted by given criteria. +* @tep: a handle to the tep context +* @sort_type: desired sort order of the events in the array +* +* Returns an array of pointers to all events, sorted by the given +* @sort_type criteria. The last element of the array is NULL. The returned +* memory must not be freed, it is managed by the library. +* The function is not thread safe. +*/ +struct tep_event **tep_list_events (struct tep_handle *tep, +enum tep_event_sort_type sort_type) +{ +struct tep_event **events; + +if (!tep) +return NULL ; + + events = tep->sort_events; +if (events && tep->last_type == sort_type)return events; + +if (!events) { + events =list_events_copy (tep); +if (!events) +return NULL ; + + tep->sort_events = events; + +/* the internal events are sorted by id */ +if (sort_type ==TEP_EVENT_SORT_ID ) { + tep->last_type = sort_type; +return events; + } } -qsort (events, pevent->nr_events,sizeof (*events), sort); - pevent->last_type = sort_type; +list_events_sort (events, tep->nr_events, sort_type); + tep->last_type = sort_type; + +return events; +} + + +/** +* tep_list_events_copy - Thread safe version of tep_list_events() +* @tep: a handle to the tep context +* @sort_type: desired sort order of the events in the array +* +* Returns an array of pointers to all events, sorted by the given +* @sort_type criteria. The last element of the array is NULL. The returned +* array is newly allocated inside the function and must be freed by the caller +*/ +struct tep_event **tep_list_events_copy (struct tep_handle *tep, +enum tep_event_sort_type sort_type) +{ +struct tep_event **events; + +if (!tep) +return NULL ; + + events =list_events_copy (tep); +if (!events) +return NULL ; + +/* the internal events are sorted by id */ +if (sort_type ==TEP_EVENT_SORT_ID ) +return events; + +list_events_sort (events, tep->nr_events, sort_type);return events; }
tools/lib/traceevent/event-parse.h +4 -1
@@ -544,7 +544,10 @@ void tep_event_info(struct trace_seq *s, struct tep_event *event,int tep_strerror (struct tep_handle *pevent,enum tep_errno errnum,char *buf,size_t buflen); -struct tep_event **tep_list_events (struct tep_handle *pevent,enum tep_event_sort_type ); +struct tep_event **tep_list_events (struct tep_handle *tep, +enum tep_event_sort_type ); +struct tep_event **tep_list_events_copy (struct tep_handle *tep, +enum tep_event_sort_type );struct tep_format_field **tep_event_common_fields (struct tep_event *event);struct tep_format_field **tep_event_fields (struct tep_event *event);
PATCH 4/15 tools/lib/traceevent: Add more debugging to see various internal ring buffer entries
In reply to Steven RostedtFrom: "Steven Rostedt (Red Hat)" <[email protected]>
When trace-cmd report --debug is set, show the internal ring buffer entries like time-extends and padding. This requires adding new kbuffer API to retrieve these items.
--- tools/lib/traceevent/kbuffer-parse.c | 49 ++++++++++++++++++++++++++++ tools/lib/traceevent/kbuffer.h | 13 ++++++++ 2 files changed, 62 insertions(+)
tools/lib/traceevent/kbuffer-parse.c +49 -0
@@ -727,3 +727,52 @@ int kbuffer_start_of_data(struct kbuffer *kbuf) {return kbuf->start; } + +/** +* kbuffer_raw_get - get raw buffer info +* @kbuf: The kbuffer +* @subbuf: Start of mapped subbuffer +* @info: Info descriptor to fill in +* +* For debugging. This can return internals of the ring buffer. +* Expects to have info->next set to what it will read. +* The type, length and timestamp delta will be filled in, and +* @info->next will be updated to the next element. +* The @subbuf is used to know if the info is passed the end of +* data and NULL will be returned if it is. +*/ +struct kbuffer_raw_info * +kbuffer_raw_get (struct kbuffer *kbuf,void *subbuf,struct kbuffer_raw_info *info) +{ +unsigned long long flags; +unsigned long long delta; +unsigned int type_len; +unsigned int size; +int start; +int length; +void *ptr = info->next; + +if (!kbuf || !subbuf) +return NULL ; + +if (kbuf->flags &KBUFFER_FL_LONG_8 ) + start =16 ; +else + start =12 ; + + flags =read_long (kbuf, subbuf +8 ); + size = (unsigned int )flags &COMMIT_MASK ; + +if (ptr < subbuf || ptr >= subbuf + start + size) +return NULL ; + + type_len =translate_data (kbuf, ptr, &ptr, &delta, &length); + + info->next = ptr + length; + + info->type = type_len; + info->delta = delta; + info->length = length; + +return info; +}
tools/lib/traceevent/kbuffer.h +13 -0
@@ -65,4 +65,17 @@ int kbuffer_subbuffer_size(struct kbuffer *kbuf);void kbuffer_set_old_format (struct kbuffer *kbuf);int kbuffer_start_of_data (struct kbuffer *kbuf); +/* Debugging */ + +struct kbuffer_raw_info { +int type; +int length; +unsigned long long delta; +void *next; +}; + +/* Read raw data */ +struct kbuffer_raw_info *kbuffer_raw_get (struct kbuffer *kbuf,void *subbuf, +struct kbuffer_raw_info *info); +#endif /* _K_BUFFER_H */
Signature · 1 line
2.20.1
tip-bot for Steven Rostedt (Red Hat)
merge bot[tip:perf/core] tools lib traceevent: Add more debugging to see various internal ring buffer entries
tools lib traceevent: Add more debugging to see various internal ring buffer entries
Commit-ID: 70df6a7311186a7ab0b19f481dee4ca540a73837 Gitweb: https://git.kernel.org/tip/70df6a7311186a7ab0b19f481dee4ca540a73837 Author: Steven Rostedt (Red Hat) <[email protected]> AuthorDate: Mon, 1 Apr 2019 12:43:09 -0400 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 1 Apr 2019 15:18:09 -0300
tools lib traceevent: Add more debugging to see various internal ring buffer entries
When trace-cmd report --debug is set, show the internal ring buffer entries like time-extends and padding. This requires adding new kbuffer API to retrieve these items.
--- tools/lib/traceevent/kbuffer-parse.c | 49 ++++++++++++++++++++++++++++++++++++ tools/lib/traceevent/kbuffer.h | 13 ++++++++++ 2 files changed, 62 insertions(+)
tools/lib/traceevent/kbuffer-parse.c +49 -0
@@ -727,3 +727,52 @@ int kbuffer_start_of_data(struct kbuffer *kbuf) {return kbuf->start; } + +/** +* kbuffer_raw_get - get raw buffer info +* @kbuf: The kbuffer +* @subbuf: Start of mapped subbuffer +* @info: Info descriptor to fill in +* +* For debugging. This can return internals of the ring buffer. +* Expects to have info->next set to what it will read. +* The type, length and timestamp delta will be filled in, and +* @info->next will be updated to the next element. +* The @subbuf is used to know if the info is passed the end of +* data and NULL will be returned if it is. +*/ +struct kbuffer_raw_info * +kbuffer_raw_get (struct kbuffer *kbuf,void *subbuf,struct kbuffer_raw_info *info) +{ +unsigned long long flags; +unsigned long long delta; +unsigned int type_len; +unsigned int size; +int start; +int length; +void *ptr = info->next; + +if (!kbuf || !subbuf) +return NULL ; + +if (kbuf->flags &KBUFFER_FL_LONG_8 ) + start =16 ; +else + start =12 ; + + flags =read_long (kbuf, subbuf +8 ); + size = (unsigned int )flags &COMMIT_MASK ; + +if (ptr < subbuf || ptr >= subbuf + start + size) +return NULL ; + + type_len =translate_data (kbuf, ptr, &ptr, &delta, &length); + + info->next = ptr + length; + + info->type = type_len; + info->delta = delta; + info->length = length; + +return info; +}
tools/lib/traceevent/kbuffer.h +13 -0
@@ -65,4 +65,17 @@ int kbuffer_subbuffer_size(struct kbuffer *kbuf);void kbuffer_set_old_format (struct kbuffer *kbuf);int kbuffer_start_of_data (struct kbuffer *kbuf); +/* Debugging */ + +struct kbuffer_raw_info { +int type; +int length; +unsigned long long delta; +void *next; +}; + +/* Read raw data */ +struct kbuffer_raw_info *kbuffer_raw_get (struct kbuffer *kbuf,void *subbuf, +struct kbuffer_raw_info *info); +#endif /* _K_BUFFER_H */
PATCH 5/15 tools/lib/traceevent: Change description of few APIs
In reply to Steven RostedtFrom: Tzvetomir Stoyanov <[email protected]>
APIs descriptions should describe the purpose of the function, its parameters and return value. While working on man pages implementation, I noticed mismatches in the descriptions of few APIs. This patch changes the description of these APIs, making them consistent with the man pages:
- tep_print_num_field()
- tep_print_func_field()
- tep_get_header_page_size()
- tep_get_long_size()
- tep_set_long_size()
- tep_get_page_size()
- tep_set_page_size()
--- tools/lib/traceevent/event-parse-api.c | 20 ++++++++++---------- tools/lib/traceevent/event-parse.c | 6 ++++-- 2 files changed, 14 insertions(+), 12 deletions(-)
tools/lib/traceevent/event-parse-api.c +10 -10
@@ -43,8 +43,8 @@ int tep_get_events_count(struct tep_handle *tep)* @flag: flag, or combination of flags to be set * can be any combination from enum tep_flag * -* This sets a flag or mbination of flags from enum tep_flag -*/ +* This sets a flag or combination of flags from enum tep_flag +*/ void tep_set_flag (struct tep_handle *tep,int flag) {if (tep)
@@ -140,10 +140,10 @@ void tep_set_cpus(struct tep_handle *pevent, int cpus) }/** -* tep_get_long_size - get the size of a long integer on the current machine +* tep_get_long_size - get the size of a long integer on the traced machine * @pevent: a handle to the tep_handle * -* This returns the size of a long integer on the current machine +* This returns the size of a long integer on the traced machine * If @pevent is NULL, 0 is returned. */ int tep_get_long_size (struct tep_handle *pevent)
@@ -154,11 +154,11 @@ int tep_get_long_size(struct tep_handle *pevent) }/** -* tep_set_long_size - set the size of a long integer on the current machine +* tep_set_long_size - set the size of a long integer on the traced machine * @pevent: a handle to the tep_handle * @size: size, in bytes, of a long integer * -* This sets the size of a long integer on the current 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) {
@@ -167,10 +167,10 @@ void tep_set_long_size(struct tep_handle *pevent, int long_size) }/** -* tep_get_page_size - get the size of a memory page on the current machine +* tep_get_page_size - get the size of a memory page on the traced machine * @pevent: a handle to the tep_handle * -* This returns the size of a memory page on the current machine +* This returns the size of a memory page on the traced machine * If @pevent is NULL, 0 is returned. */ int tep_get_page_size (struct tep_handle *pevent)
@@ -181,11 +181,11 @@ int tep_get_page_size(struct tep_handle *pevent) }/** -* tep_set_page_size - set the size of a memory page on the current machine +* tep_set_page_size - set the size of a memory page on the traced machine * @pevent: a handle to the tep_handle * @_page_size: size of a memory page, in bytes * -* This sets the size of a memory page on the current 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) {
tools/lib/traceevent/event-parse.c +4 -2
@@ -6453,7 +6453,8 @@ int tep_get_any_field_val(struct trace_seq *s, struct tep_event *event,* @record: The record with the field name. * @err: print default error if failed. * -* Returns: 0 on success, -1 field not found, or 1 if buffer is full. +* Returns positive value on success, negative in case of an error, +* or 0 if buffer is full. */ int tep_print_num_field(struct trace_seq *s, const char *fmt, struct tep_event *event, const char *name,
@@ -6485,7 +6486,8 @@ int tep_print_num_field(struct trace_seq *s, const char *fmt,* @record: The record with the field name. * @err: print default error if failed. * -* Returns: 0 on success, -1 field not found, or 1 if buffer is full. +* Returns positive value on success, negative in case of an error, +* or 0 if buffer is full. */ int tep_print_func_field(struct trace_seq *s, const char *fmt, struct tep_event *event, const char *name,
Signature · 1 line
2.20.1
tip-bot for Tzvetomir Stoyanov
merge bot[tip:perf/core] tools lib traceevent: Change description of few APIs
tools lib traceevent: Change description of few APIs
Commit-ID: 489b34948cbbc725755e1b1125dbdb16401eea07 Gitweb: https://git.kernel.org/tip/489b34948cbbc725755e1b1125dbdb16401eea07 Author: Tzvetomir Stoyanov <[email protected]> AuthorDate: Mon, 1 Apr 2019 12:43:10 -0400 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 1 Apr 2019 15:18:09 -0300
tools lib traceevent: Change description of few APIs
APIs descriptions should describe the purpose of the function, its parameters and return value. While working on man pages implementation, I noticed mismatches in the descriptions of few APIs. This patch changes the description of these APIs, making them consistent with the man pages:
- tep_print_num_field()
- tep_print_func_field()
- tep_get_header_page_size()
- tep_get_long_size()
- tep_set_long_size()
- tep_get_page_size()
- tep_set_page_size()
--- tools/lib/traceevent/event-parse-api.c | 20 ++++++++++---------- tools/lib/traceevent/event-parse.c | 6 ++++-- 2 files changed, 14 insertions(+), 12 deletions(-)
tools/lib/traceevent/event-parse-api.c +10 -10
@@ -43,8 +43,8 @@ int tep_get_events_count(struct tep_handle *tep)* @flag: flag, or combination of flags to be set * can be any combination from enum tep_flag * -* This sets a flag or mbination of flags from enum tep_flag -*/ +* This sets a flag or combination of flags from enum tep_flag +*/ void tep_set_flag (struct tep_handle *tep,int flag) {if (tep)
@@ -140,10 +140,10 @@ void tep_set_cpus(struct tep_handle *pevent, int cpus) }/** -* tep_get_long_size - get the size of a long integer on the current machine +* tep_get_long_size - get the size of a long integer on the traced machine * @pevent: a handle to the tep_handle * -* This returns the size of a long integer on the current machine +* This returns the size of a long integer on the traced machine * If @pevent is NULL, 0 is returned. */ int tep_get_long_size (struct tep_handle *pevent)
@@ -154,11 +154,11 @@ int tep_get_long_size(struct tep_handle *pevent) }/** -* tep_set_long_size - set the size of a long integer on the current machine +* tep_set_long_size - set the size of a long integer on the traced machine * @pevent: a handle to the tep_handle * @size: size, in bytes, of a long integer * -* This sets the size of a long integer on the current 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) {
@@ -167,10 +167,10 @@ void tep_set_long_size(struct tep_handle *pevent, int long_size) }/** -* tep_get_page_size - get the size of a memory page on the current machine +* tep_get_page_size - get the size of a memory page on the traced machine * @pevent: a handle to the tep_handle * -* This returns the size of a memory page on the current machine +* This returns the size of a memory page on the traced machine * If @pevent is NULL, 0 is returned. */ int tep_get_page_size (struct tep_handle *pevent)
@@ -181,11 +181,11 @@ int tep_get_page_size(struct tep_handle *pevent) }/** -* tep_set_page_size - set the size of a memory page on the current machine +* tep_set_page_size - set the size of a memory page on the traced machine * @pevent: a handle to the tep_handle * @_page_size: size of a memory page, in bytes * -* This sets the size of a memory page on the current 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) {
tools/lib/traceevent/event-parse.c +4 -2
@@ -6453,7 +6453,8 @@ int tep_get_any_field_val(struct trace_seq *s, struct tep_event *event,* @record: The record with the field name. * @err: print default error if failed. * -* Returns: 0 on success, -1 field not found, or 1 if buffer is full. +* Returns positive value on success, negative in case of an error, +* or 0 if buffer is full. */ int tep_print_num_field(struct trace_seq *s, const char *fmt, struct tep_event *event, const char *name,
@@ -6485,7 +6486,8 @@ int tep_print_num_field(struct trace_seq *s, const char *fmt,* @record: The record with the field name. * @err: print default error if failed. * -* Returns: 0 on success, -1 field not found, or 1 if buffer is full. +* Returns positive value on success, negative in case of an error, +* or 0 if buffer is full. */ int tep_print_func_field(struct trace_seq *s, const char *fmt, struct tep_event *event, const char *name,
PATCH 6/15 tools/lib/traceevent: Coding style fixes
In reply to Steven RostedtFrom: Tzvetomir Stoyanov <[email protected]>
Fixed few coding style problems in event-parse-api.c
--- tools/lib/traceevent/event-parse-api.c | 30 +++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-)
tools/lib/traceevent/event-parse-api.c +15 -15
@@ -32,7 +32,7 @@ struct tep_event *tep_get_first_event(struct tep_handle *tep)*/ int tep_get_events_count (struct tep_handle *tep) { -if (tep) +if (tep)return tep->nr_events;return 0 ; }
@@ -47,7 +47,7 @@ int tep_get_events_count(struct tep_handle *tep)*/ void tep_set_flag (struct tep_handle *tep,int flag) { -if (tep) +if (tep) tep->flags |= flag; }
@@ -108,7 +108,7 @@ tep_data2host8(struct tep_handle *pevent, unsigned long long data)*/ int tep_get_header_page_size (struct tep_handle *pevent) { -if (pevent) +if (pevent)return pevent->header_page_size_size;return 0 ; }
@@ -122,7 +122,7 @@ int tep_get_header_page_size(struct tep_handle *pevent)*/ int tep_get_cpus (struct tep_handle *pevent) { -if (pevent) +if (pevent)return pevent->cpus;return 0 ; }
@@ -135,7 +135,7 @@ int tep_get_cpus(struct tep_handle *pevent)*/ void tep_set_cpus (struct tep_handle *pevent,int cpus) { -if (pevent) +if (pevent) pevent->cpus = cpus; }
@@ -148,7 +148,7 @@ void tep_set_cpus(struct tep_handle *pevent, int cpus)*/ int tep_get_long_size (struct tep_handle *pevent) { -if (pevent) +if (pevent)return pevent->long_size;return 0 ; }
@@ -162,7 +162,7 @@ int tep_get_long_size(struct tep_handle *pevent)*/ void tep_set_long_size (struct tep_handle *pevent,int long_size) { -if (pevent) +if (pevent) pevent->long_size = long_size; }
@@ -175,7 +175,7 @@ void tep_set_long_size(struct tep_handle *pevent, int long_size)*/ int tep_get_page_size (struct tep_handle *pevent) { -if (pevent) +if (pevent)return pevent->page_size;return 0 ; }
@@ -189,7 +189,7 @@ int tep_get_page_size(struct tep_handle *pevent)*/ void tep_set_page_size (struct tep_handle *pevent,int _page_size) { -if (pevent) +if (pevent) pevent->page_size = _page_size; }
@@ -202,7 +202,7 @@ void tep_set_page_size(struct tep_handle *pevent, int _page_size)*/ int tep_file_bigendian (struct tep_handle *pevent) { -if (pevent) +if (pevent)return pevent->file_bigendian;return 0 ; }
@@ -216,7 +216,7 @@ int tep_file_bigendian(struct tep_handle *pevent)*/ void tep_set_file_bigendian (struct tep_handle *pevent,enum tep_endian endian) { -if (pevent) +if (pevent) pevent->file_bigendian = endian; }
@@ -229,7 +229,7 @@ void tep_set_file_bigendian(struct tep_handle *pevent, enum tep_endian endian)*/ int tep_is_host_bigendian (struct tep_handle *pevent) { -if (pevent) +if (pevent)return pevent->host_bigendian;return 0 ; }
@@ -243,7 +243,7 @@ int tep_is_host_bigendian(struct tep_handle *pevent)*/ void tep_set_host_bigendian (struct tep_handle *pevent,enum tep_endian endian) { -if (pevent) +if (pevent) pevent->host_bigendian = endian; }
@@ -256,7 +256,7 @@ void tep_set_host_bigendian(struct tep_handle *pevent, enum tep_endian endian)*/ int tep_is_latency_format (struct tep_handle *pevent) { -if (pevent) +if (pevent)return pevent->latency_format;return 0 ; }
@@ -270,6 +270,6 @@ int tep_is_latency_format(struct tep_handle *pevent)*/ void tep_set_latency_format (struct tep_handle *pevent,int lat) { -if (pevent) +if (pevent) pevent->latency_format = lat; }
Signature · 1 line
2.20.1
tip-bot for Tzvetomir Stoyanov
merge bot[tip:perf/core] tools lib traceevent: Coding style fixes
tools lib traceevent: Coding style fixes
Commit-ID: d5d2d05bd5b02efa8545a3323a60465de9efb21e Gitweb: https://git.kernel.org/tip/d5d2d05bd5b02efa8545a3323a60465de9efb21e Author: Tzvetomir Stoyanov <[email protected]> AuthorDate: Mon, 1 Apr 2019 12:43:11 -0400 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 1 Apr 2019 15:18:09 -0300
tools lib traceevent: Coding style fixes
Fixed few coding style problems in event-parse-api.c
--- tools/lib/traceevent/event-parse-api.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
tools/lib/traceevent/event-parse-api.c +15 -15
@@ -32,7 +32,7 @@ struct tep_event *tep_get_first_event(struct tep_handle *tep)*/ int tep_get_events_count (struct tep_handle *tep) { -if (tep) +if (tep)return tep->nr_events;return 0 ; }
@@ -47,7 +47,7 @@ int tep_get_events_count(struct tep_handle *tep)*/ void tep_set_flag (struct tep_handle *tep,int flag) { -if (tep) +if (tep) tep->flags |= flag; }
@@ -108,7 +108,7 @@ tep_data2host8(struct tep_handle *pevent, unsigned long long data)*/ int tep_get_header_page_size (struct tep_handle *pevent) { -if (pevent) +if (pevent)return pevent->header_page_size_size;return 0 ; }
@@ -122,7 +122,7 @@ int tep_get_header_page_size(struct tep_handle *pevent)*/ int tep_get_cpus (struct tep_handle *pevent) { -if (pevent) +if (pevent)return pevent->cpus;return 0 ; }
@@ -135,7 +135,7 @@ int tep_get_cpus(struct tep_handle *pevent)*/ void tep_set_cpus (struct tep_handle *pevent,int cpus) { -if (pevent) +if (pevent) pevent->cpus = cpus; }
@@ -148,7 +148,7 @@ void tep_set_cpus(struct tep_handle *pevent, int cpus)*/ int tep_get_long_size (struct tep_handle *pevent) { -if (pevent) +if (pevent)return pevent->long_size;return 0 ; }
@@ -162,7 +162,7 @@ int tep_get_long_size(struct tep_handle *pevent)*/ void tep_set_long_size (struct tep_handle *pevent,int long_size) { -if (pevent) +if (pevent) pevent->long_size = long_size; }
@@ -175,7 +175,7 @@ void tep_set_long_size(struct tep_handle *pevent, int long_size)*/ int tep_get_page_size (struct tep_handle *pevent) { -if (pevent) +if (pevent)return pevent->page_size;return 0 ; }
@@ -189,7 +189,7 @@ int tep_get_page_size(struct tep_handle *pevent)*/ void tep_set_page_size (struct tep_handle *pevent,int _page_size) { -if (pevent) +if (pevent) pevent->page_size = _page_size; }
@@ -202,7 +202,7 @@ void tep_set_page_size(struct tep_handle *pevent, int _page_size)*/ int tep_file_bigendian (struct tep_handle *pevent) { -if (pevent) +if (pevent)return pevent->file_bigendian;return 0 ; }
@@ -216,7 +216,7 @@ int tep_file_bigendian(struct tep_handle *pevent)*/ void tep_set_file_bigendian (struct tep_handle *pevent,enum tep_endian endian) { -if (pevent) +if (pevent) pevent->file_bigendian = endian; }
@@ -229,7 +229,7 @@ void tep_set_file_bigendian(struct tep_handle *pevent, enum tep_endian endian)*/ int tep_is_host_bigendian (struct tep_handle *pevent) { -if (pevent) +if (pevent)return pevent->host_bigendian;return 0 ; }
@@ -243,7 +243,7 @@ int tep_is_host_bigendian(struct tep_handle *pevent)*/ void tep_set_host_bigendian (struct tep_handle *pevent,enum tep_endian endian) { -if (pevent) +if (pevent) pevent->host_bigendian = endian; }
@@ -256,7 +256,7 @@ void tep_set_host_bigendian(struct tep_handle *pevent, enum tep_endian endian)*/ int tep_is_latency_format (struct tep_handle *pevent) { -if (pevent) +if (pevent)return pevent->latency_format;return 0 ; }
@@ -270,6 +270,6 @@ int tep_is_latency_format(struct tep_handle *pevent)*/ void tep_set_latency_format (struct tep_handle *pevent,int lat) { -if (pevent) +if (pevent) pevent->latency_format = lat; }
PATCH 7/15 tools/lib/traceevent: Implement new traceevent APIs for accessing struct tep_handler fields
In reply to Steven RostedtFrom: Tzvetomir Stoyanov <[email protected]>
As struct tep_handler definition is not exposed as part of libtraceevent API, its fields cannot be accessed directly by the library users. This patch implements new APIs, which can be used to access the struct tep_handler fields:
tep_get_event() - retrieves an event pointer at a specific index tep_get_first_event() - is modified to use tep_get_event() tep_clear_flag() - clears a tep handle flag tep_test_flag() - test if a given flag is set
tep_get_header_timestamp_size() - returns the size of the timestamp stored
in the header.tep_get_cpus() - returns the number of CPUstep_is_old_format() - returns true if data was created by an
older kernel with the old data formattep_set_print_raw() - have the output print in the raw formattep_set_test_filters() - debugging utility for testing tep filters
--- tools/lib/traceevent/event-parse-api.c | 106 ++++++++++++++++++++++++- tools/lib/traceevent/event-parse.h | 6 ++ 2 files changed, 108 insertions(+), 4 deletions(-)
tools/lib/traceevent/event-parse-api.c +102 -4
@@ -8,6 +8,22 @@#include "event-parse-local.h" #include "event-utils.h" +/** +* tep_get_event - returns the event with the given index +* @tep: a handle to the tep_handle +* @index: index of the requested event, in the range 0 .. nr_events +* +* This returns pointer to the element of the events array with the given index +* If @tep is NULL, or @index is not in the range 0 .. nr_events, NULL is returned. +*/ +struct tep_event *tep_get_event (struct tep_handle *tep,int index) +{ +if (tep && tep->events && index < tep->nr_events) +return tep->events[index]; + +return NULL ; +} +/** * tep_get_first_event - returns the first event in the events array * @tep: a handle to the tep_handle
@@ -17,10 +33,7 @@*/ struct tep_event *tep_get_first_event (struct tep_handle *tep) { -if (tep && tep->events) -return tep->events[0 ]; - -return NULL ; +return tep_get_event (tep,0 ); }/**
@@ -51,6 +64,34 @@ void tep_set_flag(struct tep_handle *tep, int flag) tep->flags |= flag; } +/** +* tep_clear_flag - clear event parser flag +* @tep: a handle to the tep_handle +* @flag: flag to be cleared +* +* This clears a tep flag +*/ +void tep_clear_flag (struct tep_handle *tep,enum tep_flag flag) +{ +if (tep) + tep->flags &= ~flag; +} + +/** +* tep_test_flag - check the state of event parser flag +* @tep: a handle to the tep_handle +* @flag: flag to be checked +* +* This returns the state of the requested tep flag. +* Returns: true if the flag is set, false otherwise. +*/ +bool tep_test_flag (struct tep_handle *tep,enum tep_flag flag) +{ +if (tep) +return (tep->flags & flag); +return false; +} +unsigned short tep_data2host2 (struct tep_handle *pevent,unsigned short data) {unsigned short swap;
@@ -113,6 +154,20 @@ int tep_get_header_page_size(struct tep_handle *pevent)return 0 ; } +/** +* tep_get_header_timestamp_size - get size of the time stamp in the header page +* @tep: a handle to the tep_handle +* +* This returns size of the time stamp in the header page +* If @tep is NULL, 0 is returned. +*/ +int tep_get_header_timestamp_size (struct tep_handle *tep) +{ +if (tep) +return tep->header_page_ts_size; +return 0 ; +} +/** * tep_get_cpus - get the number of CPUs * @pevent: a handle to the tep_handle
@@ -273,3 +328,46 @@ void tep_set_latency_format(struct tep_handle *pevent, int lat)if (pevent) pevent->latency_format = lat; } + +/** +* tep_is_old_format - get if an old kernel is used +* @tep: a handle to the tep_handle +* +* This returns true, if an old kernel is used to generate the tracing events or +* false if a new kernel is used. Old kernels did not have header page info. +* If @tep is NULL, false is returned. +*/ +bool tep_is_old_format (struct tep_handle *tep) +{ +if (tep) +return !!(tep->old_format); +return false; +} + +/** +* tep_set_print_raw - set a flag to force print in raw format +* @tep: a handle to the tep_handle +* @print_raw: the new value of the print_raw flag +* +* This sets a flag to force print in raw format +*/ +void tep_set_print_raw (struct tep_handle *tep,int print_raw) +{ +if (tep) + tep->print_raw = print_raw; +} + +/** +* tep_set_test_filters - set a flag to test a filter string +* @tep: a handle to the tep_handle +* @test_filters: the new value of the test_filters flag +* +* This sets a flag to test a filter string. If this flag is set, when +* tep_filter_add_filter_str() API as called,it will print the filter string +* instead of adding it. +*/ +void tep_set_test_filters (struct tep_handle *tep,int test_filters) +{ +if (tep) + tep->test_filters = test_filters; +}
tools/lib/traceevent/event-parse.h +6 -0
@@ -409,6 +409,8 @@ void tep_print_plugins(struct trace_seq *s,typedef char *(tep_func_resolver_t )(void *priv,unsigned long long *addrp,char **modp);void tep_set_flag (struct tep_handle *tep,int 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);static inline int tep_host_bigendian (void ) {
@@ -568,6 +570,10 @@ void tep_set_host_bigendian(struct tep_handle *pevent, enum tep_endian endian);int tep_is_latency_format (struct tep_handle *pevent);void tep_set_latency_format (struct tep_handle *pevent,int lat);int tep_get_header_page_size (struct tep_handle *pevent); +int tep_get_header_timestamp_size (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_test_filters (struct tep_handle *tep,int test_filters);struct tep_handle *tep_alloc (void );void tep_free (struct tep_handle *pevent);
Signature · 1 line
2.20.1
tip-bot for Tzvetomir Stoyanov
merge bot[tip:perf/core] tools lib traceevent: Implement new traceevent APIs for accessing struct tep_handler fields
tools lib traceevent: Implement new traceevent APIs for accessing struct tep_handler fields
Commit-ID: 80c5526c8544ae76cba31fb9702ab8accac1f0f3 Gitweb: https://git.kernel.org/tip/80c5526c8544ae76cba31fb9702ab8accac1f0f3 Author: Tzvetomir Stoyanov <[email protected]> AuthorDate: Mon, 1 Apr 2019 12:43:12 -0400 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 1 Apr 2019 15:18:09 -0300
tools lib traceevent: Implement new traceevent APIs for accessing struct tep_handler fields
As struct tep_handler definition is not exposed as part of libtraceevent API, its fields cannot be accessed directly by the library users. This patch implements new APIs, which can be used to access the struct tep_handler fields:
tep_get_event() - retrieves an event pointer at a specific index tep_get_first_event() - is modified to use tep_get_event() tep_clear_flag() - clears a tep handle flag tep_test_flag() - test if a given flag is set
tep_get_header_timestamp_size() - returns the size of the timestamp stored
in the header.
tep_get_cpus() - returns the number of CPUs
tep_is_old_format() - returns true if data was created by an
older kernel with the old data format
tep_set_print_raw() - have the output print in the raw format
tep_set_test_filters() - debugging utility for testing tep filters
--- tools/lib/traceevent/event-parse-api.c | 106 +++++++++++++++++++++++++++++++-- tools/lib/traceevent/event-parse.h | 6 ++ 2 files changed, 108 insertions(+), 4 deletions(-)
tools/lib/traceevent/event-parse-api.c +102 -4
@@ -8,6 +8,22 @@#include "event-parse-local.h" #include "event-utils.h" +/** +* tep_get_event - returns the event with the given index +* @tep: a handle to the tep_handle +* @index: index of the requested event, in the range 0 .. nr_events +* +* This returns pointer to the element of the events array with the given index +* If @tep is NULL, or @index is not in the range 0 .. nr_events, NULL is returned. +*/ +struct tep_event *tep_get_event (struct tep_handle *tep,int index) +{ +if (tep && tep->events && index < tep->nr_events) +return tep->events[index]; + +return NULL ; +} +/** * tep_get_first_event - returns the first event in the events array * @tep: a handle to the tep_handle
@@ -17,10 +33,7 @@*/ struct tep_event *tep_get_first_event (struct tep_handle *tep) { -if (tep && tep->events) -return tep->events[0 ]; - -return NULL ; +return tep_get_event (tep,0 ); }/**
@@ -51,6 +64,34 @@ void tep_set_flag(struct tep_handle *tep, int flag) tep->flags |= flag; } +/** +* tep_clear_flag - clear event parser flag +* @tep: a handle to the tep_handle +* @flag: flag to be cleared +* +* This clears a tep flag +*/ +void tep_clear_flag (struct tep_handle *tep,enum tep_flag flag) +{ +if (tep) + tep->flags &= ~flag; +} + +/** +* tep_test_flag - check the state of event parser flag +* @tep: a handle to the tep_handle +* @flag: flag to be checked +* +* This returns the state of the requested tep flag. +* Returns: true if the flag is set, false otherwise. +*/ +bool tep_test_flag (struct tep_handle *tep,enum tep_flag flag) +{ +if (tep) +return (tep->flags & flag); +return false; +} +unsigned short tep_data2host2 (struct tep_handle *pevent,unsigned short data) {unsigned short swap;
@@ -113,6 +154,20 @@ int tep_get_header_page_size(struct tep_handle *pevent)return 0 ; } +/** +* tep_get_header_timestamp_size - get size of the time stamp in the header page +* @tep: a handle to the tep_handle +* +* This returns size of the time stamp in the header page +* If @tep is NULL, 0 is returned. +*/ +int tep_get_header_timestamp_size (struct tep_handle *tep) +{ +if (tep) +return tep->header_page_ts_size; +return 0 ; +} +/** * tep_get_cpus - get the number of CPUs * @pevent: a handle to the tep_handle
@@ -273,3 +328,46 @@ void tep_set_latency_format(struct tep_handle *pevent, int lat)if (pevent) pevent->latency_format = lat; } + +/** +* tep_is_old_format - get if an old kernel is used +* @tep: a handle to the tep_handle +* +* This returns true, if an old kernel is used to generate the tracing events or +* false if a new kernel is used. Old kernels did not have header page info. +* If @tep is NULL, false is returned. +*/ +bool tep_is_old_format (struct tep_handle *tep) +{ +if (tep) +return !!(tep->old_format); +return false; +} + +/** +* tep_set_print_raw - set a flag to force print in raw format +* @tep: a handle to the tep_handle +* @print_raw: the new value of the print_raw flag +* +* This sets a flag to force print in raw format +*/ +void tep_set_print_raw (struct tep_handle *tep,int print_raw) +{ +if (tep) + tep->print_raw = print_raw; +} + +/** +* tep_set_test_filters - set a flag to test a filter string +* @tep: a handle to the tep_handle +* @test_filters: the new value of the test_filters flag +* +* This sets a flag to test a filter string. If this flag is set, when +* tep_filter_add_filter_str() API as called,it will print the filter string +* instead of adding it. +*/ +void tep_set_test_filters (struct tep_handle *tep,int test_filters) +{ +if (tep) + tep->test_filters = test_filters; +}
tools/lib/traceevent/event-parse.h +6 -0
@@ -409,6 +409,8 @@ void tep_print_plugins(struct trace_seq *s,typedef char *(tep_func_resolver_t )(void *priv,unsigned long long *addrp,char **modp);void tep_set_flag (struct tep_handle *tep,int 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);static inline int tep_host_bigendian (void ) {
@@ -568,6 +570,10 @@ void tep_set_host_bigendian(struct tep_handle *pevent, enum tep_endian endian);int tep_is_latency_format (struct tep_handle *pevent);void tep_set_latency_format (struct tep_handle *pevent,int lat);int tep_get_header_page_size (struct tep_handle *pevent); +int tep_get_header_timestamp_size (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_test_filters (struct tep_handle *tep,int test_filters);struct tep_handle *tep_alloc (void );void tep_free (struct tep_handle *pevent);
PATCH 8/15 tools/lib/traceevent: Removed unneeded !! and return parenthesis
In reply to Steven RostedtFrom: "Steven Rostedt (VMware)" <[email protected]>
As return is not a function we do not need parenthesis around the return value. Also, a function returning bool does not need to add !!.
--- tools/lib/traceevent/event-parse-api.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/lib/traceevent/event-parse-api.c +2 -2
@@ -88,7 +88,7 @@ void tep_clear_flag(struct tep_handle *tep, enum tep_flag flag)bool tep_test_flag (struct tep_handle *tep,enum tep_flag flag) {if (tep) -return (tep->flags & flag); +return tep->flags & flag;return false; }
@@ -340,7 +340,7 @@ void tep_set_latency_format(struct tep_handle *pevent, int lat)bool tep_is_old_format (struct tep_handle *tep) {if (tep) -return !!(tep->old_format); +return tep->old_format;return false; }
Signature · 1 line
2.20.1
tip-bot for Steven Rostedt (VMware)
merge bot[tip:perf/core] tools lib traceevent: Removed unneeded !! and return parenthesis
tools lib traceevent: Removed unneeded !! and return parenthesis
Commit-ID: 2ce4639f6936261bf6e0bae5c21a0c09a8daeacc Gitweb: https://git.kernel.org/tip/2ce4639f6936261bf6e0bae5c21a0c09a8daeacc Author: Steven Rostedt (VMware) <[email protected]> AuthorDate: Mon, 1 Apr 2019 12:43:13 -0400 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 1 Apr 2019 15:18:09 -0300
tools lib traceevent: Removed unneeded !! and return parenthesis
As return is not a function we do not need parenthesis around the return value. Also, a function returning bool does not need to add !!.
--- tools/lib/traceevent/event-parse-api.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/lib/traceevent/event-parse-api.c +2 -2
@@ -88,7 +88,7 @@ void tep_clear_flag(struct tep_handle *tep, enum tep_flag flag)bool tep_test_flag (struct tep_handle *tep,enum tep_flag flag) {if (tep) -return (tep->flags & flag); +return tep->flags & flag;return false; }
@@ -340,7 +340,7 @@ void tep_set_latency_format(struct tep_handle *pevent, int lat)bool tep_is_old_format (struct tep_handle *tep) {if (tep) -return !!(tep->old_format); +return tep->old_format;return false; }
PATCH 9/15 tools/lib/traceevent: Remove tep filter trivial APIs
In reply to Steven RostedtFrom: Tzvetomir Stoyanov <[email protected]>
This patch removes trivial filter tep APIs:
enum tep_filter_trivial_type
tep_filter_event_has_trivial()
tep_update_trivial()
tep_filter_clear_trivial()
Trivial filters is an optimization, used only in the first version of KernelShark. The API is deprecated, the next KernelShark release does not use it.
--- tools/lib/traceevent/event-parse.h | 16 --- tools/lib/traceevent/parse-filter.c | 169 ---------------------------- 2 files changed, 185 deletions(-)
tools/lib/traceevent/event-parse.h +0 -16
@@ -732,12 +732,6 @@ struct tep_event_filter *tep_filter_alloc(struct tep_handle *pevent);#define FILTER_MISS TEP_ERRNO__FILTER_MISS#define FILTER_MATCH TEP_ERRNO__FILTER_MATCH -enum tep_filter_trivial_type { -TEP_FILTER_TRIVIAL_FALSE , -TEP_FILTER_TRIVIAL_TRUE , -TEP_FILTER_TRIVIAL_BOTH , -}; -enum tep_errno tep_filter_add_filter_str (struct tep_event_filter *filter,const char *filter_str);
@@ -752,9 +746,6 @@ int tep_event_filtered(struct tep_event_filter *filter,void tep_filter_reset (struct tep_event_filter *filter); -int tep_filter_clear_trivial (struct tep_event_filter *filter, -enum tep_filter_trivial_type type); -void tep_filter_free (struct tep_event_filter *filter);char *tep_filter_make_string (struct tep_event_filter *filter,int event_id);
@@ -762,15 +753,8 @@ char *tep_filter_make_string(struct tep_event_filter *filter, int event_id);int tep_filter_remove_event (struct tep_event_filter *filter,int event_id); -int tep_filter_event_has_trivial (struct tep_event_filter *filter, -int event_id, -enum tep_filter_trivial_type type); -int tep_filter_copy (struct tep_event_filter *dest,struct tep_event_filter *source); -int tep_update_trivial (struct tep_event_filter *dest,struct tep_event_filter *source, -enum tep_filter_trivial_type type); -int tep_filter_compare (struct tep_event_filter *filter1,struct tep_event_filter *filter2);#endif /* _PARSE_EVENTS_H */
tools/lib/traceevent/parse-filter.c +0 -169
181 lines not on this page · raw message
Signature · 1 line
2.20.1
tip-bot for Tzvetomir Stoyanov
merge bot[tip:perf/core] tools lib traceevent: Remove tep filter trivial APIs
tools lib traceevent: Remove tep filter trivial APIs
Commit-ID: a634b278ec2504fdd2acd694f5158ae79016fb70 Gitweb: https://git.kernel.org/tip/a634b278ec2504fdd2acd694f5158ae79016fb70 Author: Tzvetomir Stoyanov <[email protected]> AuthorDate: Mon, 1 Apr 2019 12:43:14 -0400 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 1 Apr 2019 15:18:09 -0300
tools lib traceevent: Remove tep filter trivial APIs
This patch removes trivial filter tep APIs:
enum tep_filter_trivial_type
tep_filter_event_has_trivial()
tep_update_trivial()
tep_filter_clear_trivial()
Trivial filters is an optimization, used only in the first version of KernelShark. The API is deprecated, the next KernelShark release does not use it.
--- tools/lib/traceevent/event-parse.h | 16 ---- tools/lib/traceevent/parse-filter.c | 169 ------------------------------------ 2 files changed, 185 deletions(-)
tools/lib/traceevent/event-parse.h +0 -16
@@ -732,12 +732,6 @@ struct tep_event_filter *tep_filter_alloc(struct tep_handle *pevent);#define FILTER_MISS TEP_ERRNO__FILTER_MISS#define FILTER_MATCH TEP_ERRNO__FILTER_MATCH -enum tep_filter_trivial_type { -TEP_FILTER_TRIVIAL_FALSE , -TEP_FILTER_TRIVIAL_TRUE , -TEP_FILTER_TRIVIAL_BOTH , -}; -enum tep_errno tep_filter_add_filter_str (struct tep_event_filter *filter,const char *filter_str);
@@ -752,9 +746,6 @@ int tep_event_filtered(struct tep_event_filter *filter,void tep_filter_reset (struct tep_event_filter *filter); -int tep_filter_clear_trivial (struct tep_event_filter *filter, -enum tep_filter_trivial_type type); -void tep_filter_free (struct tep_event_filter *filter);char *tep_filter_make_string (struct tep_event_filter *filter,int event_id);
@@ -762,15 +753,8 @@ char *tep_filter_make_string(struct tep_event_filter *filter, int event_id);int tep_filter_remove_event (struct tep_event_filter *filter,int event_id); -int tep_filter_event_has_trivial (struct tep_event_filter *filter, -int event_id, -enum tep_filter_trivial_type type); -int tep_filter_copy (struct tep_event_filter *dest,struct tep_event_filter *source); -int tep_update_trivial (struct tep_event_filter *dest,struct tep_event_filter *source, -enum tep_filter_trivial_type type); -int tep_filter_compare (struct tep_event_filter *filter1,struct tep_event_filter *filter2);#endif /* _PARSE_EVENTS_H */
tools/lib/traceevent/parse-filter.c +0 -169
181 lines not on this page · raw message
PATCH 10/15 tools/lib/traceevent: Remove call to exit() from tep_filter_add_filter_str()
In reply to Steven RostedtFrom: Tzvetomir Stoyanov <[email protected]>
This patch removes call to exit() from tep_filter_add_filter_str(). A library function should not force the application to exit. In the current implementation tep_filter_add_filter_str() calls exit() when a special "test_filters" mode is set, used only for debugging purposes. When this mode is set and a filter is added - its string is printed to the console and exit() is called. This patch changes the logic - when in "test_filters" mode, the filter string is still printed, but the exit() is not called. It is up to the application to track when "test_filters" mode is set and to call exit, if needed.
--- tools/lib/traceevent/parse-filter.c | 3 --- 1 file changed, 3 deletions(-)
tools/lib/traceevent/parse-filter.c +0 -3
@@ -1346,9 +1346,6 @@ enum tep_errno tep_filter_add_filter_str(struct tep_event_filter *filter,free_events (events); -if (rtn >=0 && pevent->test_filters) -exit (0 ); -return rtn; }
Signature · 1 line
2.20.1
tip-bot for Tzvetomir Stoyanov
merge bot[tip:perf/core] tools lib traceevent: Remove call to exit() from tep_filter_add_filter_str()
tools lib traceevent: Remove call to exit() from tep_filter_add_filter_str()
Commit-ID: fea6b632235b9bedc58c72cd24f1865bb0c365db Gitweb: https://git.kernel.org/tip/fea6b632235b9bedc58c72cd24f1865bb0c365db Author: Tzvetomir Stoyanov <[email protected]> AuthorDate: Mon, 1 Apr 2019 12:43:15 -0400 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 1 Apr 2019 15:18:09 -0300
tools lib traceevent: Remove call to exit() from tep_filter_add_filter_str()
This patch removes call to exit() from tep_filter_add_filter_str(). A library function should not force the application to exit. In the current implementation tep_filter_add_filter_str() calls exit() when a special "test_filters" mode is set, used only for debugging purposes. When this mode is set and a filter is added - its string is printed to the console and exit() is called. This patch changes the logic - when in "test_filters" mode, the filter string is still printed, but the exit() is not called. It is up to the application to track when "test_filters" mode is set and to call exit, if needed.
--- tools/lib/traceevent/parse-filter.c | 3 --- 1 file changed, 3 deletions(-)
tools/lib/traceevent/parse-filter.c +0 -3
@@ -1346,9 +1346,6 @@ enum tep_errno tep_filter_add_filter_str(struct tep_event_filter *filter,free_events (events); -if (rtn >=0 && pevent->test_filters) -exit (0 ); -return rtn; }
PATCH 11/15 tools/perf,tools/lib/traceevent: Make traceevent APIs more consistent
In reply to Steven RostedtFrom: Tzvetomir Stoyanov <[email protected]>
Rename some traceevent APIs for consistency:
tep_pid_is_registered() to tep_is_pid_registered() tep_file_bigendian() to tep_is_file_bigendian()
to make the names and return values consistent with other tep_is_... APIs
tep_data_lat_fmt() to tep_data_latency_format()
to make the name more descriptive
tep_host_bigendian() to tep_is_bigendian() tep_set_host_bigendian() to tep_set_local_bigendian() tep_is_host_bigendian() to tep_is_local_bigendian()
"host" can be confused with VMs, and "local" is about the local machine. All tep_is_..._bigendian(struct tep_handle *tep) APIs return the saved data in the tep handle, while tep_is_bigendian() returns the running machine's endianness.
All tep_is_... functions are modified to return bool value, instead of int.
--- tools/lib/traceevent/event-parse-api.c | 40 +++++++++++++------------- tools/lib/traceevent/event-parse.c | 26 ++++++++--------- tools/lib/traceevent/event-parse.h | 16 +++++------ tools/lib/traceevent/plugin_kvm.c | 4 +-- tools/perf/util/trace-event-read.c | 2 +- tools/perf/util/trace-event.c | 4 +-- 6 files changed, 46 insertions(+), 46 deletions(-)
tools/lib/traceevent/event-parse-api.c +20 -20
@@ -155,10 +155,10 @@ int tep_get_header_page_size(struct tep_handle *pevent) }/** -* tep_get_header_timestamp_size - get size of the time stamp in the header page +* tep_get_header_timestamp_size - get size of the timestamp in the header page * @tep: a handle to the tep_handle * -* This returns size of the time stamp in the header page +* This returns size of the timestamp in the header page * If @tep is NULL, 0 is returned. */ int tep_get_header_timestamp_size (struct tep_handle *tep)
@@ -249,17 +249,17 @@ void tep_set_page_size(struct tep_handle *pevent, int _page_size) }/** -* tep_file_bigendian - get if the file is in big endian order +* tep_is_file_bigendian - return the endian of the file * @pevent: a handle to the tep_handle * -* This returns if the file is in big endian order -* If @pevent is NULL, 0 is returned. +* This returns true if the file is in big endian order +* If @pevent is NULL, false is returned. */ -int tep_file_bigendian (struct tep_handle *pevent) +bool tep_is_file_bigendian (struct tep_handle *pevent) {if (pevent) -return pevent->file_bigendian; -return 0 ; +return pevent->file_bigendian ==TEP_BIG_ENDIAN ; +return false; }/**
@@ -276,27 +276,27 @@ void tep_set_file_bigendian(struct tep_handle *pevent, enum tep_endian endian) }/** -* tep_is_host_bigendian - get if the order of the current host is big endian +* tep_is_local_bigendian - return the endian of the saved local machine * @pevent: a handle to the tep_handle * -* This gets if the order of the current host is big endian -* If @pevent is NULL, 0 is returned. +* This returns true if the saved local machine in @pevent is big endian. +* If @pevent is NULL, false is returned. */ -int tep_is_host_bigendian (struct tep_handle *pevent) +bool tep_is_local_bigendian (struct tep_handle *pevent) {if (pevent) -return pevent->host_bigendian; +return pevent->host_bigendian ==TEP_BIG_ENDIAN ;return 0 ; }/** -* tep_set_host_bigendian - set the order of the local host +* tep_set_local_bigendian - set the stored local machine endian order * @pevent: a handle to the tep_handle * @endian: non zero, if the local host has big endian order * -* This sets the order of the local host +* This sets the endian order for the local machine. */ -void tep_set_host_bigendian (struct tep_handle *pevent,enum tep_endian endian) +void tep_set_local_bigendian (struct tep_handle *pevent,enum tep_endian endian) {if (pevent) pevent->host_bigendian = endian;
@@ -306,14 +306,14 @@ void tep_set_host_bigendian(struct tep_handle *pevent, enum tep_endian endian)* tep_is_latency_format - get if the latency output format is configured * @pevent: a handle to the tep_handle * -* This gets if the latency output format is configured -* If @pevent is NULL, 0 is returned. +* This returns true if the latency output format is configured +* If @pevent is NULL, false is returned. */ -int tep_is_latency_format (struct tep_handle *pevent) +bool tep_is_latency_format (struct tep_handle *pevent) {if (pevent)return pevent->latency_format; -return 0 ; +return false; }/**
tools/lib/traceevent/event-parse.c +13 -13
@@ -199,23 +199,23 @@ static const char *find_cmdline(struct tep_handle *pevent, int pid) }/** -* tep_pid_is_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 * @pid: The pid to check if it has a cmdline registered with. * -* Returns 1 if the pid has a cmdline mapped to it -* 0 otherwise. +* Returns true if the pid has a cmdline mapped to it +* false otherwise. */ -int tep_pid_is_registered (struct tep_handle *pevent,int pid) +bool tep_is_pid_registered (struct tep_handle *pevent,int pid) {const struct tep_cmdline *comm;struct tep_cmdline key;if (!pid) -return 1 ; +return true;if (!pevent->cmdlines &&cmdline_init (pevent)) -return 0 ; +return false; key.pid = pid;
@@ -223,8 +223,8 @@ int tep_pid_is_registered(struct tep_handle *pevent, int pid) sizeof(*pevent->cmdlines), cmdline_cmp);if (comm) -return 1 ; -return 0 ; +return true; +return false; }/*
@@ -5172,7 +5172,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_e }/** -* tep_data_lat_fmt - parse the data for the latency format +* tep_data_latency_format - parse the data for the latency format * @pevent: a handle to the pevent * @s: the trace_seq to write to * @record: the record to read from
@@ -5181,8 +5181,8 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_e* need rescheduling, in hard/soft interrupt, preempt count * and lock depth) and places it into the trace_seq. */ -void tep_data_lat_fmt (struct tep_handle *pevent, -struct trace_seq *s,struct tep_record *record) +void tep_data_latency_format (struct tep_handle *pevent, +struct trace_seq *s,struct tep_record *record) {static int check_lock_depth =1 ;static int check_migrate_disable =1 ;
@@ -5532,7 +5532,7 @@ void tep_print_event_time(struct tep_handle *pevent, struct trace_seq *s, }if (pevent->latency_format) { -tep_data_lat_fmt (pevent, s, record); +tep_data_latency_format (pevent, s, record); }if (use_usec_format) {
@@ -6827,7 +6827,7 @@ struct tep_handle *tep_alloc(void)if (pevent) { pevent->ref_count =1 ; - pevent->host_bigendian =tep_host_bigendian (); + pevent->host_bigendian =tep_is_bigendian (); }return pevent;
tools/lib/traceevent/event-parse.h +8 -8
@@ -412,7 +412,7 @@ void tep_set_flag(struct tep_handle *tep, int 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); -static inline int tep_host_bigendian (void ) +static inline int tep_is_bigendian (void ) {unsigned char str[] = {0x1 ,0x2 ,0x3 ,0x4 };unsigned int val;
@@ -440,7 +440,7 @@ int tep_register_function(struct tep_handle *pevent, char *name, unsigned long long addr, char *mod);int tep_register_print_string (struct tep_handle *pevent,const char *fmt,unsigned long long addr); -int tep_pid_is_registered (struct tep_handle *pevent,int pid); +bool tep_is_pid_registered (struct tep_handle *pevent,int pid); void tep_print_event_task(struct tep_handle *pevent, struct trace_seq *s, struct tep_event *event,
@@ -525,8 +525,8 @@ tep_find_event_by_name(struct tep_handle *pevent, const char *sys, const char *nstruct tep_event *tep_find_event_by_record (struct tep_handle *pevent,struct tep_record *record); -void tep_data_lat_fmt (struct tep_handle *pevent, -struct trace_seq *s,struct tep_record *record); +void tep_data_latency_format (struct tep_handle *pevent, +struct trace_seq *s,struct tep_record *record);int tep_data_type (struct tep_handle *pevent,struct tep_record *rec);int tep_data_pid (struct tep_handle *pevent,struct tep_record *rec);int tep_data_preempt_count (struct tep_handle *pevent,struct tep_record *rec);
@@ -563,11 +563,11 @@ int tep_get_long_size(struct tep_handle *pevent);void tep_set_long_size (struct tep_handle *pevent,int long_size);int tep_get_page_size (struct tep_handle *pevent);void tep_set_page_size (struct tep_handle *pevent,int _page_size); -int tep_file_bigendian (struct tep_handle *pevent); +bool tep_is_file_bigendian (struct tep_handle *pevent);void tep_set_file_bigendian (struct tep_handle *pevent,enum tep_endian endian); -int tep_is_host_bigendian (struct tep_handle *pevent); -void tep_set_host_bigendian (struct tep_handle *pevent,enum tep_endian endian); -int tep_is_latency_format (struct tep_handle *pevent); +bool tep_is_local_bigendian (struct tep_handle *pevent); +void tep_set_local_bigendian (struct tep_handle *pevent,enum tep_endian endian); +bool tep_is_latency_format (struct tep_handle *pevent);void tep_set_latency_format (struct tep_handle *pevent,int lat);int tep_get_header_page_size (struct tep_handle *pevent);int tep_get_header_timestamp_size (struct tep_handle *tep);
tools/lib/traceevent/plugin_kvm.c +2 -2
@@ -389,8 +389,8 @@ static int kvm_mmu_print_role(struct trace_seq *s, struct tep_record *record,* We can only use the structure if file is of the same * endianness. */ -if (tep_file_bigendian (event->pevent) == -tep_is_host_bigendian (event->pevent)) { +if (tep_is_file_bigendian (event->pevent) == +tep_is_local_bigendian (event->pevent)) { trace_seq_printf(s, "%u q%u%s %s%s %spae %snxe %swp%s%s%s", role.level,
tools/perf/util/trace-event-read.c +1 -1
@@ -442,7 +442,7 @@ ssize_t trace_report(int fd, struct trace_event *tevent, bool __repipe)tep_set_flag (pevent,TEP_NSEC_OUTPUT );tep_set_file_bigendian (pevent, file_bigendian); -tep_set_host_bigendian (pevent, host_bigendian); +tep_set_local_bigendian (pevent, host_bigendian);if (do_read (buf,1 ) <0 ) goto out;
tools/perf/util/trace-event.c +2 -2
@@ -40,7 +40,7 @@ int trace_event__init(struct trace_event *t)static int trace_event__init2 (void ) { -int be =tep_host_bigendian (); +int be =tep_is_bigendian ();struct tep_handle *pevent;if (trace_event__init (&tevent))
@@ -49,7 +49,7 @@ static int trace_event__init2(void) pevent = tevent.pevent;tep_set_flag (pevent,TEP_NSEC_OUTPUT );tep_set_file_bigendian (pevent, be); -tep_set_host_bigendian (pevent, be); +tep_set_local_bigendian (pevent, be); tevent_initialized = true;return 0 ; }
Signature · 1 line
2.20.1
tip-bot for Tzvetomir Stoyanov
merge bot[tip:perf/core] tools tools, tools lib traceevent: Make traceevent APIs more consistent
tools tools, tools lib traceevent: Make traceevent APIs more consistent
Commit-ID: 55c34ae076f62ed7ad0fc86cd8b697a6f577c431 Gitweb: https://git.kernel.org/tip/55c34ae076f62ed7ad0fc86cd8b697a6f577c431 Author: Tzvetomir Stoyanov <[email protected]> AuthorDate: Mon, 1 Apr 2019 12:43:16 -0400 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 1 Apr 2019 15:18:09 -0300
tools tools, tools lib traceevent: Make traceevent APIs more consistent
Rename some traceevent APIs for consistency:
tep_pid_is_registered() to tep_is_pid_registered() tep_file_bigendian() to tep_is_file_bigendian()
to make the names and return values consistent with other tep_is_... APIs
tep_data_lat_fmt() to tep_data_latency_format()
to make the name more descriptive
tep_host_bigendian() to tep_is_bigendian() tep_set_host_bigendian() to tep_set_local_bigendian() tep_is_host_bigendian() to tep_is_local_bigendian()
"host" can be confused with VMs, and "local" is about the local machine. All tep_is_..._bigendian(struct tep_handle *tep) APIs return the saved data in the tep handle, while tep_is_bigendian() returns the running machine's endianness.
All tep_is_... functions are modified to return bool value, instead of int.
--- tools/lib/traceevent/event-parse-api.c | 40 +++++++++++++++++----------------- tools/lib/traceevent/event-parse.c | 26 +++++++++++----------- tools/lib/traceevent/event-parse.h | 16 +++++++------- tools/lib/traceevent/plugin_kvm.c | 4 ++-- tools/perf/util/trace-event-read.c | 2 +- tools/perf/util/trace-event.c | 4 ++-- 6 files changed, 46 insertions(+), 46 deletions(-)
tools/lib/traceevent/event-parse-api.c +20 -20
@@ -155,10 +155,10 @@ int tep_get_header_page_size(struct tep_handle *pevent) }/** -* tep_get_header_timestamp_size - get size of the time stamp in the header page +* tep_get_header_timestamp_size - get size of the timestamp in the header page * @tep: a handle to the tep_handle * -* This returns size of the time stamp in the header page +* This returns size of the timestamp in the header page * If @tep is NULL, 0 is returned. */ int tep_get_header_timestamp_size (struct tep_handle *tep)
@@ -249,17 +249,17 @@ void tep_set_page_size(struct tep_handle *pevent, int _page_size) }/** -* tep_file_bigendian - get if the file is in big endian order +* tep_is_file_bigendian - return the endian of the file * @pevent: a handle to the tep_handle * -* This returns if the file is in big endian order -* If @pevent is NULL, 0 is returned. +* This returns true if the file is in big endian order +* If @pevent is NULL, false is returned. */ -int tep_file_bigendian (struct tep_handle *pevent) +bool tep_is_file_bigendian (struct tep_handle *pevent) {if (pevent) -return pevent->file_bigendian; -return 0 ; +return pevent->file_bigendian ==TEP_BIG_ENDIAN ; +return false; }/**
@@ -276,27 +276,27 @@ void tep_set_file_bigendian(struct tep_handle *pevent, enum tep_endian endian) }/** -* tep_is_host_bigendian - get if the order of the current host is big endian +* tep_is_local_bigendian - return the endian of the saved local machine * @pevent: a handle to the tep_handle * -* This gets if the order of the current host is big endian -* If @pevent is NULL, 0 is returned. +* This returns true if the saved local machine in @pevent is big endian. +* If @pevent is NULL, false is returned. */ -int tep_is_host_bigendian (struct tep_handle *pevent) +bool tep_is_local_bigendian (struct tep_handle *pevent) {if (pevent) -return pevent->host_bigendian; +return pevent->host_bigendian ==TEP_BIG_ENDIAN ;return 0 ; }/** -* tep_set_host_bigendian - set the order of the local host +* tep_set_local_bigendian - set the stored local machine endian order * @pevent: a handle to the tep_handle * @endian: non zero, if the local host has big endian order * -* This sets the order of the local host +* This sets the endian order for the local machine. */ -void tep_set_host_bigendian (struct tep_handle *pevent,enum tep_endian endian) +void tep_set_local_bigendian (struct tep_handle *pevent,enum tep_endian endian) {if (pevent) pevent->host_bigendian = endian;
@@ -306,14 +306,14 @@ void tep_set_host_bigendian(struct tep_handle *pevent, enum tep_endian endian)* tep_is_latency_format - get if the latency output format is configured * @pevent: a handle to the tep_handle * -* This gets if the latency output format is configured -* If @pevent is NULL, 0 is returned. +* This returns true if the latency output format is configured +* If @pevent is NULL, false is returned. */ -int tep_is_latency_format (struct tep_handle *pevent) +bool tep_is_latency_format (struct tep_handle *pevent) {if (pevent)return pevent->latency_format; -return 0 ; +return false; }/**
tools/lib/traceevent/event-parse.c +13 -13
@@ -199,23 +199,23 @@ static const char *find_cmdline(struct tep_handle *pevent, int pid) }/** -* tep_pid_is_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 * @pid: The pid to check if it has a cmdline registered with. * -* Returns 1 if the pid has a cmdline mapped to it -* 0 otherwise. +* Returns true if the pid has a cmdline mapped to it +* false otherwise. */ -int tep_pid_is_registered (struct tep_handle *pevent,int pid) +bool tep_is_pid_registered (struct tep_handle *pevent,int pid) {const struct tep_cmdline *comm;struct tep_cmdline key;if (!pid) -return 1 ; +return true;if (!pevent->cmdlines &&cmdline_init (pevent)) -return 0 ; +return false; key.pid = pid;
@@ -223,8 +223,8 @@ int tep_pid_is_registered(struct tep_handle *pevent, int pid) sizeof(*pevent->cmdlines), cmdline_cmp);if (comm) -return 1 ; -return 0 ; +return true; +return false; }/*
@@ -5172,7 +5172,7 @@ out_failed: }/** -* tep_data_lat_fmt - parse the data for the latency format +* tep_data_latency_format - parse the data for the latency format * @pevent: a handle to the pevent * @s: the trace_seq to write to * @record: the record to read from
@@ -5181,8 +5181,8 @@ out_failed:* need rescheduling, in hard/soft interrupt, preempt count * and lock depth) and places it into the trace_seq. */ -void tep_data_lat_fmt (struct tep_handle *pevent, -struct trace_seq *s,struct tep_record *record) +void tep_data_latency_format (struct tep_handle *pevent, +struct trace_seq *s,struct tep_record *record) {static int check_lock_depth =1 ;static int check_migrate_disable =1 ;
@@ -5532,7 +5532,7 @@ void tep_print_event_time(struct tep_handle *pevent, struct trace_seq *s, }if (pevent->latency_format) { -tep_data_lat_fmt (pevent, s, record); +tep_data_latency_format (pevent, s, record); }if (use_usec_format) {
@@ -6827,7 +6827,7 @@ struct tep_handle *tep_alloc(void)if (pevent) { pevent->ref_count =1 ; - pevent->host_bigendian =tep_host_bigendian (); + pevent->host_bigendian =tep_is_bigendian (); }return pevent;
tools/lib/traceevent/event-parse.h +8 -8
@@ -412,7 +412,7 @@ void tep_set_flag(struct tep_handle *tep, int 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); -static inline int tep_host_bigendian (void ) +static inline int tep_is_bigendian (void ) {unsigned char str[] = {0x1 ,0x2 ,0x3 ,0x4 };unsigned int val;
@@ -440,7 +440,7 @@ int tep_register_function(struct tep_handle *pevent, char *name, unsigned long long addr, char *mod);int tep_register_print_string (struct tep_handle *pevent,const char *fmt,unsigned long long addr); -int tep_pid_is_registered (struct tep_handle *pevent,int pid); +bool tep_is_pid_registered (struct tep_handle *pevent,int pid); void tep_print_event_task(struct tep_handle *pevent, struct trace_seq *s, struct tep_event *event,
@@ -525,8 +525,8 @@ tep_find_event_by_name(struct tep_handle *pevent, const char *sys, const char *nstruct tep_event *tep_find_event_by_record (struct tep_handle *pevent,struct tep_record *record); -void tep_data_lat_fmt (struct tep_handle *pevent, -struct trace_seq *s,struct tep_record *record); +void tep_data_latency_format (struct tep_handle *pevent, +struct trace_seq *s,struct tep_record *record);int tep_data_type (struct tep_handle *pevent,struct tep_record *rec);int tep_data_pid (struct tep_handle *pevent,struct tep_record *rec);int tep_data_preempt_count (struct tep_handle *pevent,struct tep_record *rec);
@@ -563,11 +563,11 @@ int tep_get_long_size(struct tep_handle *pevent);void tep_set_long_size (struct tep_handle *pevent,int long_size);int tep_get_page_size (struct tep_handle *pevent);void tep_set_page_size (struct tep_handle *pevent,int _page_size); -int tep_file_bigendian (struct tep_handle *pevent); +bool tep_is_file_bigendian (struct tep_handle *pevent);void tep_set_file_bigendian (struct tep_handle *pevent,enum tep_endian endian); -int tep_is_host_bigendian (struct tep_handle *pevent); -void tep_set_host_bigendian (struct tep_handle *pevent,enum tep_endian endian); -int tep_is_latency_format (struct tep_handle *pevent); +bool tep_is_local_bigendian (struct tep_handle *pevent); +void tep_set_local_bigendian (struct tep_handle *pevent,enum tep_endian endian); +bool tep_is_latency_format (struct tep_handle *pevent);void tep_set_latency_format (struct tep_handle *pevent,int lat);int tep_get_header_page_size (struct tep_handle *pevent);int tep_get_header_timestamp_size (struct tep_handle *tep);
tools/lib/traceevent/plugin_kvm.c +2 -2
@@ -389,8 +389,8 @@ static int kvm_mmu_print_role(struct trace_seq *s, struct tep_record *record,* We can only use the structure if file is of the same * endianness. */ -if (tep_file_bigendian (event->pevent) == -tep_is_host_bigendian (event->pevent)) { +if (tep_is_file_bigendian (event->pevent) == +tep_is_local_bigendian (event->pevent)) { trace_seq_printf(s, "%u q%u%s %s%s %spae %snxe %swp%s%s%s", role.level,
tools/perf/util/trace-event-read.c +1 -1
@@ -442,7 +442,7 @@ ssize_t trace_report(int fd, struct trace_event *tevent, bool __repipe)tep_set_flag (pevent,TEP_NSEC_OUTPUT );tep_set_file_bigendian (pevent, file_bigendian); -tep_set_host_bigendian (pevent, host_bigendian); +tep_set_local_bigendian (pevent, host_bigendian);if (do_read (buf,1 ) <0 ) goto out;
tools/perf/util/trace-event.c +2 -2
@@ -40,7 +40,7 @@ int trace_event__init(struct trace_event *t)static int trace_event__init2 (void ) { -int be =tep_host_bigendian (); +int be =tep_is_bigendian ();struct tep_handle *pevent;if (trace_event__init (&tevent))
@@ -49,7 +49,7 @@ static int trace_event__init2(void) pevent = tevent.pevent;tep_set_flag (pevent,TEP_NSEC_OUTPUT );tep_set_file_bigendian (pevent, be); -tep_set_host_bigendian (pevent, be); +tep_set_local_bigendian (pevent, be); tevent_initialized = true;return 0 ; }
PATCH 12/15 tools/lib/traceevent: Rename input arguments of libtraceevent APIs from pevent to tep
In reply to Steven RostedtFrom: Tzvetomir Stoyanov <[email protected]>
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.
--- tools/lib/traceevent/event-parse-api.c | 132 +++--- tools/lib/traceevent/event-parse-local.h | 6 +- tools/lib/traceevent/event-parse.c | 452 ++++++++++----------- tools/lib/traceevent/event-parse.h | 123 +++--- tools/lib/traceevent/event-plugin.c | 8 +- tools/lib/traceevent/parse-filter.c | 8 +- tools/lib/traceevent/plugin_cfg80211.c | 8 +- tools/lib/traceevent/plugin_function.c | 8 +- tools/lib/traceevent/plugin_hrtimer.c | 12 +- tools/lib/traceevent/plugin_jbd2.c | 12 +- tools/lib/traceevent/plugin_kmem.c | 28 +- tools/lib/traceevent/plugin_kvm.c | 44 +- tools/lib/traceevent/plugin_mac80211.c | 8 +- tools/lib/traceevent/plugin_sched_switch.c | 16 +- tools/lib/traceevent/plugin_scsi.c | 8 +- tools/lib/traceevent/plugin_xen.c | 8 +- 16 files changed, 439 insertions(+), 442 deletions(-)
tools/lib/traceevent/event-parse-api.c +66 -66
@@ -92,11 +92,11 @@ bool tep_test_flag(struct tep_handle *tep, enum tep_flag flag)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; -if (!pevent || pevent->host_bigendian == pevent->file_bigendian) +if (!tep || tep->host_bigendian == tep->file_bigendian)return data; swap = ((data & 0xffULL) << 8) |
@@ -105,11 +105,11 @@ unsigned short tep_data2host2(struct tep_handle *pevent, unsigned short data)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; -if (!pevent || pevent->host_bigendian == pevent->file_bigendian) +if (!tep || tep->host_bigendian == tep->file_bigendian)return data; swap = ((data & 0xffULL) << 24) |
@@ -121,11 +121,11 @@ unsigned int tep_data2host4(struct tep_handle *pevent, unsigned int data) }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; -if (!pevent || pevent->host_bigendian == pevent->file_bigendian) +if (!tep || tep->host_bigendian == tep->file_bigendian)return data; swap = ((data & 0xffULL) << 56) |
@@ -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 -* @pevent: a handle to the tep_handle +* @tep: a handle to the tep_handle * * 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) -return pevent->header_page_size_size; +if (tep) +return tep->header_page_size_size;return 0 ; }
@@ -170,163 +170,163 @@ int tep_get_header_timestamp_size(struct tep_handle *tep)/** * 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 -* 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) -return pevent->cpus; +if (tep) +return tep->cpus;return 0 ; }/** * 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 */ -void tep_set_cpus (struct tep_handle *pevent,int cpus) +void tep_set_cpus (struct tep_handle *tep,int cpus) { -if (pevent) - pevent->cpus = cpus; +if (tep) + tep->cpus = cpus; }/** * 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 -* 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) -return pevent->long_size; +if (tep) +return tep->long_size;return 0 ; }/** * 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 * * 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) - pevent->long_size = long_size; +if (tep) + tep->long_size = long_size; }/** * 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 -* 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) -return pevent->page_size; +if (tep) +return tep->page_size;return 0 ; }/** * 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 * * 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) - pevent->page_size = _page_size; +if (tep) + tep->page_size = _page_size; }/** * 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 -* 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) -return pevent->file_bigendian ==TEP_BIG_ENDIAN ; +if (tep) +return (tep->file_bigendian ==TEP_BIG_ENDIAN );return false; }/** * 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 * * 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) - pevent->file_bigendian = endian; +if (tep) + tep->file_bigendian = endian; }/** * 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. -* If @pevent is NULL, false is returned. +* This returns true if the saved local machine in @tep is big endian. +* 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) -return pevent->host_bigendian ==TEP_BIG_ENDIAN ; +if (tep) +return (tep->host_bigendian ==TEP_BIG_ENDIAN );return 0 ; }/** * 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 * * 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) - pevent->host_bigendian = endian; +if (tep) + tep->host_bigendian = endian; }/** * 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 -* 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) -return pevent->latency_format; +if (tep) +return (tep->latency_format);return false; }/** * 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 * * 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) - pevent->latency_format = lat; +if (tep) + tep->latency_format = lat; }/**
tools/lib/traceevent/event-parse-local.h +3 -3
@@ -92,8 +92,8 @@ struct tep_handle {void tep_free_event (struct tep_event *event);void tep_free_format_field (struct tep_format_field *field); -unsigned short tep_data2host2 (struct tep_handle *pevent,unsigned short data); -unsigned int tep_data2host4 (struct tep_handle *pevent,unsigned int data); -unsigned long long tep_data2host8 (struct tep_handle *pevent,unsigned long long data); +unsigned short tep_data2host2 (struct tep_handle *tep,unsigned short data); +unsigned int tep_data2host4 (struct tep_handle *tep,unsigned int data); +unsigned long long tep_data2host8 (struct tep_handle *tep,unsigned long long data);#endif /* _PARSE_EVENTS_INT_H */
tools/lib/traceevent/event-parse.c +225 -227
1,153 lines not on this page · raw message
tools/lib/traceevent/event-parse.h +61 -62
238 lines not on this page · raw message
tools/lib/traceevent/event-plugin.c +4 -4
@@ -419,16 +419,16 @@ load_plugins(struct tep_handle *pevent, const char *suffix, }struct tep_plugin_list * -tep_load_plugins (struct tep_handle *pevent) +tep_load_plugins (struct tep_handle *tep) {struct tep_plugin_list *list =NULL ; -load_plugins (pevent,".so" , load_plugin, &list); +load_plugins (tep,".so" , load_plugin, &list);return list; }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;struct tep_plugin_list *list;
@@ -438,7 +438,7 @@ tep_unload_plugins(struct tep_plugin_list *plugin_list, struct tep_handle *peven plugin_list = list->next; func =dlsym (list->handle,TEP_PLUGIN_UNLOADER_NAME );if (func) -func (pevent); +func (tep);dlclose (list->handle);free (list->name);free (list);
tools/lib/traceevent/parse-filter.c +4 -4
@@ -164,9 +164,9 @@ add_filter_type(struct tep_event_filter *filter, int id)/** * 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;
@@ -175,8 +175,8 @@ struct tep_event_filter *tep_filter_alloc(struct tep_handle *pevent)return NULL ;memset (filter,0 ,sizeof (*filter)); - filter->pevent = pevent; -tep_ref (pevent); + filter->pevent = tep; +tep_ref (tep);return filter; }
tools/lib/traceevent/plugin_cfg80211.c +4 -4
@@ -25,9 +25,9 @@ process___le16_to_cpup(struct trace_seq *s, unsigned long long *args)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, TEP_FUNC_ARG_INT, "__le16_to_cpup",
@@ -36,8 +36,8 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)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" ); }
tools/lib/traceevent/plugin_function.c +4 -4
@@ -164,9 +164,9 @@ static int function_handler(struct trace_seq *s, struct tep_record *record,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 );tep_plugin_add_options ("ftrace" , plugin_options);
@@ -174,11 +174,11 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)return 0 ; } -void TEP_PLUGIN_UNLOADER (struct tep_handle *pevent) +void TEP_PLUGIN_UNLOADER (struct tep_handle *tep) {int i, x; -tep_unregister_event_handler (pevent,-1 ,"ftrace" ,"function" , +tep_unregister_event_handler (tep,-1 ,"ftrace" ,"function" , function_handler,NULL );for (i =0 ; i <= cpus; i++) {
tools/lib/traceevent/plugin_hrtimer.c +6 -6
@@ -67,23 +67,23 @@ static int timer_start_handler(struct trace_seq *s,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_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 );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_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 ); }
tools/lib/traceevent/plugin_jbd2.c +6 -6
@@ -48,16 +48,16 @@ process_jiffies_to_msecs(struct trace_seq *s, unsigned long long *args)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,TEP_FUNC_ARG_STRING ,"jbd2_dev_to_name" ,TEP_FUNC_ARG_INT ,TEP_FUNC_ARG_VOID ); - tep_register_print_function(pevent, + tep_register_print_function(tep, process_jiffies_to_msecs, TEP_FUNC_ARG_LONG, "jiffies_to_msecs",
@@ -66,11 +66,11 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)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" ); -tep_unregister_print_function (pevent, process_jiffies_to_msecs, +tep_unregister_print_function (tep, process_jiffies_to_msecs,"jiffies_to_msecs" ); }
tools/lib/traceevent/plugin_kmem.c +14 -14
@@ -49,47 +49,47 @@ static int call_site_handler(struct trace_seq *s, struct tep_record *record,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 ); -tep_register_event_handler (pevent,-1 ,"kmem" ,"kmalloc" , +tep_register_event_handler (tep,-1 ,"kmem" ,"kmalloc" , 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 ); -tep_register_event_handler (pevent,-1 ,"kmem" ,"kmem_cache_alloc" , +tep_register_event_handler (tep,-1 ,"kmem" ,"kmem_cache_alloc" , call_site_handler,NULL ); -tep_register_event_handler (pevent,-1 ,"kmem" , +tep_register_event_handler (tep,-1 ,"kmem" ,"kmem_cache_alloc_node" , 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 );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 ); -tep_unregister_event_handler (pevent,-1 ,"kmem" ,"kmalloc" , +tep_unregister_event_handler (tep,-1 ,"kmem" ,"kmalloc" , 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 ); -tep_unregister_event_handler (pevent,-1 ,"kmem" ,"kmem_cache_alloc" , +tep_unregister_event_handler (tep,-1 ,"kmem" ,"kmem_cache_alloc" , call_site_handler,NULL ); -tep_unregister_event_handler (pevent,-1 ,"kmem" , +tep_unregister_event_handler (tep,-1 ,"kmem" ,"kmem_cache_alloc_node" , 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 ); }
tools/lib/traceevent/plugin_kvm.c +22 -22
99 lines not on this page · raw message
tools/lib/traceevent/plugin_mac80211.c +4 -4
@@ -87,17 +87,17 @@ static int drv_bss_info_changed(struct trace_seq *s,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,NULL );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,NULL ); }
tools/lib/traceevent/plugin_sched_switch.c +8 -8
@@ -135,27 +135,27 @@ static int sched_switch_handler(struct trace_seq *s,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 ); -tep_register_event_handler (pevent,-1 ,"sched" ,"sched_wakeup" , +tep_register_event_handler (tep,-1 ,"sched" ,"sched_wakeup" , 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 );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 ); -tep_unregister_event_handler (pevent,-1 ,"sched" ,"sched_wakeup" , +tep_unregister_event_handler (tep,-1 ,"sched" ,"sched_wakeup" , 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 ); }
tools/lib/traceevent/plugin_scsi.c +4 -4
@@ -414,9 +414,9 @@ unsigned long long process_scsi_trace_parse_cdb(struct trace_seq *s,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, TEP_FUNC_ARG_STRING, "scsi_trace_parse_cdb",
@@ -427,8 +427,8 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)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" ); }
tools/lib/traceevent/plugin_xen.c +4 -4
@@ -120,9 +120,9 @@ unsigned long long process_xen_hypercall_name(struct trace_seq *s,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, TEP_FUNC_ARG_STRING, "xen_hypercall_name",
@@ -131,8 +131,8 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)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" ); }
Signature · 1 line
2.20.1
tip-bot for Tzvetomir Stoyanov
merge bot[tip:perf/core] tools lib traceevent: Rename input arguments of libtraceevent APIs from pevent to tep
tools lib traceevent: Rename input arguments of libtraceevent APIs from pevent to tep
Commit-ID: 047ff221e3ab07129a3566683e95a4d142f7c3c0 Gitweb: https://git.kernel.org/tip/047ff221e3ab07129a3566683e95a4d142f7c3c0 Author: Tzvetomir Stoyanov <[email protected]> AuthorDate: Mon, 1 Apr 2019 12:43:17 -0400 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 1 Apr 2019 15:18:09 -0300
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.
--- tools/lib/traceevent/event-parse-api.c | 132 ++++----- tools/lib/traceevent/event-parse-local.h | 6 +- tools/lib/traceevent/event-parse.c | 452 ++++++++++++++--------------- tools/lib/traceevent/event-parse.h | 123 ++++---- tools/lib/traceevent/event-plugin.c | 8 +- tools/lib/traceevent/parse-filter.c | 8 +- tools/lib/traceevent/plugin_cfg80211.c | 8 +- tools/lib/traceevent/plugin_function.c | 8 +- tools/lib/traceevent/plugin_hrtimer.c | 12 +- tools/lib/traceevent/plugin_jbd2.c | 12 +- tools/lib/traceevent/plugin_kmem.c | 28 +- tools/lib/traceevent/plugin_kvm.c | 44 +-- tools/lib/traceevent/plugin_mac80211.c | 8 +- tools/lib/traceevent/plugin_sched_switch.c | 16 +- tools/lib/traceevent/plugin_scsi.c | 8 +- tools/lib/traceevent/plugin_xen.c | 8 +- 16 files changed, 439 insertions(+), 442 deletions(-)
tools/lib/traceevent/event-parse-api.c +66 -66
@@ -92,11 +92,11 @@ bool tep_test_flag(struct tep_handle *tep, enum tep_flag flag)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; -if (!pevent || pevent->host_bigendian == pevent->file_bigendian) +if (!tep || tep->host_bigendian == tep->file_bigendian)return data; swap = ((data & 0xffULL) << 8) |
@@ -105,11 +105,11 @@ unsigned short tep_data2host2(struct tep_handle *pevent, unsigned short data)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; -if (!pevent || pevent->host_bigendian == pevent->file_bigendian) +if (!tep || tep->host_bigendian == tep->file_bigendian)return data; swap = ((data & 0xffULL) << 24) |
@@ -121,11 +121,11 @@ unsigned int tep_data2host4(struct tep_handle *pevent, unsigned int data) }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; -if (!pevent || pevent->host_bigendian == pevent->file_bigendian) +if (!tep || tep->host_bigendian == tep->file_bigendian)return data; swap = ((data & 0xffULL) << 56) |
@@ -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 -* @pevent: a handle to the tep_handle +* @tep: a handle to the tep_handle * * 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) -return pevent->header_page_size_size; +if (tep) +return tep->header_page_size_size;return 0 ; }
@@ -170,163 +170,163 @@ int tep_get_header_timestamp_size(struct tep_handle *tep)/** * 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 -* 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) -return pevent->cpus; +if (tep) +return tep->cpus;return 0 ; }/** * 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 */ -void tep_set_cpus (struct tep_handle *pevent,int cpus) +void tep_set_cpus (struct tep_handle *tep,int cpus) { -if (pevent) - pevent->cpus = cpus; +if (tep) + tep->cpus = cpus; }/** * 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 -* 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) -return pevent->long_size; +if (tep) +return tep->long_size;return 0 ; }/** * 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 * * 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) - pevent->long_size = long_size; +if (tep) + tep->long_size = long_size; }/** * 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 -* 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) -return pevent->page_size; +if (tep) +return tep->page_size;return 0 ; }/** * 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 * * 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) - pevent->page_size = _page_size; +if (tep) + tep->page_size = _page_size; }/** * 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 -* 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) -return pevent->file_bigendian ==TEP_BIG_ENDIAN ; +if (tep) +return (tep->file_bigendian ==TEP_BIG_ENDIAN );return false; }/** * 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 * * 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) - pevent->file_bigendian = endian; +if (tep) + tep->file_bigendian = endian; }/** * 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. -* If @pevent is NULL, false is returned. +* This returns true if the saved local machine in @tep is big endian. +* 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) -return pevent->host_bigendian ==TEP_BIG_ENDIAN ; +if (tep) +return (tep->host_bigendian ==TEP_BIG_ENDIAN );return 0 ; }/** * 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 * * 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) - pevent->host_bigendian = endian; +if (tep) + tep->host_bigendian = endian; }/** * 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 -* 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) -return pevent->latency_format; +if (tep) +return (tep->latency_format);return false; }/** * 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 * * 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) - pevent->latency_format = lat; +if (tep) + tep->latency_format = lat; }/**
tools/lib/traceevent/event-parse-local.h +3 -3
@@ -92,8 +92,8 @@ struct tep_handle {void tep_free_event (struct tep_event *event);void tep_free_format_field (struct tep_format_field *field); -unsigned short tep_data2host2 (struct tep_handle *pevent,unsigned short data); -unsigned int tep_data2host4 (struct tep_handle *pevent,unsigned int data); -unsigned long long tep_data2host8 (struct tep_handle *pevent,unsigned long long data); +unsigned short tep_data2host2 (struct tep_handle *tep,unsigned short data); +unsigned int tep_data2host4 (struct tep_handle *tep,unsigned int data); +unsigned long long tep_data2host8 (struct tep_handle *tep,unsigned long long data);#endif /* _PARSE_EVENTS_INT_H */
tools/lib/traceevent/event-parse.c +225 -227
1,153 lines not on this page · raw message
tools/lib/traceevent/event-parse.h +61 -62
238 lines not on this page · raw message
tools/lib/traceevent/event-plugin.c +4 -4
@@ -419,16 +419,16 @@ load_plugins(struct tep_handle *pevent, const char *suffix, }struct tep_plugin_list * -tep_load_plugins (struct tep_handle *pevent) +tep_load_plugins (struct tep_handle *tep) {struct tep_plugin_list *list =NULL ; -load_plugins (pevent,".so" , load_plugin, &list); +load_plugins (tep,".so" , load_plugin, &list);return list; }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;struct tep_plugin_list *list;
@@ -438,7 +438,7 @@ tep_unload_plugins(struct tep_plugin_list *plugin_list, struct tep_handle *peven plugin_list = list->next; func =dlsym (list->handle,TEP_PLUGIN_UNLOADER_NAME );if (func) -func (pevent); +func (tep);dlclose (list->handle);free (list->name);free (list);
tools/lib/traceevent/parse-filter.c +4 -4
@@ -164,9 +164,9 @@ add_filter_type(struct tep_event_filter *filter, int id)/** * 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;
@@ -175,8 +175,8 @@ struct tep_event_filter *tep_filter_alloc(struct tep_handle *pevent)return NULL ;memset (filter,0 ,sizeof (*filter)); - filter->pevent = pevent; -tep_ref (pevent); + filter->pevent = tep; +tep_ref (tep);return filter; }
tools/lib/traceevent/plugin_cfg80211.c +4 -4
@@ -25,9 +25,9 @@ process___le16_to_cpup(struct trace_seq *s, unsigned long long *args)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, TEP_FUNC_ARG_INT, "__le16_to_cpup",
@@ -36,8 +36,8 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)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" ); }
tools/lib/traceevent/plugin_function.c +4 -4
@@ -164,9 +164,9 @@ static int function_handler(struct trace_seq *s, struct tep_record *record,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 );tep_plugin_add_options ("ftrace" , plugin_options);
@@ -174,11 +174,11 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)return 0 ; } -void TEP_PLUGIN_UNLOADER (struct tep_handle *pevent) +void TEP_PLUGIN_UNLOADER (struct tep_handle *tep) {int i, x; -tep_unregister_event_handler (pevent,-1 ,"ftrace" ,"function" , +tep_unregister_event_handler (tep,-1 ,"ftrace" ,"function" , function_handler,NULL );for (i =0 ; i <= cpus; i++) {
tools/lib/traceevent/plugin_hrtimer.c +6 -6
@@ -67,23 +67,23 @@ static int timer_start_handler(struct trace_seq *s,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_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 );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_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 ); }
tools/lib/traceevent/plugin_jbd2.c +6 -6
@@ -48,16 +48,16 @@ process_jiffies_to_msecs(struct trace_seq *s, unsigned long long *args)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,TEP_FUNC_ARG_STRING ,"jbd2_dev_to_name" ,TEP_FUNC_ARG_INT ,TEP_FUNC_ARG_VOID ); - tep_register_print_function(pevent, + tep_register_print_function(tep, process_jiffies_to_msecs, TEP_FUNC_ARG_LONG, "jiffies_to_msecs",
@@ -66,11 +66,11 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)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" ); -tep_unregister_print_function (pevent, process_jiffies_to_msecs, +tep_unregister_print_function (tep, process_jiffies_to_msecs,"jiffies_to_msecs" ); }
tools/lib/traceevent/plugin_kmem.c +14 -14
@@ -49,47 +49,47 @@ static int call_site_handler(struct trace_seq *s, struct tep_record *record,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 ); -tep_register_event_handler (pevent,-1 ,"kmem" ,"kmalloc" , +tep_register_event_handler (tep,-1 ,"kmem" ,"kmalloc" , 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 ); -tep_register_event_handler (pevent,-1 ,"kmem" ,"kmem_cache_alloc" , +tep_register_event_handler (tep,-1 ,"kmem" ,"kmem_cache_alloc" , call_site_handler,NULL ); -tep_register_event_handler (pevent,-1 ,"kmem" , +tep_register_event_handler (tep,-1 ,"kmem" ,"kmem_cache_alloc_node" , 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 );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 ); -tep_unregister_event_handler (pevent,-1 ,"kmem" ,"kmalloc" , +tep_unregister_event_handler (tep,-1 ,"kmem" ,"kmalloc" , 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 ); -tep_unregister_event_handler (pevent,-1 ,"kmem" ,"kmem_cache_alloc" , +tep_unregister_event_handler (tep,-1 ,"kmem" ,"kmem_cache_alloc" , call_site_handler,NULL ); -tep_unregister_event_handler (pevent,-1 ,"kmem" , +tep_unregister_event_handler (tep,-1 ,"kmem" ,"kmem_cache_alloc_node" , 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 ); }
tools/lib/traceevent/plugin_kvm.c +22 -22
99 lines not on this page · raw message
tools/lib/traceevent/plugin_mac80211.c +4 -4
@@ -87,17 +87,17 @@ static int drv_bss_info_changed(struct trace_seq *s,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,NULL );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,NULL ); }
tools/lib/traceevent/plugin_sched_switch.c +8 -8
@@ -135,27 +135,27 @@ static int sched_switch_handler(struct trace_seq *s,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 ); -tep_register_event_handler (pevent,-1 ,"sched" ,"sched_wakeup" , +tep_register_event_handler (tep,-1 ,"sched" ,"sched_wakeup" , 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 );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 ); -tep_unregister_event_handler (pevent,-1 ,"sched" ,"sched_wakeup" , +tep_unregister_event_handler (tep,-1 ,"sched" ,"sched_wakeup" , 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 ); }
tools/lib/traceevent/plugin_scsi.c +4 -4
@@ -414,9 +414,9 @@ unsigned long long process_scsi_trace_parse_cdb(struct trace_seq *s,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, TEP_FUNC_ARG_STRING, "scsi_trace_parse_cdb",
@@ -427,8 +427,8 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)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" ); }
tools/lib/traceevent/plugin_xen.c +4 -4
@@ -120,9 +120,9 @@ unsigned long long process_xen_hypercall_name(struct trace_seq *s,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, TEP_FUNC_ARG_STRING, "xen_hypercall_name",
@@ -131,8 +131,8 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)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" ); }
PATCH 13/15 tools/perf,tools/lib/traceevent: Rename "pevent" member of struct tep_event to "tep"
In reply to Steven RostedtFrom: Tzvetomir Stoyanov <[email protected]>
The member "pevent" of the struct tep_event is renamed to "tep". This makes the struct consistent with the chosen naming convention:
tep (trace event parser), instead of the old pevent.
--- tools/lib/traceevent/event-parse.c | 32 +++++++++---------- tools/lib/traceevent/event-parse.h | 2 +- tools/lib/traceevent/parse-filter.c | 6 ++-- tools/lib/traceevent/plugin_function.c | 2 +- tools/lib/traceevent/plugin_kmem.c | 4 +-- tools/lib/traceevent/plugin_kvm.c | 4 +-- tools/lib/traceevent/plugin_sched_switch.c | 2 +- tools/perf/builtin-kmem.c | 2 +- tools/perf/util/data-convert-bt.c | 4 +-- tools/perf/util/python.c | 2 +- .../util/scripting-engines/trace-event-perl.c | 2 +- .../scripting-engines/trace-event-python.c | 2 +- tools/perf/util/trace-event-parse.c | 2 +- 13 files changed, 33 insertions(+), 33 deletions(-)
tools/lib/traceevent/event-parse.c +16 -16
@@ -804,7 +804,7 @@ static int add_event(struct tep_handle *pevent, struct tep_event *event) pevent->events[i] = event; pevent->nr_events++; - event->pevent = pevent; + event->tep = pevent;return 0 ; }
@@ -1656,8 +1656,8 @@ static int event_read_fields(struct tep_event *event, struct tep_format_field **else if (field->flags &TEP_FIELD_IS_STRING ) field->elementsize =1 ;else if (field->flags &TEP_FIELD_IS_LONG ) - field->elementsize = event->pevent ? - event->pevent->long_size : + field->elementsize = event->tep ? + event->tep->long_size :sizeof (long ); }else field->elementsize = field->size;
@@ -3075,7 +3075,7 @@ process_function(struct tep_event *event, struct tep_print_arg *arg,return process_dynamic_array_len (event, arg, tok); } - func =find_func_handler (event->pevent, token); + func =find_func_handler (event->tep, token);if (func) {free_token (token);return process_func_handler (event, func, arg, tok);
@@ -3405,7 +3405,7 @@ int tep_read_number_field(struct tep_format_field *field, const void *data,case 2 :case 4 :case 8 : - *value =tep_read_number (field->event->pevent, + *value =tep_read_number (field->event->tep, data + field->offset, field->size);return 0 ;default :
@@ -3566,7 +3566,7 @@ tep_find_event_by_name(struct tep_handle *tep,static unsigned long long eval_num_arg (void *data,int size,struct tep_event *event,struct tep_print_arg *arg) { -struct tep_handle *pevent = event->pevent; +struct tep_handle *pevent = event->tep;unsigned long long val =0 ;unsigned long long left, right;struct tep_print_arg *typearg =NULL ;
@@ -3907,7 +3907,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, struct tep_event *event, const char *format, int len_arg, struct tep_print_arg *arg) { - struct tep_handle *pevent = event->pevent; + struct tep_handle *pevent = event->tep;struct tep_print_flag_sym *flag;struct tep_format_field *field;struct printk_map *printk;
@@ -4256,7 +4256,7 @@ static void free_args(struct tep_print_arg *args)static struct tep_print_arg *make_bprint_args (char *fmt,void *data,int size,struct tep_event *event) { -struct tep_handle *pevent = event->pevent; +struct tep_handle *pevent = event->tep;struct tep_format_field *field, *ip_field;struct tep_print_arg *args, *arg, **next;unsigned long long ip, val;
@@ -4434,7 +4434,7 @@ static char * get_bprint_format(void *data, int size __maybe_unused, struct tep_event *event) { -struct tep_handle *pevent = event->pevent; +struct tep_handle *pevent = event->tep;unsigned long long addr;struct tep_format_field *field;struct printk_map *printk;
@@ -4835,7 +4835,7 @@ void tep_print_field(struct trace_seq *s, void *data, {unsigned long long val;unsigned int offset, len, i; -struct tep_handle *pevent = field->event->pevent; +struct tep_handle *pevent = field->event->tep;if (field->flags &TEP_FIELD_IS_ARRAY ) { offset = field->offset;
@@ -4910,7 +4910,7 @@ void tep_print_fields(struct trace_seq *s, void *data,static void pretty_print (struct trace_seq *s,void *data,int size,struct tep_event *event) { -struct tep_handle *pevent = event->pevent; +struct tep_handle *pevent = event->tep;struct tep_print_fmt *print_fmt = &event->print_fmt;struct tep_print_arg *arg = print_fmt->args;struct tep_print_arg *args =NULL ;
@@ -5424,7 +5424,7 @@ void tep_event_info(struct trace_seq *s, struct tep_event *event, {int print_pretty =1 ; -if (event->pevent->print_raw || (event->flags &TEP_EVENT_FL_PRINTRAW )) +if (event->tep->print_raw || (event->flags &TEP_EVENT_FL_PRINTRAW ))tep_print_fields (s, record->data, record->size, event);else {
@@ -6163,7 +6163,7 @@ enum tep_errno __tep_parse_format(struct tep_event **eventp, }/* Add pevent to event so that it can be referenced */ - event->pevent = pevent; + event->tep = pevent; ret =event_read_format (event);if (ret <0 ) {
@@ -6357,8 +6357,8 @@ void *tep_get_field_raw(struct trace_seq *s, struct tep_event *event, offset = field->offset;if (field->flags &TEP_FIELD_IS_DYNAMIC ) { - offset =tep_read_number (event->pevent, - data + offset, field->size); + offset =tep_read_number (event->tep, + data + offset, field->size); *len = offset >>16 ; offset &=0xffff ; }else
@@ -6492,7 +6492,7 @@ int tep_print_func_field(struct trace_seq *s, const char *fmt, struct tep_record *record, int err) {struct tep_format_field *field =tep_find_field (event, name); -struct tep_handle *pevent = event->pevent; +struct tep_handle *pevent = event->tep;unsigned long long val;struct func_map *func;char tmp[128 ];
tools/lib/traceevent/event-parse.h +1 -1
@@ -278,7 +278,7 @@ struct tep_print_fmt { };struct tep_event { -struct tep_handle *pevent; +struct tep_handle *tep;char *name;int id;int flags;
tools/lib/traceevent/parse-filter.c +3 -3
@@ -1528,8 +1528,8 @@ get_comm(struct tep_event *event, struct tep_record *record)const char *comm;int pid; - pid =tep_data_pid (event->pevent, record); - comm =tep_data_comm_from_pid (event->pevent, pid); + pid =tep_data_pid (event->tep, record); + comm =tep_data_comm_from_pid (event->tep, pid);return comm; }
@@ -1727,7 +1727,7 @@ static const char *get_field_str(struct tep_filter_arg *arg, struct tep_record * }else { event = arg->str.field->event; - pevent = event->pevent; + pevent = event->tep; addr =get_value (event, arg->str.field, record);if (arg->str.field->flags & (TEP_FIELD_IS_POINTER |TEP_FIELD_IS_LONG ))
tools/lib/traceevent/plugin_function.c +1 -1
@@ -126,7 +126,7 @@ static int add_and_get_index(const char *parent, const char *child, int cpu)static int function_handler (struct trace_seq *s,struct tep_record *record,struct tep_event *event,void *context) { -struct tep_handle *pevent = event->pevent; +struct tep_handle *pevent = event->tep;unsigned long long function;unsigned long long pfunction;const char *func;
tools/lib/traceevent/plugin_kmem.c +2 -2
@@ -39,11 +39,11 @@ static int call_site_handler(struct trace_seq *s, struct tep_record *record,if (tep_read_number_field (field, data, &val))return 1 ; - func =tep_find_function (event->pevent, val); + func =tep_find_function (event->tep, val);if (!func)return 1 ; - addr =tep_find_function_address (event->pevent, val); + addr =tep_find_function_address (event->tep, val);trace_seq_printf (s,"(%s+0x%x) " , func, (int )(val - addr));return 1 ;
tools/lib/traceevent/plugin_kvm.c +2 -2
@@ -389,8 +389,8 @@ static int kvm_mmu_print_role(struct trace_seq *s, struct tep_record *record,* We can only use the structure if file is of the same * endianness. */ -if (tep_is_file_bigendian (event->pevent) == -tep_is_local_bigendian (event->pevent)) { +if (tep_is_file_bigendian (event->tep) == +tep_is_local_bigendian (event->tep)) { trace_seq_printf(s, "%u q%u%s %s%s %spae %snxe %swp%s%s%s", role.level,
tools/lib/traceevent/plugin_sched_switch.c +1 -1
@@ -62,7 +62,7 @@ static void write_and_save_comm(struct tep_format_field *field, comm = &s->buffer[len];/* Help out the comm to ids. This will handle dups */ -tep_register_comm (field->event->pevent, comm, pid); +tep_register_comm (field->event->tep, comm, pid); } static int sched_wakeup_handler(struct trace_seq *s,
tools/perf/builtin-kmem.c +1 -1
@@ -1975,7 +1975,7 @@ int cmd_kmem(int argc, const char **argv) goto out_delete; } - kmem_page_size =tep_get_page_size (evsel->tp_format->pevent); + kmem_page_size =tep_get_page_size (evsel->tp_format->tep); symbol_conf.use_callchain = true; }
tools/perf/util/data-convert-bt.c +2 -2
@@ -310,7 +310,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw,if (flags &TEP_FIELD_IS_DYNAMIC ) {unsigned long long tmp_val; - tmp_val =tep_read_number (fmtf->event->pevent, + tmp_val =tep_read_number (fmtf->event->tep, data + offset, len); offset = tmp_val; len = offset >>16 ;
@@ -354,7 +354,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw,unsigned long long value_int; value_int =tep_read_number ( - fmtf->event->pevent, + fmtf->event->tep, data + offset + i * len, len);if (!(flags &TEP_FIELD_IS_SIGNED ))
tools/perf/util/python.c +1 -1
@@ -342,7 +342,7 @@ static bool is_tracepoint(struct pyrf_event *pevent)static PyObject *tracepoint_field (struct pyrf_event *pe,struct tep_format_field *field) { -struct tep_handle *pevent = field->event->pevent; +struct tep_handle *pevent = field->event->tep;void *data = pe->sample.raw_data;PyObject *ret =NULL ;unsigned long long val;
tools/perf/util/scripting-engines/trace-event-perl.c +1 -1
@@ -372,7 +372,7 @@ static void perl_process_tracepoint(struct perf_sample *sample, ns = nsecs - s *NSEC_PER_SEC ; scripting_context->event_data = data; - scripting_context->pevent = evsel->tp_format->pevent; + scripting_context->pevent = evsel->tp_format->tep;ENTER ;SAVETMPS ;
tools/perf/util/scripting-engines/trace-event-python.c +1 -1
@@ -837,7 +837,7 @@ static void python_process_tracepoint(struct perf_sample *sample, ns = nsecs - s *NSEC_PER_SEC ; scripting_context->event_data = data; - scripting_context->pevent = evsel->tp_format->pevent; + scripting_context->pevent = evsel->tp_format->tep; context =_PyCapsule_New (scripting_context,NULL ,NULL );
tools/perf/util/trace-event-parse.c +1 -1
@@ -111,7 +111,7 @@ raw_field_value(struct tep_event *event, const char *name, void *data)unsigned long long read_size (struct tep_event *event,void *ptr,int size) { -return tep_read_number (event->pevent, ptr, size); +return tep_read_number (event->tep, ptr, size); } void event_format__fprintf(struct tep_event *event,
Signature · 1 line
2.20.1
tip-bot for Tzvetomir Stoyanov
merge bot[tip:perf/core] perf tools, tools lib traceevent: Rename "pevent" member of struct tep_event to "tep"
perf tools, tools lib traceevent: Rename "pevent" member of struct tep_event to "tep"
Commit-ID: 69769ce159cbfd7567815a86cfc3ea63423de61b Gitweb: https://git.kernel.org/tip/69769ce159cbfd7567815a86cfc3ea63423de61b Author: Tzvetomir Stoyanov <[email protected]> AuthorDate: Mon, 1 Apr 2019 12:43:18 -0400 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 1 Apr 2019 15:18:10 -0300
perf tools, tools lib traceevent: Rename "pevent" member of struct tep_event to "tep"
The member "pevent" of the struct tep_event is renamed to "tep". This makes the struct consistent with the chosen naming convention:
tep (trace event parser), instead of the old pevent.
--- tools/lib/traceevent/event-parse.c | 32 +++++++++++----------- tools/lib/traceevent/event-parse.h | 2 +- tools/lib/traceevent/parse-filter.c | 6 ++-- tools/lib/traceevent/plugin_function.c | 2 +- tools/lib/traceevent/plugin_kmem.c | 4 +-- tools/lib/traceevent/plugin_kvm.c | 4 +-- tools/lib/traceevent/plugin_sched_switch.c | 2 +- tools/perf/builtin-kmem.c | 2 +- tools/perf/util/data-convert-bt.c | 4 +-- tools/perf/util/python.c | 2 +- .../perf/util/scripting-engines/trace-event-perl.c | 2 +- .../util/scripting-engines/trace-event-python.c | 2 +- tools/perf/util/trace-event-parse.c | 2 +- 13 files changed, 33 insertions(+), 33 deletions(-)
tools/lib/traceevent/event-parse.c +16 -16
@@ -804,7 +804,7 @@ static int add_event(struct tep_handle *pevent, struct tep_event *event) pevent->events[i] = event; pevent->nr_events++; - event->pevent = pevent; + event->tep = pevent;return 0 ; }
@@ -1656,8 +1656,8 @@ static int event_read_fields(struct tep_event *event, struct tep_format_field **else if (field->flags &TEP_FIELD_IS_STRING ) field->elementsize =1 ;else if (field->flags &TEP_FIELD_IS_LONG ) - field->elementsize = event->pevent ? - event->pevent->long_size : + field->elementsize = event->tep ? + event->tep->long_size :sizeof (long ); }else field->elementsize = field->size;
@@ -3075,7 +3075,7 @@ process_function(struct tep_event *event, struct tep_print_arg *arg,return process_dynamic_array_len (event, arg, tok); } - func =find_func_handler (event->pevent, token); + func =find_func_handler (event->tep, token);if (func) {free_token (token);return process_func_handler (event, func, arg, tok);
@@ -3405,7 +3405,7 @@ int tep_read_number_field(struct tep_format_field *field, const void *data,case 2 :case 4 :case 8 : - *value =tep_read_number (field->event->pevent, + *value =tep_read_number (field->event->tep, data + field->offset, field->size);return 0 ;default :
@@ -3566,7 +3566,7 @@ tep_find_event_by_name(struct tep_handle *tep,static unsigned long long eval_num_arg (void *data,int size,struct tep_event *event,struct tep_print_arg *arg) { -struct tep_handle *pevent = event->pevent; +struct tep_handle *pevent = event->tep;unsigned long long val =0 ;unsigned long long left, right;struct tep_print_arg *typearg =NULL ;
@@ -3907,7 +3907,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, struct tep_event *event, const char *format, int len_arg, struct tep_print_arg *arg) { - struct tep_handle *pevent = event->pevent; + struct tep_handle *pevent = event->tep;struct tep_print_flag_sym *flag;struct tep_format_field *field;struct printk_map *printk;
@@ -4256,7 +4256,7 @@ static void free_args(struct tep_print_arg *args)static struct tep_print_arg *make_bprint_args (char *fmt,void *data,int size,struct tep_event *event) { -struct tep_handle *pevent = event->pevent; +struct tep_handle *pevent = event->tep;struct tep_format_field *field, *ip_field;struct tep_print_arg *args, *arg, **next;unsigned long long ip, val;
@@ -4434,7 +4434,7 @@ static char * get_bprint_format(void *data, int size __maybe_unused, struct tep_event *event) { -struct tep_handle *pevent = event->pevent; +struct tep_handle *pevent = event->tep;unsigned long long addr;struct tep_format_field *field;struct printk_map *printk;
@@ -4835,7 +4835,7 @@ void tep_print_field(struct trace_seq *s, void *data, {unsigned long long val;unsigned int offset, len, i; -struct tep_handle *pevent = field->event->pevent; +struct tep_handle *pevent = field->event->tep;if (field->flags &TEP_FIELD_IS_ARRAY ) { offset = field->offset;
@@ -4910,7 +4910,7 @@ void tep_print_fields(struct trace_seq *s, void *data,static void pretty_print (struct trace_seq *s,void *data,int size,struct tep_event *event) { -struct tep_handle *pevent = event->pevent; +struct tep_handle *pevent = event->tep;struct tep_print_fmt *print_fmt = &event->print_fmt;struct tep_print_arg *arg = print_fmt->args;struct tep_print_arg *args =NULL ;
@@ -5424,7 +5424,7 @@ void tep_event_info(struct trace_seq *s, struct tep_event *event, {int print_pretty =1 ; -if (event->pevent->print_raw || (event->flags &TEP_EVENT_FL_PRINTRAW )) +if (event->tep->print_raw || (event->flags &TEP_EVENT_FL_PRINTRAW ))tep_print_fields (s, record->data, record->size, event);else {
@@ -6163,7 +6163,7 @@ enum tep_errno __tep_parse_format(struct tep_event **eventp, }/* Add pevent to event so that it can be referenced */ - event->pevent = pevent; + event->tep = pevent; ret =event_read_format (event);if (ret <0 ) {
@@ -6357,8 +6357,8 @@ void *tep_get_field_raw(struct trace_seq *s, struct tep_event *event, offset = field->offset;if (field->flags &TEP_FIELD_IS_DYNAMIC ) { - offset =tep_read_number (event->pevent, - data + offset, field->size); + offset =tep_read_number (event->tep, + data + offset, field->size); *len = offset >>16 ; offset &=0xffff ; }else
@@ -6492,7 +6492,7 @@ int tep_print_func_field(struct trace_seq *s, const char *fmt, struct tep_record *record, int err) {struct tep_format_field *field =tep_find_field (event, name); -struct tep_handle *pevent = event->pevent; +struct tep_handle *pevent = event->tep;unsigned long long val;struct func_map *func;char tmp[128 ];
tools/lib/traceevent/event-parse.h +1 -1
@@ -278,7 +278,7 @@ struct tep_print_fmt { };struct tep_event { -struct tep_handle *pevent; +struct tep_handle *tep;char *name;int id;int flags;
tools/lib/traceevent/parse-filter.c +3 -3
@@ -1528,8 +1528,8 @@ get_comm(struct tep_event *event, struct tep_record *record)const char *comm;int pid; - pid =tep_data_pid (event->pevent, record); - comm =tep_data_comm_from_pid (event->pevent, pid); + pid =tep_data_pid (event->tep, record); + comm =tep_data_comm_from_pid (event->tep, pid);return comm; }
@@ -1727,7 +1727,7 @@ static const char *get_field_str(struct tep_filter_arg *arg, struct tep_record * }else { event = arg->str.field->event; - pevent = event->pevent; + pevent = event->tep; addr =get_value (event, arg->str.field, record);if (arg->str.field->flags & (TEP_FIELD_IS_POINTER |TEP_FIELD_IS_LONG ))
tools/lib/traceevent/plugin_function.c +1 -1
@@ -126,7 +126,7 @@ static int add_and_get_index(const char *parent, const char *child, int cpu)static int function_handler (struct trace_seq *s,struct tep_record *record,struct tep_event *event,void *context) { -struct tep_handle *pevent = event->pevent; +struct tep_handle *pevent = event->tep;unsigned long long function;unsigned long long pfunction;const char *func;
tools/lib/traceevent/plugin_kmem.c +2 -2
@@ -39,11 +39,11 @@ static int call_site_handler(struct trace_seq *s, struct tep_record *record,if (tep_read_number_field (field, data, &val))return 1 ; - func =tep_find_function (event->pevent, val); + func =tep_find_function (event->tep, val);if (!func)return 1 ; - addr =tep_find_function_address (event->pevent, val); + addr =tep_find_function_address (event->tep, val);trace_seq_printf (s,"(%s+0x%x) " , func, (int )(val - addr));return 1 ;
tools/lib/traceevent/plugin_kvm.c +2 -2
@@ -389,8 +389,8 @@ static int kvm_mmu_print_role(struct trace_seq *s, struct tep_record *record,* We can only use the structure if file is of the same * endianness. */ -if (tep_is_file_bigendian (event->pevent) == -tep_is_local_bigendian (event->pevent)) { +if (tep_is_file_bigendian (event->tep) == +tep_is_local_bigendian (event->tep)) { trace_seq_printf(s, "%u q%u%s %s%s %spae %snxe %swp%s%s%s", role.level,
tools/lib/traceevent/plugin_sched_switch.c +1 -1
@@ -62,7 +62,7 @@ static void write_and_save_comm(struct tep_format_field *field, comm = &s->buffer[len];/* Help out the comm to ids. This will handle dups */ -tep_register_comm (field->event->pevent, comm, pid); +tep_register_comm (field->event->tep, comm, pid); } static int sched_wakeup_handler(struct trace_seq *s,
tools/perf/builtin-kmem.c +1 -1
@@ -1975,7 +1975,7 @@ int cmd_kmem(int argc, const char **argv) goto out_delete; } - kmem_page_size =tep_get_page_size (evsel->tp_format->pevent); + kmem_page_size =tep_get_page_size (evsel->tp_format->tep); symbol_conf.use_callchain = true; }
tools/perf/util/data-convert-bt.c +2 -2
@@ -310,7 +310,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw,if (flags &TEP_FIELD_IS_DYNAMIC ) {unsigned long long tmp_val; - tmp_val =tep_read_number (fmtf->event->pevent, + tmp_val =tep_read_number (fmtf->event->tep, data + offset, len); offset = tmp_val; len = offset >>16 ;
@@ -354,7 +354,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw,unsigned long long value_int; value_int =tep_read_number ( - fmtf->event->pevent, + fmtf->event->tep, data + offset + i * len, len);if (!(flags &TEP_FIELD_IS_SIGNED ))
tools/perf/util/python.c +1 -1
@@ -342,7 +342,7 @@ static bool is_tracepoint(struct pyrf_event *pevent)static PyObject *tracepoint_field (struct pyrf_event *pe,struct tep_format_field *field) { -struct tep_handle *pevent = field->event->pevent; +struct tep_handle *pevent = field->event->tep;void *data = pe->sample.raw_data;PyObject *ret =NULL ;unsigned long long val;
tools/perf/util/scripting-engines/trace-event-perl.c +1 -1
@@ -372,7 +372,7 @@ static void perl_process_tracepoint(struct perf_sample *sample, ns = nsecs - s *NSEC_PER_SEC ; scripting_context->event_data = data; - scripting_context->pevent = evsel->tp_format->pevent; + scripting_context->pevent = evsel->tp_format->tep;ENTER ;SAVETMPS ;
tools/perf/util/scripting-engines/trace-event-python.c +1 -1
@@ -837,7 +837,7 @@ static void python_process_tracepoint(struct perf_sample *sample, ns = nsecs - s *NSEC_PER_SEC ; scripting_context->event_data = data; - scripting_context->pevent = evsel->tp_format->pevent; + scripting_context->pevent = evsel->tp_format->tep; context =_PyCapsule_New (scripting_context,NULL ,NULL );
tools/perf/util/trace-event-parse.c +1 -1
@@ -111,7 +111,7 @@ raw_field_value(struct tep_event *event, const char *name, void *data)unsigned long long read_size (struct tep_event *event,void *ptr,int size) { -return tep_read_number (event->pevent, ptr, size); +return tep_read_number (event->tep, ptr, size); } void event_format__fprintf(struct tep_event *event,
PATCH 14/15 tools/perf,tools/lib/traceevent: Rename "pevent" member of struct tep_event_filter to "tep"
In reply to Steven RostedtFrom: Tzvetomir Stoyanov <[email protected]>
The member "pevent" of the struct tep_event_filter is renamed to "tep". This makes the struct consistent with the chosen naming convention:
tep (trace event parser), instead of the old pevent.
--- tools/lib/traceevent/event-parse.h | 2 +- tools/lib/traceevent/parse-filter.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-)
tools/lib/traceevent/event-parse.h +1 -1
@@ -717,7 +717,7 @@ struct tep_filter_type {#define TEP_FILTER_ERROR_BUFSZ 1024struct tep_event_filter { -struct tep_handle *pevent; +struct tep_handle *tep;int filters;struct tep_filter_type *event_filters;char error_buffer[TEP_FILTER_ERROR_BUFSZ ];
tools/lib/traceevent/parse-filter.c +7 -7
@@ -154,7 +154,7 @@ add_filter_type(struct tep_event_filter *filter, int id) filter_type = &filter->event_filters[i]; filter_type->event_id = id; - filter_type->event =tep_find_event (filter->pevent, id); + filter_type->event =tep_find_event (filter->tep, id); filter_type->filter =NULL ; filter->filters++;
@@ -175,7 +175,7 @@ struct tep_event_filter *tep_filter_alloc(struct tep_handle *tep)return NULL ;memset (filter,0 ,sizeof (*filter)); - filter->pevent = tep; + filter->tep = tep;tep_ref (tep);return filter;
@@ -1257,7 +1257,7 @@ static void filter_init_error_buf(struct tep_event_filter *filter)enum tep_errno tep_filter_add_filter_str (struct tep_event_filter *filter,const char *filter_str) { -struct tep_handle *pevent = filter->pevent; +struct tep_handle *pevent = filter->tep;struct event_list *event;struct event_list *events =NULL ;const char *filter_start;
@@ -1377,7 +1377,7 @@ int tep_filter_strerror(struct tep_event_filter *filter, enum tep_errno err,return 0 ; } -return tep_strerror (filter->pevent, err, buf, buflen); +return tep_strerror (filter->tep, err, buf, buflen); }/**
@@ -1440,7 +1440,7 @@ void tep_filter_reset(struct tep_event_filter *filter)void tep_filter_free (struct tep_event_filter *filter) { -tep_unref (filter->pevent); +tep_unref (filter->tep);tep_filter_reset (filter);
@@ -1462,7 +1462,7 @@ static int copy_filter_type(struct tep_event_filter *filter,/* Can't assume that the pevent's are the same */ sys = filter_type->event->system; name = filter_type->event->name; - event =tep_find_event_by_name (filter->pevent, sys, name); + event =tep_find_event_by_name (filter->tep, sys, name);if (!event)return -1 ;
@@ -1872,7 +1872,7 @@ int tep_event_filtered(struct tep_event_filter *filter, int event_id)enum tep_errno tep_filter_match (struct tep_event_filter *filter,struct tep_record *record) { -struct tep_handle *pevent = filter->pevent; +struct tep_handle *pevent = filter->tep;struct tep_filter_type *filter_type;int event_id;int ret;
Signature · 1 line
2.20.1
tip-bot for Tzvetomir Stoyanov
merge bot[tip:perf/core] perf tools, tools lib traceevent: Rename "pevent" member of struct tep_event_filter to "tep"
perf tools, tools lib traceevent: Rename "pevent" member of struct tep_event_filter to "tep"
Commit-ID: 6b1f4c426a60387f1291d2ba3838c7b0914be12f Gitweb: https://git.kernel.org/tip/6b1f4c426a60387f1291d2ba3838c7b0914be12f Author: Tzvetomir Stoyanov <[email protected]> AuthorDate: Mon, 1 Apr 2019 12:43:19 -0400 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 1 Apr 2019 15:18:10 -0300
perf tools, tools lib traceevent: Rename "pevent" member of struct tep_event_filter to "tep"
The member "pevent" of the struct tep_event_filter is renamed to "tep". This makes the struct consistent with the chosen naming convention:
tep (trace event parser), instead of the old pevent.
--- tools/lib/traceevent/event-parse.h | 2 +- tools/lib/traceevent/parse-filter.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-)
tools/lib/traceevent/event-parse.h +1 -1
@@ -717,7 +717,7 @@ struct tep_filter_type {#define TEP_FILTER_ERROR_BUFSZ 1024struct tep_event_filter { -struct tep_handle *pevent; +struct tep_handle *tep;int filters;struct tep_filter_type *event_filters;char error_buffer[TEP_FILTER_ERROR_BUFSZ ];
tools/lib/traceevent/parse-filter.c +7 -7
@@ -154,7 +154,7 @@ add_filter_type(struct tep_event_filter *filter, int id) filter_type = &filter->event_filters[i]; filter_type->event_id = id; - filter_type->event =tep_find_event (filter->pevent, id); + filter_type->event =tep_find_event (filter->tep, id); filter_type->filter =NULL ; filter->filters++;
@@ -175,7 +175,7 @@ struct tep_event_filter *tep_filter_alloc(struct tep_handle *tep)return NULL ;memset (filter,0 ,sizeof (*filter)); - filter->pevent = tep; + filter->tep = tep;tep_ref (tep);return filter;
@@ -1257,7 +1257,7 @@ static void filter_init_error_buf(struct tep_event_filter *filter)enum tep_errno tep_filter_add_filter_str (struct tep_event_filter *filter,const char *filter_str) { -struct tep_handle *pevent = filter->pevent; +struct tep_handle *pevent = filter->tep;struct event_list *event;struct event_list *events =NULL ;const char *filter_start;
@@ -1377,7 +1377,7 @@ int tep_filter_strerror(struct tep_event_filter *filter, enum tep_errno err,return 0 ; } -return tep_strerror (filter->pevent, err, buf, buflen); +return tep_strerror (filter->tep, err, buf, buflen); }/**
@@ -1440,7 +1440,7 @@ void tep_filter_reset(struct tep_event_filter *filter)void tep_filter_free (struct tep_event_filter *filter) { -tep_unref (filter->pevent); +tep_unref (filter->tep);tep_filter_reset (filter);
@@ -1462,7 +1462,7 @@ static int copy_filter_type(struct tep_event_filter *filter,/* Can't assume that the pevent's are the same */ sys = filter_type->event->system; name = filter_type->event->name; - event =tep_find_event_by_name (filter->pevent, sys, name); + event =tep_find_event_by_name (filter->tep, sys, name);if (!event)return -1 ;
@@ -1872,7 +1872,7 @@ int tep_event_filtered(struct tep_event_filter *filter, int event_id)enum tep_errno tep_filter_match (struct tep_event_filter *filter,struct tep_record *record) { -struct tep_handle *pevent = filter->pevent; +struct tep_handle *pevent = filter->tep;struct tep_filter_type *filter_type;int event_id;int ret;
PATCH 15/15 tools/lib/traceevent: Rename input arguments and local variables of libtraceevent from pevent to tep
In reply to Steven RostedtFrom: Tzvetomir Stoyanov <[email protected]>
"pevent" to "tep" renaming of:
- all "pevent" input arguments of libtraceevent internal functions.
- all local "pevent" variables of libtraceevent.
This makes the implementation consistent with the chosen naming convention, tep (trace event parser), and will avoid any confusion with the old pevent name
--- tools/lib/traceevent/event-parse.c | 306 ++++++++++++------------- tools/lib/traceevent/event-plugin.c | 24 +- tools/lib/traceevent/parse-filter.c | 24 +- tools/lib/traceevent/plugin_function.c | 6 +- 4 files changed, 180 insertions(+), 180 deletions(-)
tools/lib/traceevent/event-parse.c +153 -153
@@ -148,14 +148,14 @@ struct cmdline_list {int pid; }; -static int cmdline_init (struct tep_handle *pevent) +static int cmdline_init (struct tep_handle *tep) { -struct cmdline_list *cmdlist = pevent->cmdlist; +struct cmdline_list *cmdlist = tep->cmdlist;struct cmdline_list *item;struct tep_cmdline *cmdlines;int i; - cmdlines =malloc (sizeof (*cmdlines) * pevent->cmdline_count); + cmdlines =malloc (sizeof (*cmdlines) * tep->cmdline_count);if (!cmdlines)return -1 ;
@@ -169,15 +169,15 @@ static int cmdline_init(struct tep_handle *pevent)free (item); } -qsort (cmdlines, pevent->cmdline_count,sizeof (*cmdlines), cmdline_cmp); +qsort (cmdlines, tep->cmdline_count,sizeof (*cmdlines), cmdline_cmp); - pevent->cmdlines = cmdlines; - pevent->cmdlist =NULL ; + tep->cmdlines = cmdlines; + tep->cmdlist =NULL ;return 0 ; } -static const char *find_cmdline (struct tep_handle *pevent,int pid) +static const char *find_cmdline (struct tep_handle *tep,int pid) {const struct tep_cmdline *comm;struct tep_cmdline key;
@@ -185,13 +185,13 @@ static const char *find_cmdline(struct tep_handle *pevent, int pid)if (!pid)return "<idle>" ; -if (!pevent->cmdlines &&cmdline_init (pevent)) +if (!tep->cmdlines &&cmdline_init (tep))return "<not enough memory for cmdlines!>" ; key.pid = pid; - comm =bsearch (&key, pevent->cmdlines, pevent->cmdline_count, -sizeof (*pevent->cmdlines), cmdline_cmp); + comm =bsearch (&key, tep->cmdlines, tep->cmdline_count, +sizeof (*tep->cmdlines), cmdline_cmp);if (comm)return comm->comm;
@@ -232,10 +232,10 @@ bool tep_is_pid_registered(struct tep_handle *tep, int pid)* we must add this pid. This is much slower than when cmdlines * are added before the array is initialized. */ -static int add_new_comm (struct tep_handle *pevent, +static int add_new_comm (struct tep_handle *tep,const char *comm,int pid,bool override) { -struct tep_cmdline *cmdlines = pevent->cmdlines; +struct tep_cmdline *cmdlines = tep->cmdlines;struct tep_cmdline *cmdline;struct tep_cmdline key;char *new_comm;
@@ -246,8 +246,8 @@ static int add_new_comm(struct tep_handle *pevent,/* avoid duplicates */ key.pid = pid; - cmdline =bsearch (&key, pevent->cmdlines, pevent->cmdline_count, -sizeof (*pevent->cmdlines), cmdline_cmp); + cmdline =bsearch (&key, tep->cmdlines, tep->cmdline_count, +sizeof (*tep->cmdlines), cmdline_cmp);if (cmdline) {if (!override) { errno =EEXIST ;
@@ -264,26 +264,26 @@ static int add_new_comm(struct tep_handle *pevent,return 0 ; } - cmdlines =realloc (cmdlines,sizeof (*cmdlines) * (pevent->cmdline_count +1 )); + cmdlines =realloc (cmdlines,sizeof (*cmdlines) * (tep->cmdline_count +1 ));if (!cmdlines) { errno =ENOMEM ;return -1 ; } - cmdlines[pevent->cmdline_count].comm =strdup (comm); -if (!cmdlines[pevent->cmdline_count].comm) { + cmdlines[tep->cmdline_count].comm =strdup (comm); +if (!cmdlines[tep->cmdline_count].comm) {free (cmdlines); errno =ENOMEM ;return -1 ; } - cmdlines[pevent->cmdline_count].pid = pid; + cmdlines[tep->cmdline_count].pid = pid; -if (cmdlines[pevent->cmdline_count].comm) - pevent->cmdline_count++; +if (cmdlines[tep->cmdline_count].comm) + tep->cmdline_count++; -qsort (cmdlines, pevent->cmdline_count,sizeof (*cmdlines), cmdline_cmp); - pevent->cmdlines = cmdlines; +qsort (cmdlines, tep->cmdline_count,sizeof (*cmdlines), cmdline_cmp); + tep->cmdlines = cmdlines;return 0 ; }
@@ -408,18 +408,18 @@ static int func_bcmp(const void *a, const void *b)return 1 ; } -static int func_map_init (struct tep_handle *pevent) +static int func_map_init (struct tep_handle *tep) {struct func_list *funclist;struct func_list *item;struct func_map *func_map;int i; - func_map =malloc (sizeof (*func_map) * (pevent->func_count +1 )); + func_map =malloc (sizeof (*func_map) * (tep->func_count +1 ));if (!func_map)return -1 ; - funclist = pevent->funclist; + funclist = tep->funclist; i =0 ;while (funclist) {
@@ -432,34 +432,34 @@ static int func_map_init(struct tep_handle *pevent)free (item); } -qsort (func_map, pevent->func_count,sizeof (*func_map), func_cmp); +qsort (func_map, tep->func_count,sizeof (*func_map), func_cmp);/* * Add a special record at the end. */ - func_map[pevent->func_count].func =NULL ; - func_map[pevent->func_count].addr =0 ; - func_map[pevent->func_count].mod =NULL ; + func_map[tep->func_count].func =NULL ; + func_map[tep->func_count].addr =0 ; + func_map[tep->func_count].mod =NULL ; - pevent->func_map = func_map; - pevent->funclist =NULL ; + tep->func_map = func_map; + tep->funclist =NULL ;return 0 ; }static struct func_map * -__find_func (struct tep_handle *pevent,unsigned long long addr) +__find_func (struct tep_handle *tep,unsigned long long addr) {struct func_map *func;struct func_map key; -if (!pevent->func_map) -func_map_init (pevent); +if (!tep->func_map) +func_map_init (tep); key.addr = addr; - func =bsearch (&key, pevent->func_map, pevent->func_count, -sizeof (*pevent->func_map), func_bcmp); + func =bsearch (&key, tep->func_map, tep->func_count, +sizeof (*tep->func_map), func_bcmp);return func; }
@@ -510,18 +510,18 @@ void tep_reset_function_resolver(struct tep_handle *tep) }static struct func_map * -find_func (struct tep_handle *pevent,unsigned long long addr) +find_func (struct tep_handle *tep,unsigned long long addr) {struct func_map *map; -if (!pevent->func_resolver) -return __find_func (pevent, addr); +if (!tep->func_resolver) +return __find_func (tep, addr); - map = &pevent->func_resolver->map; + map = &tep->func_resolver->map; map->mod =NULL ; map->addr = addr; - map->func = pevent->func_resolver->func (pevent->func_resolver->priv, - &map->addr, &map->mod); + map->func = tep->func_resolver->func (tep->func_resolver->priv, + &map->addr, &map->mod);if (map->func ==NULL )return NULL ;
@@ -662,18 +662,18 @@ static int printk_cmp(const void *a, const void *b)return 0 ; } -static int printk_map_init (struct tep_handle *pevent) +static int printk_map_init (struct tep_handle *tep) {struct printk_list *printklist;struct printk_list *item;struct printk_map *printk_map;int i; - printk_map =malloc (sizeof (*printk_map) * (pevent->printk_count +1 )); + printk_map =malloc (sizeof (*printk_map) * (tep->printk_count +1 ));if (!printk_map)return -1 ; - printklist = pevent->printklist; + printklist = tep->printklist; i =0 ;while (printklist) {
@@ -685,27 +685,27 @@ static int printk_map_init(struct tep_handle *pevent)free (item); } -qsort (printk_map, pevent->printk_count,sizeof (*printk_map), printk_cmp); +qsort (printk_map, tep->printk_count,sizeof (*printk_map), printk_cmp); - pevent->printk_map = printk_map; - pevent->printklist =NULL ; + tep->printk_map = printk_map; + tep->printklist =NULL ;return 0 ; }static struct printk_map * -find_printk (struct tep_handle *pevent,unsigned long long addr) +find_printk (struct tep_handle *tep,unsigned long long addr) {struct printk_map *printk;struct printk_map key; -if (!pevent->printk_map &&printk_map_init (pevent)) +if (!tep->printk_map &&printk_map_init (tep))return NULL ; key.addr = addr; - printk =bsearch (&key, pevent->printk_map, pevent->printk_count, -sizeof (*pevent->printk_map), printk_cmp); + printk =bsearch (&key, tep->printk_map, tep->printk_count, +sizeof (*tep->printk_map), printk_cmp);return printk; }
@@ -782,29 +782,29 @@ static struct tep_event *alloc_event(void)return calloc (1 ,sizeof (struct tep_event )); } -static int add_event (struct tep_handle *pevent,struct tep_event *event) +static int add_event (struct tep_handle *tep,struct tep_event *event) {int i; -struct tep_event **events =realloc (pevent->events,sizeof (event) * - (pevent->nr_events +1 )); +struct tep_event **events =realloc (tep->events,sizeof (event) * + (tep->nr_events +1 ));if (!events)return -1 ; - pevent->events = events; + tep->events = events; -for (i =0 ; i < pevent->nr_events; i++) { -if (pevent->events[i]->id > event->id) +for (i =0 ; i < tep->nr_events; i++) { +if (tep->events[i]->id > event->id)break ; } -if (i < pevent->nr_events) -memmove (&pevent->events[i +1 ], - &pevent->events[i], -sizeof (event) * (pevent->nr_events - i)); +if (i < tep->nr_events) +memmove (&tep->events[i +1 ], + &tep->events[i], +sizeof (event) * (tep->nr_events - i)); - pevent->events[i] = event; - pevent->nr_events++; + tep->events[i] = event; + tep->nr_events++; - event->tep = pevent; + event->tep = tep;return 0 ; }
@@ -2941,14 +2941,14 @@ process_bitmask(struct tep_event *event __maybe_unused, struct tep_print_arg *ar }static struct tep_function_handler * -find_func_handler (struct tep_handle *pevent,char *func_name) +find_func_handler (struct tep_handle *tep,char *func_name) {struct tep_function_handler *func; -if (!pevent) +if (!tep)return NULL ; -for (func = pevent->func_handlers; func; func = func->next) { +for (func = tep->func_handlers; func; func = func->next) {if (strcmp (func->name, func_name) ==0 )break ; }
@@ -2956,12 +2956,12 @@ find_func_handler(struct tep_handle *pevent, char *func_name)return func; } -static void remove_func_handler (struct tep_handle *pevent,char *func_name) +static void remove_func_handler (struct tep_handle *tep,char *func_name) {struct tep_function_handler *func;struct tep_function_handler **next; - next = &pevent->func_handlers; + next = &tep->func_handlers;while ((func = *next)) {if (strcmp (func->name, func_name) ==0 ) { *next = func->next;
@@ -3413,7 +3413,7 @@ int tep_read_number_field(struct tep_format_field *field, const void *data, } } -static int get_common_info (struct tep_handle *pevent, +static int get_common_info (struct tep_handle *tep,const char *type,int *offset,int *size) {struct tep_event *event;
@@ -3423,12 +3423,12 @@ static int get_common_info(struct tep_handle *pevent,* All events should have the same common elements. * Pick any event to find where the type is; */ -if (!pevent->events) { +if (!tep->events) {do_warning ("no event_list!" );return -1 ; } - event = pevent->events[0 ]; + event = tep->events[0 ]; field =tep_find_common_field (event, type);if (!field)return -1 ;
@@ -3439,58 +3439,58 @@ static int get_common_info(struct tep_handle *pevent,return 0 ; } -static int __parse_common (struct tep_handle *pevent,void *data, +static int __parse_common (struct tep_handle *tep,void *data,int *size,int *offset,const char *name) {int ret;if (!*size) { - ret =get_common_info (pevent, name, offset, size); + ret =get_common_info (tep, name, offset, size);if (ret <0 )return ret; } -return tep_read_number (pevent, data + *offset, *size); +return tep_read_number (tep, data + *offset, *size); } -static int trace_parse_common_type (struct tep_handle *pevent,void *data) +static int trace_parse_common_type (struct tep_handle *tep,void *data) { -return __parse_common (pevent, data, - &pevent->type_size, &pevent->type_offset, +return __parse_common (tep, data, + &tep->type_size, &tep->type_offset,"common_type" ); } -static int parse_common_pid (struct tep_handle *pevent,void *data) +static int parse_common_pid (struct tep_handle *tep,void *data) { -return __parse_common (pevent, data, - &pevent->pid_size, &pevent->pid_offset, +return __parse_common (tep, data, + &tep->pid_size, &tep->pid_offset,"common_pid" ); } -static int parse_common_pc (struct tep_handle *pevent,void *data) +static int parse_common_pc (struct tep_handle *tep,void *data) { -return __parse_common (pevent, data, - &pevent->pc_size, &pevent->pc_offset, +return __parse_common (tep, data, + &tep->pc_size, &tep->pc_offset,"common_preempt_count" ); } -static int parse_common_flags (struct tep_handle *pevent,void *data) +static int parse_common_flags (struct tep_handle *tep,void *data) { -return __parse_common (pevent, data, - &pevent->flags_size, &pevent->flags_offset, +return __parse_common (tep, data, + &tep->flags_size, &tep->flags_offset,"common_flags" ); } -static int parse_common_lock_depth (struct tep_handle *pevent,void *data) +static int parse_common_lock_depth (struct tep_handle *tep,void *data) { -return __parse_common (pevent, data, - &pevent->ld_size, &pevent->ld_offset, +return __parse_common (tep, data, + &tep->ld_size, &tep->ld_offset,"common_lock_depth" ); } -static int parse_common_migrate_disable (struct tep_handle *pevent,void *data) +static int parse_common_migrate_disable (struct tep_handle *tep,void *data) { -return __parse_common (pevent, data, - &pevent->ld_size, &pevent->ld_offset, +return __parse_common (tep, data, + &tep->ld_size, &tep->ld_offset,"common_migrate_disable" ); }
@@ -3566,7 +3566,7 @@ tep_find_event_by_name(struct tep_handle *tep,static unsigned long long eval_num_arg (void *data,int size,struct tep_event *event,struct tep_print_arg *arg) { -struct tep_handle *pevent = event->tep; +struct tep_handle *tep = event->tep;unsigned long long val =0 ;unsigned long long left, right;struct tep_print_arg *typearg =NULL ;
@@ -3588,7 +3588,7 @@ eval_num_arg(void *data, int size, struct tep_event *event, struct tep_print_arg }/* must be a number */ - val =tep_read_number (pevent, data + arg->field.field->offset, + val =tep_read_number (tep, data + arg->field.field->offset, arg->field.field->size);break ;case TEP_PRINT_FLAGS :
@@ -3628,11 +3628,11 @@ eval_num_arg(void *data, int size, struct tep_event *event, struct tep_print_arg }/* Default to long size */ - field_size = pevent->long_size; + field_size = tep->long_size;switch (larg->type) {case TEP_PRINT_DYNAMIC_ARRAY : - offset =tep_read_number (pevent, + offset =tep_read_number (tep, data + larg->dynarray.field->offset, larg->dynarray.field->size);if (larg->dynarray.field->elementsize)
@@ -3661,7 +3661,7 @@ eval_num_arg(void *data, int size, struct tep_event *event, struct tep_print_argdefault : goto default_op;/* oops, all bets off */ } - val =tep_read_number (pevent, + val =tep_read_number (tep, data + offset, field_size);if (typearg) val =eval_type (val, typearg,1 );
@@ -3762,7 +3762,7 @@ eval_num_arg(void *data, int size, struct tep_event *event, struct tep_print_arg }break ;case TEP_PRINT_DYNAMIC_ARRAY_LEN : - offset =tep_read_number (pevent, + offset =tep_read_number (tep, data + arg->dynarray.field->offset, arg->dynarray.field->size);/*
@@ -3774,7 +3774,7 @@ eval_num_arg(void *data, int size, struct tep_event *event, struct tep_print_argbreak ;case TEP_PRINT_DYNAMIC_ARRAY :/* Without [], we pass the address to the dynamic data */ - offset =tep_read_number (pevent, + offset =tep_read_number (tep, data + arg->dynarray.field->offset, arg->dynarray.field->size);/*
@@ -3849,7 +3849,7 @@ static void print_str_to_seq(struct trace_seq *s, const char *format,trace_seq_printf (s, format, str); } -static void print_bitmask_to_seq (struct tep_handle *pevent, +static void print_bitmask_to_seq (struct tep_handle *tep,struct trace_seq *s,const char *format,int len_arg,const void *data,int size) {
@@ -3881,7 +3881,7 @@ static void print_bitmask_to_seq(struct tep_handle *pevent,* In the kernel, this is an array of long words, thus * endianness is very important. */ -if (pevent->file_bigendian) +if (tep->file_bigendian) index = size - (len +1 );else index = len;
@@ -3907,7 +3907,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, struct tep_event *event, const char *format, int len_arg, struct tep_print_arg *arg) { - struct tep_handle *pevent = event->tep; + struct tep_handle *tep = event->tep;struct tep_print_flag_sym *flag;struct tep_format_field *field;struct printk_map *printk;
@@ -3944,7 +3944,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,* is a pointer. */ if (!(field->flags &TEP_FIELD_IS_ARRAY ) && - field->size == pevent->long_size) { + field->size == tep->long_size) {/* Handle heterogeneous recording and processing * architectures
@@ -3959,12 +3959,12 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,* on 32-bit devices: * In this case, 64 bits must be read. */ - addr = (pevent->long_size ==8 ) ? + addr = (tep->long_size ==8 ) ? *(unsigned long long *)(data + field->offset) : (unsigned long long )*(unsigned int *)(data + field->offset);/* Check if it matches a print format */ - printk =find_printk (pevent, addr); + printk =find_printk (tep, addr);if (printk)trace_seq_puts (s, printk->printk);else
@@ -4021,7 +4021,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,case TEP_PRINT_HEX_STR :if (arg->hex.field->type ==TEP_PRINT_DYNAMIC_ARRAY ) {unsigned long offset; - offset =tep_read_number (pevent, + offset =tep_read_number (tep, data + arg->hex.field->dynarray.field->offset, arg->hex.field->dynarray.field->size); hex = data + (offset &0xffff );
@@ -4052,7 +4052,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,unsigned long offset;struct tep_format_field *field = arg->int_array.field->dynarray.field; - offset =tep_read_number (pevent, + offset =tep_read_number (tep, data + field->offset, field->size); num = data + (offset &0xffff );
@@ -4103,7 +4103,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, f =tep_find_any_field (event, arg->string.string); arg->string.offset = f->offset; } - str_offset =tep_data2host4 (pevent, *(unsigned int *)(data + arg->string.offset)); + str_offset =tep_data2host4 (tep, *(unsigned int *)(data + arg->string.offset)); str_offset &=0xffff ;print_str_to_seq (s, format, len_arg, ((char *)data) + str_offset);break ;
@@ -4121,10 +4121,10 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, f =tep_find_any_field (event, arg->bitmask.bitmask); arg->bitmask.offset = f->offset; } - bitmask_offset =tep_data2host4 (pevent, *(unsigned int *)(data + arg->bitmask.offset)); + bitmask_offset =tep_data2host4 (tep, *(unsigned int *)(data + arg->bitmask.offset)); bitmask_size = bitmask_offset >>16 ; bitmask_offset &=0xffff ; -print_bitmask_to_seq (pevent, s, format, len_arg, +print_bitmask_to_seq (tep, s, format, len_arg, data + bitmask_offset, bitmask_size);break ; }
@@ -4256,7 +4256,7 @@ static void free_args(struct tep_print_arg *args)static struct tep_print_arg *make_bprint_args (char *fmt,void *data,int size,struct tep_event *event) { -struct tep_handle *pevent = event->tep; +struct tep_handle *tep = event->tep;struct tep_format_field *field, *ip_field;struct tep_print_arg *args, *arg, **next;unsigned long long ip, val;
@@ -4264,8 +4264,8 @@ static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, svoid *bptr;int vsize =0 ; - field = pevent->bprint_buf_field; - ip_field = pevent->bprint_ip_field; + field = tep->bprint_buf_field; + ip_field = tep->bprint_ip_field;if (!field) { field =tep_find_field (event,"buf" );
@@ -4278,11 +4278,11 @@ static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, sdo_warning_event (event,"can't find ip field for binary printk" );return NULL ; } - pevent->bprint_buf_field = field; - pevent->bprint_ip_field = ip_field; + tep->bprint_buf_field = field; + tep->bprint_ip_field = ip_field; } - ip =tep_read_number (pevent, data + ip_field->offset, ip_field->size); + ip =tep_read_number (tep, data + ip_field->offset, ip_field->size);/* * The first arg is the IP pointer.
@@ -4360,7 +4360,7 @@ static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, s vsize =4 ;break ;case 1 : - vsize = pevent->long_size; + vsize = tep->long_size;break ;case 2 : vsize =8 ;
@@ -4377,7 +4377,7 @@ static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, s/* the pointers are always 4 bytes aligned */ bptr = (void *)(((unsigned long )bptr +3 ) & ~3 ); - val =tep_read_number (pevent, bptr, vsize); + val =tep_read_number (tep, bptr, vsize); bptr += vsize; arg =alloc_arg ();if (!arg) {
@@ -4434,13 +4434,13 @@ static char * get_bprint_format(void *data, int size __maybe_unused, struct tep_event *event) { -struct tep_handle *pevent = event->tep; +struct tep_handle *tep = event->tep;unsigned long long addr;struct tep_format_field *field;struct printk_map *printk;char *format; - field = pevent->bprint_fmt_field; + field = tep->bprint_fmt_field;if (!field) { field =tep_find_field (event,"fmt" );
@@ -4448,12 +4448,12 @@ get_bprint_format(void *data, int size __maybe_unused,do_warning_event (event,"can't find format field for binary printk" );return NULL ; } - pevent->bprint_fmt_field = field; + tep->bprint_fmt_field = field; } - addr =tep_read_number (pevent, data + field->offset, field->size); + addr =tep_read_number (tep, data + field->offset, field->size); - printk =find_printk (pevent, addr); + printk =find_printk (tep, addr);if (!printk) {if (asprintf (&format,"%%pf: (NO FORMAT FOUND at %llx)\n" , addr) <0 )return NULL ;
@@ -4835,13 +4835,13 @@ void tep_print_field(struct trace_seq *s, void *data, {unsigned long long val;unsigned int offset, len, i; -struct tep_handle *pevent = field->event->tep; +struct tep_handle *tep = field->event->tep;if (field->flags &TEP_FIELD_IS_ARRAY ) { offset = field->offset; len = field->size;if (field->flags &TEP_FIELD_IS_DYNAMIC ) { - val =tep_read_number (pevent, data + offset, len); + val =tep_read_number (tep, data + offset, len); offset = val; len = offset >>16 ; offset &=0xffff ;
@@ -4861,7 +4861,7 @@ void tep_print_field(struct trace_seq *s, void *data, field->flags &= ~TEP_FIELD_IS_STRING ; } }else { - val =tep_read_number (pevent, data + field->offset, + val =tep_read_number (tep, data + field->offset, field->size);if (field->flags &TEP_FIELD_IS_POINTER ) {trace_seq_printf (s,"0x%llx" , val);
@@ -4910,7 +4910,7 @@ void tep_print_fields(struct trace_seq *s, void *data,static void pretty_print (struct trace_seq *s,void *data,int size,struct tep_event *event) { -struct tep_handle *pevent = event->tep; +struct tep_handle *tep = event->tep;struct tep_print_fmt *print_fmt = &event->print_fmt;struct tep_print_arg *arg = print_fmt->args;struct tep_print_arg *args =NULL ;
@@ -5002,7 +5002,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_ecase '-' : goto cont_process;case 'p' : -if (pevent->long_size ==4 ) +if (tep->long_size ==4 ) ls =1 ;else ls =2 ;
@@ -5063,7 +5063,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_e arg = arg->next;if (show_func) { - func =find_func (pevent, val); + func =find_func (tep, val);if (func) {trace_seq_puts (s, func->func);if (show_func =='F' )
@@ -5073,7 +5073,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_ebreak ; } } -if (pevent->long_size ==8 && ls ==1 && +if (tep->long_size ==8 && ls ==1 &&sizeof (long ) !=8 ) {char *p;
@@ -5320,14 +5320,14 @@ const char *tep_data_comm_from_pid(struct tep_handle *tep, int pid) }static struct tep_cmdline * -pid_from_cmdlist (struct tep_handle *pevent,const char *comm,struct tep_cmdline *next) +pid_from_cmdlist (struct tep_handle *tep,const char *comm,struct tep_cmdline *next) {struct cmdline_list *cmdlist = (struct cmdline_list *)next;if (cmdlist) cmdlist = cmdlist->next;else - cmdlist = pevent->cmdlist; + cmdlist = tep->cmdlist;while (cmdlist &&strcmp (cmdlist->comm, comm) !=0 ) cmdlist = cmdlist->next;
@@ -6078,11 +6078,11 @@ static void free_handler(struct event_handler *handle)free (handle); } -static int find_event_handle (struct tep_handle *pevent,struct tep_event *event) +static int find_event_handle (struct tep_handle *tep,struct tep_event *event) {struct event_handler *handle, **next; -for (next = &pevent->handlers; *next; +for (next = &tep->handlers; *next; next = &(*next)->next) { handle = *next; if (event_matches(event, handle->id,
@@ -6120,7 +6120,7 @@ static int find_event_handle(struct tep_handle *pevent, struct tep_event *event)* /sys/kernel/debug/tracing/events/.../.../format */ enum tep_errno __tep_parse_format (struct tep_event **eventp, -struct tep_handle *pevent,const char *buf, +struct tep_handle *tep,const char *buf,unsigned long size,const char *sys) {struct tep_event *event;
@@ -6162,8 +6162,8 @@ enum tep_errno __tep_parse_format(struct tep_event **eventp, goto event_alloc_failed; } -/* Add pevent to event so that it can be referenced */ - event->tep = pevent; +/* Add tep to event so that it can be referenced */ + event->tep = tep; ret =event_read_format (event);if (ret <0 ) {
@@ -6175,7 +6175,7 @@ enum tep_errno __tep_parse_format(struct tep_event **eventp,* If the event has an override, don't print warnings if the event * print format fails to parse. */ -if (pevent &&find_event_handle (pevent, event)) +if (tep &&find_event_handle (tep, event)) show_warning =0 ; ret =event_read_print (event);
@@ -6227,18 +6227,18 @@ enum tep_errno __tep_parse_format(struct tep_event **eventp, }static enum tep_errno -__parse_event (struct tep_handle *pevent, +__parse_event (struct tep_handle *tep,struct tep_event **eventp,const char *buf,unsigned long size,const char *sys) { -int ret =__tep_parse_format (eventp, pevent, buf, size, sys); +int ret =__tep_parse_format (eventp, tep, buf, size, sys);struct tep_event *event = *eventp;if (event ==NULL )return ret; -if (pevent &&add_event (pevent, event)) { +if (tep &&add_event (tep, event)) { ret =TEP_ERRNO__MEM_ALLOC_FAILED ; goto event_add_failed; }
@@ -6492,7 +6492,7 @@ int tep_print_func_field(struct trace_seq *s, const char *fmt, struct tep_record *record, int err) {struct tep_format_field *field =tep_find_field (event, name); -struct tep_handle *pevent = event->tep; +struct tep_handle *tep = event->tep;unsigned long long val;struct func_map *func;char tmp[128 ];
@@ -6503,7 +6503,7 @@ int tep_print_func_field(struct trace_seq *s, const char *fmt,if (tep_read_number_field (field, record->data, &val)) goto failed; - func =find_func (pevent, val); + func =find_func (tep, val);if (func)snprintf (tmp,128 ,"%s/0x%llx" , func->func, func->addr - val);
@@ -6648,7 +6648,7 @@ int tep_unregister_print_function(struct tep_handle *tep,return -1 ; } -static struct tep_event *search_event (struct tep_handle *pevent,int id, +static struct tep_event *search_event (struct tep_handle *tep,int id,const char *sys_name,const char *event_name) {
@@ -6656,7 +6656,7 @@ static struct tep_event *search_event(struct tep_handle *pevent, int id,if (id >=0 ) {/* search by id */ - event =tep_find_event (pevent, id); + event =tep_find_event (tep, id);if (!event)return NULL ;if (event_name && (strcmp (event_name, event->name) !=0 ))
@@ -6664,7 +6664,7 @@ static struct tep_event *search_event(struct tep_handle *pevent, int id,if (sys_name && (strcmp (sys_name, event->system) !=0 ))return NULL ; }else { - event =tep_find_event_by_name (pevent, sys_name, event_name); + event =tep_find_event_by_name (tep, sys_name, event_name);if (!event)return NULL ; }
@@ -6821,14 +6821,14 @@ int tep_unregister_event_handler(struct tep_handle *tep, int id,*/ struct tep_handle *tep_alloc (void ) { -struct tep_handle *pevent =calloc (1 ,sizeof (*pevent)); +struct tep_handle *tep =calloc (1 ,sizeof (*tep)); -if (pevent) { - pevent->ref_count =1 ; - pevent->host_bigendian =tep_is_bigendian (); +if (tep) { + tep->ref_count =1 ; + tep->host_bigendian =tep_is_bigendian (); } -return pevent; +return tep; }void tep_ref (struct tep_handle *tep)
tools/lib/traceevent/event-plugin.c +12 -12
@@ -269,7 +269,7 @@ void tep_print_plugins(struct trace_seq *s, }static void -load_plugin (struct tep_handle *pevent,const char *path, +load_plugin (struct tep_handle *tep,const char *path,const char *file,void *data) {struct tep_plugin_list **plugin_list = data;
@@ -316,7 +316,7 @@ load_plugin(struct tep_handle *pevent, const char *path, *plugin_list = list;pr_stat ("registering plugin: %s" , plugin); -func (pevent); +func (tep);return ; out_free:
@@ -324,9 +324,9 @@ load_plugin(struct tep_handle *pevent, const char *path, } static void -load_plugins_dir(struct tep_handle *pevent, const char *suffix, +load_plugins_dir(struct tep_handle *tep, const char *suffix, const char *path, - void (*load_plugin)(struct tep_handle *pevent, + void (*load_plugin)(struct tep_handle *tep, const char *path, const char *name, void *data),
@@ -359,15 +359,15 @@ load_plugins_dir(struct tep_handle *pevent, const char *suffix,if (strcmp (name + (strlen (name) -strlen (suffix)), suffix) !=0 )continue ; -load_plugin (pevent, path, name, data); +load_plugin (tep, path, name, data); }closedir (dir); } static void -load_plugins(struct tep_handle *pevent, const char *suffix, - void (*load_plugin)(struct tep_handle *pevent, +load_plugins(struct tep_handle *tep, const char *suffix, + void (*load_plugin)(struct tep_handle *tep, const char *path, const char *name, void *data),
@@ -378,7 +378,7 @@ load_plugins(struct tep_handle *pevent, const char *suffix,char *envdir;int ret; -if (pevent->flags &TEP_DISABLE_PLUGINS ) +if (tep->flags &TEP_DISABLE_PLUGINS )return ;/*
@@ -386,8 +386,8 @@ load_plugins(struct tep_handle *pevent, const char *suffix,* check that first. */ #ifdef PLUGIN_DIR -if (!(pevent->flags &TEP_DISABLE_SYS_PLUGINS )) -load_plugins_dir (pevent, suffix,PLUGIN_DIR , +if (!(tep->flags &TEP_DISABLE_SYS_PLUGINS )) +load_plugins_dir (tep, suffix,PLUGIN_DIR , load_plugin, data);#endif
@@ -397,7 +397,7 @@ load_plugins(struct tep_handle *pevent, const char *suffix,*/ envdir =getenv ("TRACEEVENT_PLUGIN_DIR" );if (envdir) -load_plugins_dir (pevent, suffix, envdir, load_plugin, data); +load_plugins_dir (tep, suffix, envdir, load_plugin, data);/* * Now let the home directory override the environment
@@ -413,7 +413,7 @@ load_plugins(struct tep_handle *pevent, const char *suffix,return ; } -load_plugins_dir (pevent, suffix, path, load_plugin, data); +load_plugins_dir (tep, suffix, path, load_plugin, data);free (path); }
tools/lib/traceevent/parse-filter.c +12 -12
@@ -256,7 +256,7 @@ static int event_match(struct tep_event *event, }static enum tep_errno -find_event (struct tep_handle *pevent,struct event_list **events, +find_event (struct tep_handle *tep,struct event_list **events,char *sys_name,char *event_name) {struct tep_event *event;
@@ -299,8 +299,8 @@ find_event(struct tep_handle *pevent, struct event_list **events, } } -for (i =0 ; i < pevent->nr_events; i++) { - event = pevent->events[i]; +for (i =0 ; i < tep->nr_events; i++) { + event = tep->events[i];if (event_match (event, sys_name ? &sreg :NULL , &ereg)) { match =1 ;if (add_event (events, event) <0 ) {
@@ -1257,7 +1257,7 @@ static void filter_init_error_buf(struct tep_event_filter *filter)enum tep_errno tep_filter_add_filter_str (struct tep_event_filter *filter,const char *filter_str) { -struct tep_handle *pevent = filter->tep; +struct tep_handle *tep = filter->tep;struct event_list *event;struct event_list *events =NULL ;const char *filter_start;
@@ -1313,7 +1313,7 @@ enum tep_errno tep_filter_add_filter_str(struct tep_event_filter *filter, }/* Find this event */ - ret =find_event (pevent, &events,strim (sys_name),strim (event_name)); + ret =find_event (tep, &events,strim (sys_name),strim (event_name));if (ret <0 ) {free_events (events);free (this_event);
@@ -1334,7 +1334,7 @@ enum tep_errno tep_filter_add_filter_str(struct tep_event_filter *filter,if (ret <0 ) rtn = ret; -if (ret >=0 && pevent->test_filters) { +if (ret >=0 && tep->test_filters) {char *test; test =tep_filter_make_string (filter, event->event->id);if (test) {
@@ -1459,7 +1459,7 @@ static int copy_filter_type(struct tep_event_filter *filter,const char *name;char *str; -/* Can't assume that the pevent's are the same */ +/* Can't assume that the tep's are the same */ sys = filter_type->event->system; name = filter_type->event->name; event =tep_find_event_by_name (filter->tep, sys, name);
@@ -1697,7 +1697,7 @@ static int test_num(struct tep_event *event, struct tep_filter_arg *arg,static const char *get_field_str (struct tep_filter_arg *arg,struct tep_record *record) {struct tep_event *event; -struct tep_handle *pevent; +struct tep_handle *tep;unsigned long long addr;const char *val =NULL ;unsigned int size;
@@ -1727,12 +1727,12 @@ static const char *get_field_str(struct tep_filter_arg *arg, struct tep_record * }else { event = arg->str.field->event; - pevent = event->tep; + tep = event->tep; addr =get_value (event, arg->str.field, record);if (arg->str.field->flags & (TEP_FIELD_IS_POINTER |TEP_FIELD_IS_LONG ))/* convert to a kernel symbol */ - val =tep_find_function (pevent, addr); + val =tep_find_function (tep, addr);if (val ==NULL ) {/* just use the hex of the string name */
@@ -1872,7 +1872,7 @@ int tep_event_filtered(struct tep_event_filter *filter, int event_id)enum tep_errno tep_filter_match (struct tep_event_filter *filter,struct tep_record *record) { -struct tep_handle *pevent = filter->tep; +struct tep_handle *tep = filter->tep;struct tep_filter_type *filter_type;int event_id;int ret;
@@ -1883,7 +1883,7 @@ enum tep_errno tep_filter_match(struct tep_event_filter *filter,if (!filter->filters)return TEP_ERRNO__NO_FILTER ; - event_id =tep_data_type (pevent, record); + event_id =tep_data_type (tep, record); filter_type =find_filter_type (filter, event_id);if (!filter_type)
tools/lib/traceevent/plugin_function.c +3 -3
@@ -126,7 +126,7 @@ static int add_and_get_index(const char *parent, const char *child, int cpu)static int function_handler (struct trace_seq *s,struct tep_record *record,struct tep_event *event,void *context) { -struct tep_handle *pevent = event->tep; +struct tep_handle *tep = event->tep;unsigned long long function;unsigned long long pfunction;const char *func;
@@ -136,12 +136,12 @@ static int function_handler(struct trace_seq *s, struct tep_record *record,if (tep_get_field_val (s, event,"ip" , record, &function,1 ))return trace_seq_putc (s,'!' ); - func =tep_find_function (pevent, function); + func =tep_find_function (tep, function);if (tep_get_field_val (s, event,"parent_ip" , record, &pfunction,1 ))return trace_seq_putc (s,'!' ); - parent =tep_find_function (pevent, pfunction); + parent =tep_find_function (tep, pfunction);if (parent && ftrace_indent->set) index =add_and_get_index (parent, func, record->cpu);
Signature · 1 line
2.20.1
tip-bot for Tzvetomir Stoyanov
merge bot[tip:perf/core] tools lib traceevent: Rename input arguments and local variables of libtraceevent from pevent to tep
tools lib traceevent: Rename input arguments and local variables of libtraceevent from pevent to tep
Commit-ID: c9bd7796959a8b92afe79c392dd54992bfc67328 Gitweb: https://git.kernel.org/tip/c9bd7796959a8b92afe79c392dd54992bfc67328 Author: Tzvetomir Stoyanov <[email protected]> AuthorDate: Mon, 1 Apr 2019 12:43:20 -0400 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 1 Apr 2019 15:18:10 -0300
tools lib traceevent: Rename input arguments and local variables of libtraceevent from pevent to tep
"pevent" to "tep" renaming of:
- all "pevent" input arguments of libtraceevent internal functions.
- all local "pevent" variables of libtraceevent.
This makes the implementation consistent with the chosen naming convention, tep (trace event parser), and will avoid any confusion with the old pevent name
--- tools/lib/traceevent/event-parse.c | 306 ++++++++++++++++----------------- tools/lib/traceevent/event-plugin.c | 24 +-- tools/lib/traceevent/parse-filter.c | 24 +-- tools/lib/traceevent/plugin_function.c | 6 +- 4 files changed, 180 insertions(+), 180 deletions(-)
tools/lib/traceevent/event-parse.c +153 -153
@@ -148,14 +148,14 @@ struct cmdline_list {int pid; }; -static int cmdline_init (struct tep_handle *pevent) +static int cmdline_init (struct tep_handle *tep) { -struct cmdline_list *cmdlist = pevent->cmdlist; +struct cmdline_list *cmdlist = tep->cmdlist;struct cmdline_list *item;struct tep_cmdline *cmdlines;int i; - cmdlines =malloc (sizeof (*cmdlines) * pevent->cmdline_count); + cmdlines =malloc (sizeof (*cmdlines) * tep->cmdline_count);if (!cmdlines)return -1 ;
@@ -169,15 +169,15 @@ static int cmdline_init(struct tep_handle *pevent)free (item); } -qsort (cmdlines, pevent->cmdline_count,sizeof (*cmdlines), cmdline_cmp); +qsort (cmdlines, tep->cmdline_count,sizeof (*cmdlines), cmdline_cmp); - pevent->cmdlines = cmdlines; - pevent->cmdlist =NULL ; + tep->cmdlines = cmdlines; + tep->cmdlist =NULL ;return 0 ; } -static const char *find_cmdline (struct tep_handle *pevent,int pid) +static const char *find_cmdline (struct tep_handle *tep,int pid) {const struct tep_cmdline *comm;struct tep_cmdline key;
@@ -185,13 +185,13 @@ static const char *find_cmdline(struct tep_handle *pevent, int pid)if (!pid)return "<idle>" ; -if (!pevent->cmdlines &&cmdline_init (pevent)) +if (!tep->cmdlines &&cmdline_init (tep))return "<not enough memory for cmdlines!>" ; key.pid = pid; - comm =bsearch (&key, pevent->cmdlines, pevent->cmdline_count, -sizeof (*pevent->cmdlines), cmdline_cmp); + comm =bsearch (&key, tep->cmdlines, tep->cmdline_count, +sizeof (*tep->cmdlines), cmdline_cmp);if (comm)return comm->comm;
@@ -232,10 +232,10 @@ bool tep_is_pid_registered(struct tep_handle *tep, int pid)* we must add this pid. This is much slower than when cmdlines * are added before the array is initialized. */ -static int add_new_comm (struct tep_handle *pevent, +static int add_new_comm (struct tep_handle *tep,const char *comm,int pid,bool override) { -struct tep_cmdline *cmdlines = pevent->cmdlines; +struct tep_cmdline *cmdlines = tep->cmdlines;struct tep_cmdline *cmdline;struct tep_cmdline key;char *new_comm;
@@ -246,8 +246,8 @@ static int add_new_comm(struct tep_handle *pevent,/* avoid duplicates */ key.pid = pid; - cmdline =bsearch (&key, pevent->cmdlines, pevent->cmdline_count, -sizeof (*pevent->cmdlines), cmdline_cmp); + cmdline =bsearch (&key, tep->cmdlines, tep->cmdline_count, +sizeof (*tep->cmdlines), cmdline_cmp);if (cmdline) {if (!override) { errno =EEXIST ;
@@ -264,26 +264,26 @@ static int add_new_comm(struct tep_handle *pevent,return 0 ; } - cmdlines =realloc (cmdlines,sizeof (*cmdlines) * (pevent->cmdline_count +1 )); + cmdlines =realloc (cmdlines,sizeof (*cmdlines) * (tep->cmdline_count +1 ));if (!cmdlines) { errno =ENOMEM ;return -1 ; } - cmdlines[pevent->cmdline_count].comm =strdup (comm); -if (!cmdlines[pevent->cmdline_count].comm) { + cmdlines[tep->cmdline_count].comm =strdup (comm); +if (!cmdlines[tep->cmdline_count].comm) {free (cmdlines); errno =ENOMEM ;return -1 ; } - cmdlines[pevent->cmdline_count].pid = pid; + cmdlines[tep->cmdline_count].pid = pid; -if (cmdlines[pevent->cmdline_count].comm) - pevent->cmdline_count++; +if (cmdlines[tep->cmdline_count].comm) + tep->cmdline_count++; -qsort (cmdlines, pevent->cmdline_count,sizeof (*cmdlines), cmdline_cmp); - pevent->cmdlines = cmdlines; +qsort (cmdlines, tep->cmdline_count,sizeof (*cmdlines), cmdline_cmp); + tep->cmdlines = cmdlines;return 0 ; }
@@ -408,18 +408,18 @@ static int func_bcmp(const void *a, const void *b)return 1 ; } -static int func_map_init (struct tep_handle *pevent) +static int func_map_init (struct tep_handle *tep) {struct func_list *funclist;struct func_list *item;struct func_map *func_map;int i; - func_map =malloc (sizeof (*func_map) * (pevent->func_count +1 )); + func_map =malloc (sizeof (*func_map) * (tep->func_count +1 ));if (!func_map)return -1 ; - funclist = pevent->funclist; + funclist = tep->funclist; i =0 ;while (funclist) {
@@ -432,34 +432,34 @@ static int func_map_init(struct tep_handle *pevent)free (item); } -qsort (func_map, pevent->func_count,sizeof (*func_map), func_cmp); +qsort (func_map, tep->func_count,sizeof (*func_map), func_cmp);/* * Add a special record at the end. */ - func_map[pevent->func_count].func =NULL ; - func_map[pevent->func_count].addr =0 ; - func_map[pevent->func_count].mod =NULL ; + func_map[tep->func_count].func =NULL ; + func_map[tep->func_count].addr =0 ; + func_map[tep->func_count].mod =NULL ; - pevent->func_map = func_map; - pevent->funclist =NULL ; + tep->func_map = func_map; + tep->funclist =NULL ;return 0 ; }static struct func_map * -__find_func (struct tep_handle *pevent,unsigned long long addr) +__find_func (struct tep_handle *tep,unsigned long long addr) {struct func_map *func;struct func_map key; -if (!pevent->func_map) -func_map_init (pevent); +if (!tep->func_map) +func_map_init (tep); key.addr = addr; - func =bsearch (&key, pevent->func_map, pevent->func_count, -sizeof (*pevent->func_map), func_bcmp); + func =bsearch (&key, tep->func_map, tep->func_count, +sizeof (*tep->func_map), func_bcmp);return func; }
@@ -510,18 +510,18 @@ void tep_reset_function_resolver(struct tep_handle *tep) }static struct func_map * -find_func (struct tep_handle *pevent,unsigned long long addr) +find_func (struct tep_handle *tep,unsigned long long addr) {struct func_map *map; -if (!pevent->func_resolver) -return __find_func (pevent, addr); +if (!tep->func_resolver) +return __find_func (tep, addr); - map = &pevent->func_resolver->map; + map = &tep->func_resolver->map; map->mod =NULL ; map->addr = addr; - map->func = pevent->func_resolver->func (pevent->func_resolver->priv, - &map->addr, &map->mod); + map->func = tep->func_resolver->func (tep->func_resolver->priv, + &map->addr, &map->mod);if (map->func ==NULL )return NULL ;
@@ -662,18 +662,18 @@ static int printk_cmp(const void *a, const void *b)return 0 ; } -static int printk_map_init (struct tep_handle *pevent) +static int printk_map_init (struct tep_handle *tep) {struct printk_list *printklist;struct printk_list *item;struct printk_map *printk_map;int i; - printk_map =malloc (sizeof (*printk_map) * (pevent->printk_count +1 )); + printk_map =malloc (sizeof (*printk_map) * (tep->printk_count +1 ));if (!printk_map)return -1 ; - printklist = pevent->printklist; + printklist = tep->printklist; i =0 ;while (printklist) {
@@ -685,27 +685,27 @@ static int printk_map_init(struct tep_handle *pevent)free (item); } -qsort (printk_map, pevent->printk_count,sizeof (*printk_map), printk_cmp); +qsort (printk_map, tep->printk_count,sizeof (*printk_map), printk_cmp); - pevent->printk_map = printk_map; - pevent->printklist =NULL ; + tep->printk_map = printk_map; + tep->printklist =NULL ;return 0 ; }static struct printk_map * -find_printk (struct tep_handle *pevent,unsigned long long addr) +find_printk (struct tep_handle *tep,unsigned long long addr) {struct printk_map *printk;struct printk_map key; -if (!pevent->printk_map &&printk_map_init (pevent)) +if (!tep->printk_map &&printk_map_init (tep))return NULL ; key.addr = addr; - printk =bsearch (&key, pevent->printk_map, pevent->printk_count, -sizeof (*pevent->printk_map), printk_cmp); + printk =bsearch (&key, tep->printk_map, tep->printk_count, +sizeof (*tep->printk_map), printk_cmp);return printk; }
@@ -782,29 +782,29 @@ static struct tep_event *alloc_event(void)return calloc (1 ,sizeof (struct tep_event )); } -static int add_event (struct tep_handle *pevent,struct tep_event *event) +static int add_event (struct tep_handle *tep,struct tep_event *event) {int i; -struct tep_event **events =realloc (pevent->events,sizeof (event) * - (pevent->nr_events +1 )); +struct tep_event **events =realloc (tep->events,sizeof (event) * + (tep->nr_events +1 ));if (!events)return -1 ; - pevent->events = events; + tep->events = events; -for (i =0 ; i < pevent->nr_events; i++) { -if (pevent->events[i]->id > event->id) +for (i =0 ; i < tep->nr_events; i++) { +if (tep->events[i]->id > event->id)break ; } -if (i < pevent->nr_events) -memmove (&pevent->events[i +1 ], - &pevent->events[i], -sizeof (event) * (pevent->nr_events - i)); +if (i < tep->nr_events) +memmove (&tep->events[i +1 ], + &tep->events[i], +sizeof (event) * (tep->nr_events - i)); - pevent->events[i] = event; - pevent->nr_events++; + tep->events[i] = event; + tep->nr_events++; - event->tep = pevent; + event->tep = tep;return 0 ; }
@@ -2941,14 +2941,14 @@ process_bitmask(struct tep_event *event __maybe_unused, struct tep_print_arg *ar }static struct tep_function_handler * -find_func_handler (struct tep_handle *pevent,char *func_name) +find_func_handler (struct tep_handle *tep,char *func_name) {struct tep_function_handler *func; -if (!pevent) +if (!tep)return NULL ; -for (func = pevent->func_handlers; func; func = func->next) { +for (func = tep->func_handlers; func; func = func->next) {if (strcmp (func->name, func_name) ==0 )break ; }
@@ -2956,12 +2956,12 @@ find_func_handler(struct tep_handle *pevent, char *func_name)return func; } -static void remove_func_handler (struct tep_handle *pevent,char *func_name) +static void remove_func_handler (struct tep_handle *tep,char *func_name) {struct tep_function_handler *func;struct tep_function_handler **next; - next = &pevent->func_handlers; + next = &tep->func_handlers;while ((func = *next)) {if (strcmp (func->name, func_name) ==0 ) { *next = func->next;
@@ -3413,7 +3413,7 @@ int tep_read_number_field(struct tep_format_field *field, const void *data, } } -static int get_common_info (struct tep_handle *pevent, +static int get_common_info (struct tep_handle *tep,const char *type,int *offset,int *size) {struct tep_event *event;
@@ -3423,12 +3423,12 @@ static int get_common_info(struct tep_handle *pevent,* All events should have the same common elements. * Pick any event to find where the type is; */ -if (!pevent->events) { +if (!tep->events) {do_warning ("no event_list!" );return -1 ; } - event = pevent->events[0 ]; + event = tep->events[0 ]; field =tep_find_common_field (event, type);if (!field)return -1 ;
@@ -3439,58 +3439,58 @@ static int get_common_info(struct tep_handle *pevent,return 0 ; } -static int __parse_common (struct tep_handle *pevent,void *data, +static int __parse_common (struct tep_handle *tep,void *data,int *size,int *offset,const char *name) {int ret;if (!*size) { - ret =get_common_info (pevent, name, offset, size); + ret =get_common_info (tep, name, offset, size);if (ret <0 )return ret; } -return tep_read_number (pevent, data + *offset, *size); +return tep_read_number (tep, data + *offset, *size); } -static int trace_parse_common_type (struct tep_handle *pevent,void *data) +static int trace_parse_common_type (struct tep_handle *tep,void *data) { -return __parse_common (pevent, data, - &pevent->type_size, &pevent->type_offset, +return __parse_common (tep, data, + &tep->type_size, &tep->type_offset,"common_type" ); } -static int parse_common_pid (struct tep_handle *pevent,void *data) +static int parse_common_pid (struct tep_handle *tep,void *data) { -return __parse_common (pevent, data, - &pevent->pid_size, &pevent->pid_offset, +return __parse_common (tep, data, + &tep->pid_size, &tep->pid_offset,"common_pid" ); } -static int parse_common_pc (struct tep_handle *pevent,void *data) +static int parse_common_pc (struct tep_handle *tep,void *data) { -return __parse_common (pevent, data, - &pevent->pc_size, &pevent->pc_offset, +return __parse_common (tep, data, + &tep->pc_size, &tep->pc_offset,"common_preempt_count" ); } -static int parse_common_flags (struct tep_handle *pevent,void *data) +static int parse_common_flags (struct tep_handle *tep,void *data) { -return __parse_common (pevent, data, - &pevent->flags_size, &pevent->flags_offset, +return __parse_common (tep, data, + &tep->flags_size, &tep->flags_offset,"common_flags" ); } -static int parse_common_lock_depth (struct tep_handle *pevent,void *data) +static int parse_common_lock_depth (struct tep_handle *tep,void *data) { -return __parse_common (pevent, data, - &pevent->ld_size, &pevent->ld_offset, +return __parse_common (tep, data, + &tep->ld_size, &tep->ld_offset,"common_lock_depth" ); } -static int parse_common_migrate_disable (struct tep_handle *pevent,void *data) +static int parse_common_migrate_disable (struct tep_handle *tep,void *data) { -return __parse_common (pevent, data, - &pevent->ld_size, &pevent->ld_offset, +return __parse_common (tep, data, + &tep->ld_size, &tep->ld_offset,"common_migrate_disable" ); }
@@ -3566,7 +3566,7 @@ tep_find_event_by_name(struct tep_handle *tep,static unsigned long long eval_num_arg (void *data,int size,struct tep_event *event,struct tep_print_arg *arg) { -struct tep_handle *pevent = event->tep; +struct tep_handle *tep = event->tep;unsigned long long val =0 ;unsigned long long left, right;struct tep_print_arg *typearg =NULL ;
@@ -3588,7 +3588,7 @@ eval_num_arg(void *data, int size, struct tep_event *event, struct tep_print_arg }/* must be a number */ - val =tep_read_number (pevent, data + arg->field.field->offset, + val =tep_read_number (tep, data + arg->field.field->offset, arg->field.field->size);break ;case TEP_PRINT_FLAGS :
@@ -3628,11 +3628,11 @@ eval_num_arg(void *data, int size, struct tep_event *event, struct tep_print_arg }/* Default to long size */ - field_size = pevent->long_size; + field_size = tep->long_size;switch (larg->type) {case TEP_PRINT_DYNAMIC_ARRAY : - offset =tep_read_number (pevent, + offset =tep_read_number (tep, data + larg->dynarray.field->offset, larg->dynarray.field->size);if (larg->dynarray.field->elementsize)
@@ -3661,7 +3661,7 @@ eval_num_arg(void *data, int size, struct tep_event *event, struct tep_print_argdefault : goto default_op;/* oops, all bets off */ } - val =tep_read_number (pevent, + val =tep_read_number (tep, data + offset, field_size);if (typearg) val =eval_type (val, typearg,1 );
@@ -3762,7 +3762,7 @@ eval_num_arg(void *data, int size, struct tep_event *event, struct tep_print_arg }break ;case TEP_PRINT_DYNAMIC_ARRAY_LEN : - offset =tep_read_number (pevent, + offset =tep_read_number (tep, data + arg->dynarray.field->offset, arg->dynarray.field->size);/*
@@ -3774,7 +3774,7 @@ eval_num_arg(void *data, int size, struct tep_event *event, struct tep_print_argbreak ;case TEP_PRINT_DYNAMIC_ARRAY :/* Without [], we pass the address to the dynamic data */ - offset =tep_read_number (pevent, + offset =tep_read_number (tep, data + arg->dynarray.field->offset, arg->dynarray.field->size);/*
@@ -3849,7 +3849,7 @@ static void print_str_to_seq(struct trace_seq *s, const char *format,trace_seq_printf (s, format, str); } -static void print_bitmask_to_seq (struct tep_handle *pevent, +static void print_bitmask_to_seq (struct tep_handle *tep,struct trace_seq *s,const char *format,int len_arg,const void *data,int size) {
@@ -3881,7 +3881,7 @@ static void print_bitmask_to_seq(struct tep_handle *pevent,* In the kernel, this is an array of long words, thus * endianness is very important. */ -if (pevent->file_bigendian) +if (tep->file_bigendian) index = size - (len +1 );else index = len;
@@ -3907,7 +3907,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, struct tep_event *event, const char *format, int len_arg, struct tep_print_arg *arg) { - struct tep_handle *pevent = event->tep; + struct tep_handle *tep = event->tep;struct tep_print_flag_sym *flag;struct tep_format_field *field;struct printk_map *printk;
@@ -3944,7 +3944,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,* is a pointer. */ if (!(field->flags &TEP_FIELD_IS_ARRAY ) && - field->size == pevent->long_size) { + field->size == tep->long_size) {/* Handle heterogeneous recording and processing * architectures
@@ -3959,12 +3959,12 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,* on 32-bit devices: * In this case, 64 bits must be read. */ - addr = (pevent->long_size ==8 ) ? + addr = (tep->long_size ==8 ) ? *(unsigned long long *)(data + field->offset) : (unsigned long long )*(unsigned int *)(data + field->offset);/* Check if it matches a print format */ - printk =find_printk (pevent, addr); + printk =find_printk (tep, addr);if (printk)trace_seq_puts (s, printk->printk);else
@@ -4021,7 +4021,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,case TEP_PRINT_HEX_STR :if (arg->hex.field->type ==TEP_PRINT_DYNAMIC_ARRAY ) {unsigned long offset; - offset =tep_read_number (pevent, + offset =tep_read_number (tep, data + arg->hex.field->dynarray.field->offset, arg->hex.field->dynarray.field->size); hex = data + (offset &0xffff );
@@ -4052,7 +4052,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,unsigned long offset;struct tep_format_field *field = arg->int_array.field->dynarray.field; - offset =tep_read_number (pevent, + offset =tep_read_number (tep, data + field->offset, field->size); num = data + (offset &0xffff );
@@ -4103,7 +4103,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, f =tep_find_any_field (event, arg->string.string); arg->string.offset = f->offset; } - str_offset =tep_data2host4 (pevent, *(unsigned int *)(data + arg->string.offset)); + str_offset =tep_data2host4 (tep, *(unsigned int *)(data + arg->string.offset)); str_offset &=0xffff ;print_str_to_seq (s, format, len_arg, ((char *)data) + str_offset);break ;
@@ -4121,10 +4121,10 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, f =tep_find_any_field (event, arg->bitmask.bitmask); arg->bitmask.offset = f->offset; } - bitmask_offset =tep_data2host4 (pevent, *(unsigned int *)(data + arg->bitmask.offset)); + bitmask_offset =tep_data2host4 (tep, *(unsigned int *)(data + arg->bitmask.offset)); bitmask_size = bitmask_offset >>16 ; bitmask_offset &=0xffff ; -print_bitmask_to_seq (pevent, s, format, len_arg, +print_bitmask_to_seq (tep, s, format, len_arg, data + bitmask_offset, bitmask_size);break ; }
@@ -4256,7 +4256,7 @@ static void free_args(struct tep_print_arg *args)static struct tep_print_arg *make_bprint_args (char *fmt,void *data,int size,struct tep_event *event) { -struct tep_handle *pevent = event->tep; +struct tep_handle *tep = event->tep;struct tep_format_field *field, *ip_field;struct tep_print_arg *args, *arg, **next;unsigned long long ip, val;
@@ -4264,8 +4264,8 @@ static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, svoid *bptr;int vsize =0 ; - field = pevent->bprint_buf_field; - ip_field = pevent->bprint_ip_field; + field = tep->bprint_buf_field; + ip_field = tep->bprint_ip_field;if (!field) { field =tep_find_field (event,"buf" );
@@ -4278,11 +4278,11 @@ static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, sdo_warning_event (event,"can't find ip field for binary printk" );return NULL ; } - pevent->bprint_buf_field = field; - pevent->bprint_ip_field = ip_field; + tep->bprint_buf_field = field; + tep->bprint_ip_field = ip_field; } - ip =tep_read_number (pevent, data + ip_field->offset, ip_field->size); + ip =tep_read_number (tep, data + ip_field->offset, ip_field->size);/* * The first arg is the IP pointer.
@@ -4360,7 +4360,7 @@ static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, s vsize =4 ;break ;case 1 : - vsize = pevent->long_size; + vsize = tep->long_size;break ;case 2 : vsize =8 ;
@@ -4377,7 +4377,7 @@ static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, s/* the pointers are always 4 bytes aligned */ bptr = (void *)(((unsigned long )bptr +3 ) & ~3 ); - val =tep_read_number (pevent, bptr, vsize); + val =tep_read_number (tep, bptr, vsize); bptr += vsize; arg =alloc_arg ();if (!arg) {
@@ -4434,13 +4434,13 @@ static char * get_bprint_format(void *data, int size __maybe_unused, struct tep_event *event) { -struct tep_handle *pevent = event->tep; +struct tep_handle *tep = event->tep;unsigned long long addr;struct tep_format_field *field;struct printk_map *printk;char *format; - field = pevent->bprint_fmt_field; + field = tep->bprint_fmt_field;if (!field) { field =tep_find_field (event,"fmt" );
@@ -4448,12 +4448,12 @@ get_bprint_format(void *data, int size __maybe_unused,do_warning_event (event,"can't find format field for binary printk" );return NULL ; } - pevent->bprint_fmt_field = field; + tep->bprint_fmt_field = field; } - addr =tep_read_number (pevent, data + field->offset, field->size); + addr =tep_read_number (tep, data + field->offset, field->size); - printk =find_printk (pevent, addr); + printk =find_printk (tep, addr);if (!printk) {if (asprintf (&format,"%%pf: (NO FORMAT FOUND at %llx)\n" , addr) <0 )return NULL ;
@@ -4835,13 +4835,13 @@ void tep_print_field(struct trace_seq *s, void *data, {unsigned long long val;unsigned int offset, len, i; -struct tep_handle *pevent = field->event->tep; +struct tep_handle *tep = field->event->tep;if (field->flags &TEP_FIELD_IS_ARRAY ) { offset = field->offset; len = field->size;if (field->flags &TEP_FIELD_IS_DYNAMIC ) { - val =tep_read_number (pevent, data + offset, len); + val =tep_read_number (tep, data + offset, len); offset = val; len = offset >>16 ; offset &=0xffff ;
@@ -4861,7 +4861,7 @@ void tep_print_field(struct trace_seq *s, void *data, field->flags &= ~TEP_FIELD_IS_STRING ; } }else { - val =tep_read_number (pevent, data + field->offset, + val =tep_read_number (tep, data + field->offset, field->size);if (field->flags &TEP_FIELD_IS_POINTER ) {trace_seq_printf (s,"0x%llx" , val);
@@ -4910,7 +4910,7 @@ void tep_print_fields(struct trace_seq *s, void *data,static void pretty_print (struct trace_seq *s,void *data,int size,struct tep_event *event) { -struct tep_handle *pevent = event->tep; +struct tep_handle *tep = event->tep;struct tep_print_fmt *print_fmt = &event->print_fmt;struct tep_print_arg *arg = print_fmt->args;struct tep_print_arg *args =NULL ;
@@ -5002,7 +5002,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_ecase '-' : goto cont_process;case 'p' : -if (pevent->long_size ==4 ) +if (tep->long_size ==4 ) ls =1 ;else ls =2 ;
@@ -5063,7 +5063,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_e arg = arg->next;if (show_func) { - func =find_func (pevent, val); + func =find_func (tep, val);if (func) {trace_seq_puts (s, func->func);if (show_func =='F' )
@@ -5073,7 +5073,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_ebreak ; } } -if (pevent->long_size ==8 && ls ==1 && +if (tep->long_size ==8 && ls ==1 &&sizeof (long ) !=8 ) {char *p;
@@ -5320,14 +5320,14 @@ const char *tep_data_comm_from_pid(struct tep_handle *tep, int pid) }static struct tep_cmdline * -pid_from_cmdlist (struct tep_handle *pevent,const char *comm,struct tep_cmdline *next) +pid_from_cmdlist (struct tep_handle *tep,const char *comm,struct tep_cmdline *next) {struct cmdline_list *cmdlist = (struct cmdline_list *)next;if (cmdlist) cmdlist = cmdlist->next;else - cmdlist = pevent->cmdlist; + cmdlist = tep->cmdlist;while (cmdlist &&strcmp (cmdlist->comm, comm) !=0 ) cmdlist = cmdlist->next;
@@ -6078,11 +6078,11 @@ static void free_handler(struct event_handler *handle)free (handle); } -static int find_event_handle (struct tep_handle *pevent,struct tep_event *event) +static int find_event_handle (struct tep_handle *tep,struct tep_event *event) {struct event_handler *handle, **next; -for (next = &pevent->handlers; *next; +for (next = &tep->handlers; *next; next = &(*next)->next) { handle = *next; if (event_matches(event, handle->id,
@@ -6120,7 +6120,7 @@ static int find_event_handle(struct tep_handle *pevent, struct tep_event *event)* /sys/kernel/debug/tracing/events/.../.../format */ enum tep_errno __tep_parse_format (struct tep_event **eventp, -struct tep_handle *pevent,const char *buf, +struct tep_handle *tep,const char *buf,unsigned long size,const char *sys) {struct tep_event *event;
@@ -6162,8 +6162,8 @@ enum tep_errno __tep_parse_format(struct tep_event **eventp, goto event_alloc_failed; } -/* Add pevent to event so that it can be referenced */ - event->tep = pevent; +/* Add tep to event so that it can be referenced */ + event->tep = tep; ret =event_read_format (event);if (ret <0 ) {
@@ -6175,7 +6175,7 @@ enum tep_errno __tep_parse_format(struct tep_event **eventp,* If the event has an override, don't print warnings if the event * print format fails to parse. */ -if (pevent &&find_event_handle (pevent, event)) +if (tep &&find_event_handle (tep, event)) show_warning =0 ; ret =event_read_print (event);
@@ -6227,18 +6227,18 @@ enum tep_errno __tep_parse_format(struct tep_event **eventp, }static enum tep_errno -__parse_event (struct tep_handle *pevent, +__parse_event (struct tep_handle *tep,struct tep_event **eventp,const char *buf,unsigned long size,const char *sys) { -int ret =__tep_parse_format (eventp, pevent, buf, size, sys); +int ret =__tep_parse_format (eventp, tep, buf, size, sys);struct tep_event *event = *eventp;if (event ==NULL )return ret; -if (pevent &&add_event (pevent, event)) { +if (tep &&add_event (tep, event)) { ret =TEP_ERRNO__MEM_ALLOC_FAILED ; goto event_add_failed; }
@@ -6492,7 +6492,7 @@ int tep_print_func_field(struct trace_seq *s, const char *fmt, struct tep_record *record, int err) {struct tep_format_field *field =tep_find_field (event, name); -struct tep_handle *pevent = event->tep; +struct tep_handle *tep = event->tep;unsigned long long val;struct func_map *func;char tmp[128 ];
@@ -6503,7 +6503,7 @@ int tep_print_func_field(struct trace_seq *s, const char *fmt,if (tep_read_number_field (field, record->data, &val)) goto failed; - func =find_func (pevent, val); + func =find_func (tep, val);if (func)snprintf (tmp,128 ,"%s/0x%llx" , func->func, func->addr - val);
@@ -6648,7 +6648,7 @@ int tep_unregister_print_function(struct tep_handle *tep,return -1 ; } -static struct tep_event *search_event (struct tep_handle *pevent,int id, +static struct tep_event *search_event (struct tep_handle *tep,int id,const char *sys_name,const char *event_name) {
@@ -6656,7 +6656,7 @@ static struct tep_event *search_event(struct tep_handle *pevent, int id,if (id >=0 ) {/* search by id */ - event =tep_find_event (pevent, id); + event =tep_find_event (tep, id);if (!event)return NULL ;if (event_name && (strcmp (event_name, event->name) !=0 ))
@@ -6664,7 +6664,7 @@ static struct tep_event *search_event(struct tep_handle *pevent, int id,if (sys_name && (strcmp (sys_name, event->system) !=0 ))return NULL ; }else { - event =tep_find_event_by_name (pevent, sys_name, event_name); + event =tep_find_event_by_name (tep, sys_name, event_name);if (!event)return NULL ; }
@@ -6821,14 +6821,14 @@ not_found:*/ struct tep_handle *tep_alloc (void ) { -struct tep_handle *pevent =calloc (1 ,sizeof (*pevent)); +struct tep_handle *tep =calloc (1 ,sizeof (*tep)); -if (pevent) { - pevent->ref_count =1 ; - pevent->host_bigendian =tep_is_bigendian (); +if (tep) { + tep->ref_count =1 ; + tep->host_bigendian =tep_is_bigendian (); } -return pevent; +return tep; }void tep_ref (struct tep_handle *tep)
tools/lib/traceevent/event-plugin.c +12 -12
@@ -269,7 +269,7 @@ void tep_print_plugins(struct trace_seq *s, }static void -load_plugin (struct tep_handle *pevent,const char *path, +load_plugin (struct tep_handle *tep,const char *path,const char *file,void *data) {struct tep_plugin_list **plugin_list = data;
@@ -316,7 +316,7 @@ load_plugin(struct tep_handle *pevent, const char *path, *plugin_list = list;pr_stat ("registering plugin: %s" , plugin); -func (pevent); +func (tep);return ; out_free:
@@ -324,9 +324,9 @@ load_plugin(struct tep_handle *pevent, const char *path, } static void -load_plugins_dir(struct tep_handle *pevent, const char *suffix, +load_plugins_dir(struct tep_handle *tep, const char *suffix, const char *path, - void (*load_plugin)(struct tep_handle *pevent, + void (*load_plugin)(struct tep_handle *tep, const char *path, const char *name, void *data),
@@ -359,15 +359,15 @@ load_plugins_dir(struct tep_handle *pevent, const char *suffix,if (strcmp (name + (strlen (name) -strlen (suffix)), suffix) !=0 )continue ; -load_plugin (pevent, path, name, data); +load_plugin (tep, path, name, data); }closedir (dir); } static void -load_plugins(struct tep_handle *pevent, const char *suffix, - void (*load_plugin)(struct tep_handle *pevent, +load_plugins(struct tep_handle *tep, const char *suffix, + void (*load_plugin)(struct tep_handle *tep, const char *path, const char *name, void *data),
@@ -378,7 +378,7 @@ load_plugins(struct tep_handle *pevent, const char *suffix,char *envdir;int ret; -if (pevent->flags &TEP_DISABLE_PLUGINS ) +if (tep->flags &TEP_DISABLE_PLUGINS )return ;/*
@@ -386,8 +386,8 @@ load_plugins(struct tep_handle *pevent, const char *suffix,* check that first. */ #ifdef PLUGIN_DIR -if (!(pevent->flags &TEP_DISABLE_SYS_PLUGINS )) -load_plugins_dir (pevent, suffix,PLUGIN_DIR , +if (!(tep->flags &TEP_DISABLE_SYS_PLUGINS )) +load_plugins_dir (tep, suffix,PLUGIN_DIR , load_plugin, data);#endif
@@ -397,7 +397,7 @@ load_plugins(struct tep_handle *pevent, const char *suffix,*/ envdir =getenv ("TRACEEVENT_PLUGIN_DIR" );if (envdir) -load_plugins_dir (pevent, suffix, envdir, load_plugin, data); +load_plugins_dir (tep, suffix, envdir, load_plugin, data);/* * Now let the home directory override the environment
@@ -413,7 +413,7 @@ load_plugins(struct tep_handle *pevent, const char *suffix,return ; } -load_plugins_dir (pevent, suffix, path, load_plugin, data); +load_plugins_dir (tep, suffix, path, load_plugin, data);free (path); }
tools/lib/traceevent/parse-filter.c +12 -12
@@ -256,7 +256,7 @@ static int event_match(struct tep_event *event, }static enum tep_errno -find_event (struct tep_handle *pevent,struct event_list **events, +find_event (struct tep_handle *tep,struct event_list **events,char *sys_name,char *event_name) {struct tep_event *event;
@@ -299,8 +299,8 @@ find_event(struct tep_handle *pevent, struct event_list **events, } } -for (i =0 ; i < pevent->nr_events; i++) { - event = pevent->events[i]; +for (i =0 ; i < tep->nr_events; i++) { + event = tep->events[i];if (event_match (event, sys_name ? &sreg :NULL , &ereg)) { match =1 ;if (add_event (events, event) <0 ) {
@@ -1257,7 +1257,7 @@ static void filter_init_error_buf(struct tep_event_filter *filter)enum tep_errno tep_filter_add_filter_str (struct tep_event_filter *filter,const char *filter_str) { -struct tep_handle *pevent = filter->tep; +struct tep_handle *tep = filter->tep;struct event_list *event;struct event_list *events =NULL ;const char *filter_start;
@@ -1313,7 +1313,7 @@ enum tep_errno tep_filter_add_filter_str(struct tep_event_filter *filter, }/* Find this event */ - ret =find_event (pevent, &events,strim (sys_name),strim (event_name)); + ret =find_event (tep, &events,strim (sys_name),strim (event_name));if (ret <0 ) {free_events (events);free (this_event);
@@ -1334,7 +1334,7 @@ enum tep_errno tep_filter_add_filter_str(struct tep_event_filter *filter,if (ret <0 ) rtn = ret; -if (ret >=0 && pevent->test_filters) { +if (ret >=0 && tep->test_filters) {char *test; test =tep_filter_make_string (filter, event->event->id);if (test) {
@@ -1459,7 +1459,7 @@ static int copy_filter_type(struct tep_event_filter *filter,const char *name;char *str; -/* Can't assume that the pevent's are the same */ +/* Can't assume that the tep's are the same */ sys = filter_type->event->system; name = filter_type->event->name; event =tep_find_event_by_name (filter->tep, sys, name);
@@ -1697,7 +1697,7 @@ static int test_num(struct tep_event *event, struct tep_filter_arg *arg,static const char *get_field_str (struct tep_filter_arg *arg,struct tep_record *record) {struct tep_event *event; -struct tep_handle *pevent; +struct tep_handle *tep;unsigned long long addr;const char *val =NULL ;unsigned int size;
@@ -1727,12 +1727,12 @@ static const char *get_field_str(struct tep_filter_arg *arg, struct tep_record * }else { event = arg->str.field->event; - pevent = event->tep; + tep = event->tep; addr =get_value (event, arg->str.field, record);if (arg->str.field->flags & (TEP_FIELD_IS_POINTER |TEP_FIELD_IS_LONG ))/* convert to a kernel symbol */ - val =tep_find_function (pevent, addr); + val =tep_find_function (tep, addr);if (val ==NULL ) {/* just use the hex of the string name */
@@ -1872,7 +1872,7 @@ int tep_event_filtered(struct tep_event_filter *filter, int event_id)enum tep_errno tep_filter_match (struct tep_event_filter *filter,struct tep_record *record) { -struct tep_handle *pevent = filter->tep; +struct tep_handle *tep = filter->tep;struct tep_filter_type *filter_type;int event_id;int ret;
@@ -1883,7 +1883,7 @@ enum tep_errno tep_filter_match(struct tep_event_filter *filter,if (!filter->filters)return TEP_ERRNO__NO_FILTER ; - event_id =tep_data_type (pevent, record); + event_id =tep_data_type (tep, record); filter_type =find_filter_type (filter, event_id);if (!filter_type)
tools/lib/traceevent/plugin_function.c +3 -3
@@ -126,7 +126,7 @@ static int add_and_get_index(const char *parent, const char *child, int cpu)static int function_handler (struct trace_seq *s,struct tep_record *record,struct tep_event *event,void *context) { -struct tep_handle *pevent = event->tep; +struct tep_handle *tep = event->tep;unsigned long long function;unsigned long long pfunction;const char *func;
@@ -136,12 +136,12 @@ static int function_handler(struct trace_seq *s, struct tep_record *record,if (tep_get_field_val (s, event,"ip" , record, &function,1 ))return trace_seq_putc (s,'!' ); - func =tep_find_function (pevent, function); + func =tep_find_function (tep, function);if (tep_get_field_val (s, event,"parent_ip" , record, &pfunction,1 ))return trace_seq_putc (s,'!' ); - parent =tep_find_function (pevent, pfunction); + parent =tep_find_function (tep, pfunction);if (parent && ftrace_indent->set) index =add_and_get_index (parent, func, record->cpu);
Arnaldo Carvalho de Melo
AppliedRe: [PATCH 00/15] tools/lib/traceevent: Continuing on the path to a stand alone library
In reply to Steven RostedtEm Mon, Apr 01, 2019 at 12:43:05PM -0400, Steven Rostedt escreveu:
Quoted 9 lines
Arnaldo,
These contain more patches to make libtraceevent a stand alone library. It also brings in some changes that are in the trace-cmd library.
There's a few name changes to the API function names to be more descriptive as well as closer to what they actually do.
Quoted 7 lines
The "pevent" has been renamed to "tep" as we no longer use "pevent" to represent the handle to the libtraceevent library descriptor. "tep" now stands for "Trace Event Parser".
The reason for the "(Red Hat)" in one of my patches is that the code was written when I was working for Red Hat, but added when working for VMware (which is in the Signed-off-by).
Thanks, applied.
$ git log | grep Author | head -15 Author: Tzvetomir Stoyanov <[email protected]> Author: Tzvetomir Stoyanov <[email protected]> Author: Tzvetomir Stoyanov <[email protected]> Author: Tzvetomir Stoyanov <[email protected]> Author: Tzvetomir Stoyanov <[email protected]> Author: Tzvetomir Stoyanov <[email protected]> Author: Tzvetomir Stoyanov <[email protected]> Author: Steven Rostedt (VMware) <[email protected]> Author: Tzvetomir Stoyanov <[email protected]> Author: Tzvetomir Stoyanov <[email protected]> Author: Tzvetomir Stoyanov <[email protected]> Author: Steven Rostedt (Red Hat) <[email protected]> Author: Tzvetomir Stoyanov <[email protected]> Author: Steven Rostedt (VMware) <[email protected]> Author: Steven Rostedt (VMware) <[email protected]> $
- Arnaldo