| Message ID | 20180810131732.24677-14-tz.stoyanov@gmail.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere, archived |
| Headers | show |
| Series | Rename variables, data structures and functions in libtraceevent | expand |
Hi Tzvetomir, I applied all but the last two (starting with this one). On Fri, 10 Aug 2018 16:17:31 +0300 "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com> wrote: > In order to make libtraceevent into a proper library, variables, data > structures and functions require a unique prefix to prevent name space > conflicts. That prefix will be "tep_". This adds prefix tep_ to > enum filter_trivial_type and all its members, and renames data2host*() APIs Please break out the rename of data2host*() from this patch and make it a separate patch. Those two changes don't group well together. They are two different entities. Thanks! -- Steve > > Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com> > --- > tools/lib/traceevent/event-parse.c | 10 +++++----- > tools/lib/traceevent/event-parse.h | 28 ++++++++++++++-------------- > tools/lib/traceevent/parse-filter.c | 22 +++++++++++----------- > tools/perf/util/trace-event-read.c | 4 ++-- > 4 files changed, 32 insertions(+), 32 deletions(-) > > diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c > index 5a6e29c4b5cf..29e0825fbb92 100644 > --- a/tools/lib/traceevent/event-parse.c > +++ b/tools/lib/traceevent/event-parse.c > @@ -3344,11 +3344,11 @@ unsigned long long tep_read_number(struct tep_handle *pevent, > case 1: > return *(unsigned char *)ptr; > case 2: > - return data2host2(pevent, ptr); > + return tep_data2host2(pevent, ptr); > case 4: > - return data2host4(pevent, ptr); > + return tep_data2host4(pevent, ptr); > case 8: > - return data2host8(pevent, ptr); > + return tep_data2host8(pevent, ptr); > default: > /* BUG! */ > return 0; > @@ -4074,7 +4074,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 = data2host4(pevent, data + arg->string.offset); > + str_offset = tep_data2host4(pevent, data + arg->string.offset); > str_offset &= 0xffff; > print_str_to_seq(s, format, len_arg, ((char *)data) + str_offset); > break; > @@ -4092,7 +4092,7 @@ 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 = data2host4(pevent, data + arg->bitmask.offset); > + bitmask_offset = tep_data2host4(pevent, data + arg->bitmask.offset); > bitmask_size = bitmask_offset >> 16; > bitmask_offset &= 0xffff; > print_bitmask_to_seq(pevent, s, format, len_arg, > diff --git a/tools/lib/traceevent/event-parse.h b/tools/lib/traceevent/event-parse.h > index 52355417f3de..4b0ab69f6b3a 100644 > --- a/tools/lib/traceevent/event-parse.h > +++ b/tools/lib/traceevent/event-parse.h > @@ -538,7 +538,7 @@ static inline void tep_set_flag(struct tep_handle *pevent, int flag) > } > > static inline unsigned short > -__data2host2(struct tep_handle *pevent, unsigned short data) > +__tep_data2host2(struct tep_handle *pevent, unsigned short data) > { > unsigned short swap; > > @@ -552,7 +552,7 @@ __data2host2(struct tep_handle *pevent, unsigned short data) > } > > static inline unsigned int > -__data2host4(struct tep_handle *pevent, unsigned int data) > +__tep_data2host4(struct tep_handle *pevent, unsigned int data) > { > unsigned int swap; > > @@ -568,7 +568,7 @@ __data2host4(struct tep_handle *pevent, unsigned int data) > } > > static inline unsigned long long > -__data2host8(struct tep_handle *pevent, unsigned long long data) > +__tep_data2host8(struct tep_handle *pevent, unsigned long long data) > { > unsigned long long swap; > > @@ -587,14 +587,14 @@ __data2host8(struct tep_handle *pevent, unsigned long long data) > return swap; > } > > -#define data2host2(pevent, ptr) __data2host2(pevent, *(unsigned short *)(ptr)) > -#define data2host4(pevent, ptr) __data2host4(pevent, *(unsigned int *)(ptr)) > -#define data2host8(pevent, ptr) \ > +#define tep_data2host2(pevent, ptr) __tep_data2host2(pevent, *(unsigned short *)(ptr)) > +#define tep_data2host4(pevent, ptr) __tep_data2host4(pevent, *(unsigned int *)(ptr)) > +#define tep_data2host8(pevent, ptr) \ > ({ \ > unsigned long long __val; \ > \ > memcpy(&__val, (ptr), sizeof(unsigned long long)); \ > - __data2host8(pevent, __val); \ > + __tep_data2host8(pevent, __val); \ > }) > > static inline int tep_host_bigendian(void) > @@ -947,10 +947,10 @@ 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 filter_trivial_type { > - FILTER_TRIVIAL_FALSE, > - FILTER_TRIVIAL_TRUE, > - FILTER_TRIVIAL_BOTH, > +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, > @@ -968,7 +968,7 @@ 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 filter_trivial_type type); > + enum tep_filter_trivial_type type); > > void tep_filter_free(struct tep_event_filter *filter); > > @@ -979,12 +979,12 @@ int tep_filter_remove_event(struct tep_event_filter *filter, > > int tep_filter_event_has_trivial(struct tep_event_filter *filter, > int event_id, > - enum filter_trivial_type type); > + 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 filter_trivial_type type); > + enum tep_filter_trivial_type type); > > int tep_filter_compare(struct tep_event_filter *filter1, struct tep_event_filter *filter2); > > diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c > index daa205d9a930..c4a5404f5f2b 100644 > --- a/tools/lib/traceevent/parse-filter.c > +++ b/tools/lib/traceevent/parse-filter.c > @@ -1548,7 +1548,7 @@ int tep_filter_copy(struct tep_event_filter *dest, struct tep_event_filter *sour > * events may have still been updated on error. > */ > int tep_update_trivial(struct tep_event_filter *dest, struct tep_event_filter *source, > - enum filter_trivial_type type) > + enum tep_filter_trivial_type type) > { > struct tep_handle *src_pevent; > struct tep_handle *dest_pevent; > @@ -1570,8 +1570,8 @@ int tep_update_trivial(struct tep_event_filter *dest, struct tep_event_filter *s > arg = filter_type->filter; > if (arg->type != TEP_FILTER_ARG_BOOLEAN) > continue; > - if ((arg->boolean.value && type == FILTER_TRIVIAL_FALSE) || > - (!arg->boolean.value && type == FILTER_TRIVIAL_TRUE)) > + if ((arg->boolean.value && type == TEP_FILTER_TRIVIAL_FALSE) || > + (!arg->boolean.value && type == TEP_FILTER_TRIVIAL_TRUE)) > continue; > > event = filter_type->event; > @@ -1607,7 +1607,7 @@ int tep_update_trivial(struct tep_event_filter *dest, struct tep_event_filter *s > * Returns 0 on success and -1 if there was a problem. > */ > int tep_filter_clear_trivial(struct tep_event_filter *filter, > - enum filter_trivial_type type) > + enum tep_filter_trivial_type type) > { > struct tep_filter_type *filter_type; > int count = 0; > @@ -1628,11 +1628,11 @@ int tep_filter_clear_trivial(struct tep_event_filter *filter, > if (filter_type->filter->type != TEP_FILTER_ARG_BOOLEAN) > continue; > switch (type) { > - case FILTER_TRIVIAL_FALSE: > + case TEP_FILTER_TRIVIAL_FALSE: > if (filter_type->filter->boolean.value) > continue; > break; > - case FILTER_TRIVIAL_TRUE: > + case TEP_FILTER_TRIVIAL_TRUE: > if (!filter_type->filter->boolean.value) > continue; > default: > @@ -1670,7 +1670,7 @@ int tep_filter_clear_trivial(struct tep_event_filter *filter, > */ > int tep_filter_event_has_trivial(struct tep_event_filter *filter, > int event_id, > - enum filter_trivial_type type) > + enum tep_filter_trivial_type type) > { > struct tep_filter_type *filter_type; > > @@ -1686,10 +1686,10 @@ int tep_filter_event_has_trivial(struct tep_event_filter *filter, > return 0; > > switch (type) { > - case FILTER_TRIVIAL_FALSE: > + case TEP_FILTER_TRIVIAL_FALSE: > return !filter_type->filter->boolean.value; > > - case FILTER_TRIVIAL_TRUE: > + case TEP_FILTER_TRIVIAL_TRUE: > return filter_type->filter->boolean.value; > default: > return 1; > @@ -2423,8 +2423,8 @@ int tep_filter_compare(struct tep_event_filter *filter1, struct tep_event_filter > if (filter_type1->filter->type != filter_type2->filter->type) > break; > switch (filter_type1->filter->type) { > - case FILTER_TRIVIAL_FALSE: > - case FILTER_TRIVIAL_TRUE: > + case TEP_FILTER_TRIVIAL_FALSE: > + case TEP_FILTER_TRIVIAL_TRUE: > /* trivial types just need the type compared */ > continue; > default: > diff --git a/tools/perf/util/trace-event-read.c b/tools/perf/util/trace-event-read.c > index 3dfc1db6b25b..b98ee2a2eb44 100644 > --- a/tools/perf/util/trace-event-read.c > +++ b/tools/perf/util/trace-event-read.c > @@ -102,7 +102,7 @@ static unsigned int read4(struct tep_handle *pevent) > > if (do_read(&data, 4) < 0) > return 0; > - return __data2host4(pevent, data); > + return __tep_data2host4(pevent, data); > } > > static unsigned long long read8(struct tep_handle *pevent) > @@ -111,7 +111,7 @@ static unsigned long long read8(struct tep_handle *pevent) > > if (do_read(&data, 8) < 0) > return 0; > - return __data2host8(pevent, data); > + return __tep_data2host8(pevent, data); > } > > static char *read_string(void)
On Tue, 18 Sep 2018 22:35:11 -0400 Steven Rostedt <rostedt@goodmis.org> wrote: > Hi Tzvetomir, > > I applied all but the last two (starting with this one). > > On Fri, 10 Aug 2018 16:17:31 +0300 > "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com> wrote: > > > In order to make libtraceevent into a proper library, variables, data > > structures and functions require a unique prefix to prevent name space > > conflicts. That prefix will be "tep_". This adds prefix tep_ to > > enum filter_trivial_type and all its members, and renames data2host*() APIs > > Please break out the rename of data2host*() from this patch and make it > a separate patch. Those two changes don't group well together. They are > two different entities. I take that back. I applied the last patch too. Please just resubmit this one as two patches. Thanks! -- Steve
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c index 5a6e29c4b5cf..29e0825fbb92 100644 --- a/tools/lib/traceevent/event-parse.c +++ b/tools/lib/traceevent/event-parse.c @@ -3344,11 +3344,11 @@ unsigned long long tep_read_number(struct tep_handle *pevent, case 1: return *(unsigned char *)ptr; case 2: - return data2host2(pevent, ptr); + return tep_data2host2(pevent, ptr); case 4: - return data2host4(pevent, ptr); + return tep_data2host4(pevent, ptr); case 8: - return data2host8(pevent, ptr); + return tep_data2host8(pevent, ptr); default: /* BUG! */ return 0; @@ -4074,7 +4074,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 = data2host4(pevent, data + arg->string.offset); + str_offset = tep_data2host4(pevent, data + arg->string.offset); str_offset &= 0xffff; print_str_to_seq(s, format, len_arg, ((char *)data) + str_offset); break; @@ -4092,7 +4092,7 @@ 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 = data2host4(pevent, data + arg->bitmask.offset); + bitmask_offset = tep_data2host4(pevent, data + arg->bitmask.offset); bitmask_size = bitmask_offset >> 16; bitmask_offset &= 0xffff; print_bitmask_to_seq(pevent, s, format, len_arg, diff --git a/tools/lib/traceevent/event-parse.h b/tools/lib/traceevent/event-parse.h index 52355417f3de..4b0ab69f6b3a 100644 --- a/tools/lib/traceevent/event-parse.h +++ b/tools/lib/traceevent/event-parse.h @@ -538,7 +538,7 @@ static inline void tep_set_flag(struct tep_handle *pevent, int flag) } static inline unsigned short -__data2host2(struct tep_handle *pevent, unsigned short data) +__tep_data2host2(struct tep_handle *pevent, unsigned short data) { unsigned short swap; @@ -552,7 +552,7 @@ __data2host2(struct tep_handle *pevent, unsigned short data) } static inline unsigned int -__data2host4(struct tep_handle *pevent, unsigned int data) +__tep_data2host4(struct tep_handle *pevent, unsigned int data) { unsigned int swap; @@ -568,7 +568,7 @@ __data2host4(struct tep_handle *pevent, unsigned int data) } static inline unsigned long long -__data2host8(struct tep_handle *pevent, unsigned long long data) +__tep_data2host8(struct tep_handle *pevent, unsigned long long data) { unsigned long long swap; @@ -587,14 +587,14 @@ __data2host8(struct tep_handle *pevent, unsigned long long data) return swap; } -#define data2host2(pevent, ptr) __data2host2(pevent, *(unsigned short *)(ptr)) -#define data2host4(pevent, ptr) __data2host4(pevent, *(unsigned int *)(ptr)) -#define data2host8(pevent, ptr) \ +#define tep_data2host2(pevent, ptr) __tep_data2host2(pevent, *(unsigned short *)(ptr)) +#define tep_data2host4(pevent, ptr) __tep_data2host4(pevent, *(unsigned int *)(ptr)) +#define tep_data2host8(pevent, ptr) \ ({ \ unsigned long long __val; \ \ memcpy(&__val, (ptr), sizeof(unsigned long long)); \ - __data2host8(pevent, __val); \ + __tep_data2host8(pevent, __val); \ }) static inline int tep_host_bigendian(void) @@ -947,10 +947,10 @@ 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 filter_trivial_type { - FILTER_TRIVIAL_FALSE, - FILTER_TRIVIAL_TRUE, - FILTER_TRIVIAL_BOTH, +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, @@ -968,7 +968,7 @@ 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 filter_trivial_type type); + enum tep_filter_trivial_type type); void tep_filter_free(struct tep_event_filter *filter); @@ -979,12 +979,12 @@ int tep_filter_remove_event(struct tep_event_filter *filter, int tep_filter_event_has_trivial(struct tep_event_filter *filter, int event_id, - enum filter_trivial_type type); + 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 filter_trivial_type type); + enum tep_filter_trivial_type type); int tep_filter_compare(struct tep_event_filter *filter1, struct tep_event_filter *filter2); diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c index daa205d9a930..c4a5404f5f2b 100644 --- a/tools/lib/traceevent/parse-filter.c +++ b/tools/lib/traceevent/parse-filter.c @@ -1548,7 +1548,7 @@ int tep_filter_copy(struct tep_event_filter *dest, struct tep_event_filter *sour * events may have still been updated on error. */ int tep_update_trivial(struct tep_event_filter *dest, struct tep_event_filter *source, - enum filter_trivial_type type) + enum tep_filter_trivial_type type) { struct tep_handle *src_pevent; struct tep_handle *dest_pevent; @@ -1570,8 +1570,8 @@ int tep_update_trivial(struct tep_event_filter *dest, struct tep_event_filter *s arg = filter_type->filter; if (arg->type != TEP_FILTER_ARG_BOOLEAN) continue; - if ((arg->boolean.value && type == FILTER_TRIVIAL_FALSE) || - (!arg->boolean.value && type == FILTER_TRIVIAL_TRUE)) + if ((arg->boolean.value && type == TEP_FILTER_TRIVIAL_FALSE) || + (!arg->boolean.value && type == TEP_FILTER_TRIVIAL_TRUE)) continue; event = filter_type->event; @@ -1607,7 +1607,7 @@ int tep_update_trivial(struct tep_event_filter *dest, struct tep_event_filter *s * Returns 0 on success and -1 if there was a problem. */ int tep_filter_clear_trivial(struct tep_event_filter *filter, - enum filter_trivial_type type) + enum tep_filter_trivial_type type) { struct tep_filter_type *filter_type; int count = 0; @@ -1628,11 +1628,11 @@ int tep_filter_clear_trivial(struct tep_event_filter *filter, if (filter_type->filter->type != TEP_FILTER_ARG_BOOLEAN) continue; switch (type) { - case FILTER_TRIVIAL_FALSE: + case TEP_FILTER_TRIVIAL_FALSE: if (filter_type->filter->boolean.value) continue; break; - case FILTER_TRIVIAL_TRUE: + case TEP_FILTER_TRIVIAL_TRUE: if (!filter_type->filter->boolean.value) continue; default: @@ -1670,7 +1670,7 @@ int tep_filter_clear_trivial(struct tep_event_filter *filter, */ int tep_filter_event_has_trivial(struct tep_event_filter *filter, int event_id, - enum filter_trivial_type type) + enum tep_filter_trivial_type type) { struct tep_filter_type *filter_type; @@ -1686,10 +1686,10 @@ int tep_filter_event_has_trivial(struct tep_event_filter *filter, return 0; switch (type) { - case FILTER_TRIVIAL_FALSE: + case TEP_FILTER_TRIVIAL_FALSE: return !filter_type->filter->boolean.value; - case FILTER_TRIVIAL_TRUE: + case TEP_FILTER_TRIVIAL_TRUE: return filter_type->filter->boolean.value; default: return 1; @@ -2423,8 +2423,8 @@ int tep_filter_compare(struct tep_event_filter *filter1, struct tep_event_filter if (filter_type1->filter->type != filter_type2->filter->type) break; switch (filter_type1->filter->type) { - case FILTER_TRIVIAL_FALSE: - case FILTER_TRIVIAL_TRUE: + case TEP_FILTER_TRIVIAL_FALSE: + case TEP_FILTER_TRIVIAL_TRUE: /* trivial types just need the type compared */ continue; default: diff --git a/tools/perf/util/trace-event-read.c b/tools/perf/util/trace-event-read.c index 3dfc1db6b25b..b98ee2a2eb44 100644 --- a/tools/perf/util/trace-event-read.c +++ b/tools/perf/util/trace-event-read.c @@ -102,7 +102,7 @@ static unsigned int read4(struct tep_handle *pevent) if (do_read(&data, 4) < 0) return 0; - return __data2host4(pevent, data); + return __tep_data2host4(pevent, data); } static unsigned long long read8(struct tep_handle *pevent) @@ -111,7 +111,7 @@ static unsigned long long read8(struct tep_handle *pevent) if (do_read(&data, 8) < 0) return 0; - return __data2host8(pevent, data); + return __tep_data2host8(pevent, data); } static char *read_string(void)
In order to make libtraceevent into a proper library, variables, data structures and functions require a unique prefix to prevent name space conflicts. That prefix will be "tep_". This adds prefix tep_ to enum filter_trivial_type and all its members, and renames data2host*() APIs Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com> --- tools/lib/traceevent/event-parse.c | 10 +++++----- tools/lib/traceevent/event-parse.h | 28 ++++++++++++++-------------- tools/lib/traceevent/parse-filter.c | 22 +++++++++++----------- tools/perf/util/trace-event-read.c | 4 ++-- 4 files changed, 32 insertions(+), 32 deletions(-)