[PATCH 4/9] tools/lib/traceevent, tools/perf: Rename struct tep_event_format to struct tep_event
From: Tzvetomir Stoyanov
In order to make libtraceevent into a proper library, variables, data
structures and functions require a unique prefix to prevent name space
conflicts. This renames struct tep_event_format to struct tep_event,
which describes more closely the purpose of the struct.
Signed-off-by: Tzvetomir Stoyanov
Signed-off-by: Steven Rostedt (VMware)
---
tools/lib/traceevent/event-parse-api.c| 2 +-
tools/lib/traceevent/event-parse-local.h | 6 +-
tools/lib/traceevent/event-parse.c| 188 +-
tools/lib/traceevent/event-parse.h| 62 +++---
tools/lib/traceevent/parse-filter.c | 42 ++--
tools/lib/traceevent/plugin_function.c| 2 +-
tools/lib/traceevent/plugin_hrtimer.c | 4 +-
tools/lib/traceevent/plugin_kmem.c| 2 +-
tools/lib/traceevent/plugin_kvm.c | 14 +-
tools/lib/traceevent/plugin_mac80211.c| 4 +-
tools/lib/traceevent/plugin_sched_switch.c| 4 +-
tools/perf/builtin-trace.c| 2 +-
tools/perf/util/evsel.h | 4 +-
tools/perf/util/header.c | 2 +-
tools/perf/util/python.c | 4 +-
.../util/scripting-engines/trace-event-perl.c | 6 +-
.../scripting-engines/trace-event-python.c| 8 +-
tools/perf/util/trace-event-parse.c | 16 +-
tools/perf/util/trace-event.c | 8 +-
tools/perf/util/trace-event.h | 16 +-
20 files changed, 198 insertions(+), 198 deletions(-)
diff --git a/tools/lib/traceevent/event-parse-api.c
b/tools/lib/traceevent/event-parse-api.c
index 61f7149085ee..0dc011154ee9 100644
--- a/tools/lib/traceevent/event-parse-api.c
+++ b/tools/lib/traceevent/event-parse-api.c
@@ -15,7 +15,7 @@
* This returns pointer to the first element of the events array
* If @tep is NULL, NULL is returned.
*/
-struct tep_event_format *tep_get_first_event(struct tep_handle *tep)
+struct tep_event *tep_get_first_event(struct tep_handle *tep)
{
if (tep && tep->events)
return tep->events[0];
diff --git a/tools/lib/traceevent/event-parse-local.h
b/tools/lib/traceevent/event-parse-local.h
index b9bddde577f8..94746efef433 100644
--- a/tools/lib/traceevent/event-parse-local.h
+++ b/tools/lib/traceevent/event-parse-local.h
@@ -50,9 +50,9 @@ struct tep_handle {
unsigned int printk_count;
- struct tep_event_format **events;
+ struct tep_event **events;
int nr_events;
- struct tep_event_format **sort_events;
+ struct tep_event **sort_events;
enum tep_event_sort_type last_type;
int type_offset;
@@ -84,7 +84,7 @@ struct tep_handle {
struct tep_function_handler *func_handlers;
/* cache */
- struct tep_event_format *last_event;
+ struct tep_event *last_event;
char *trace_clock;
};
diff --git a/tools/lib/traceevent/event-parse.c
b/tools/lib/traceevent/event-parse.c
index a5f3e37f81b5..bacd86c41563 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -96,7 +96,7 @@ struct tep_function_handler {
static unsigned long long
process_defined_func(struct trace_seq *s, void *data, int size,
-struct tep_event_format *event, struct tep_print_arg *arg);
+struct tep_event *event, struct tep_print_arg *arg);
static void free_func_handle(struct tep_function_handler *func);
@@ -739,16 +739,16 @@ void tep_print_printk(struct tep_handle *pevent)
}
}
-static struct tep_event_format *alloc_event(void)
+static struct tep_event *alloc_event(void)
{
- return calloc(1, sizeof(struct tep_event_format));
+ return calloc(1, sizeof(struct tep_event));
}
-static int add_event(struct tep_handle *pevent, struct tep_event_format *event)
+static int add_event(struct tep_handle *pevent, struct tep_event *event)
{
int i;
- struct tep_event_format **events = realloc(pevent->events,
sizeof(event) *
- (pevent->nr_events + 1));
+ struct tep_event **events = realloc(pevent->events, sizeof(event) *
+ (pevent->nr_events + 1));
if (!events)
return -1;
@@ -1355,7 +1355,7 @@ static unsigned int type_size(const char *name)
return 0;
}
-static int event_read_fields(struct tep_event_format *event, struct
tep_format_field **fields)
+static int event_read_fields(struct tep_event *event, struct tep_format_field
**fields)
{
struct tep_format_field *field = NULL;
enum tep_event_type type;
@@ -1642,7 +1642,7 @@ static int event_read_fields(struct tep_event_format
*event, struct tep_format_f
return -1;
}
-static int event_read_format(struct tep_event_format *event)
+static int event_read_format(struct tep_event *event)
{
char *token;
int ret;
@@ -1675,11
[PATCH 4/9] tools/lib/traceevent, tools/perf: Rename struct tep_event_format to struct tep_event
From: Tzvetomir Stoyanov
In order to make libtraceevent into a proper library, variables, data
structures and functions require a unique prefix to prevent name space
conflicts. This renames struct tep_event_format to struct tep_event,
which describes more closely the purpose of the struct.
Signed-off-by: Tzvetomir Stoyanov
Signed-off-by: Steven Rostedt (VMware)
---
tools/lib/traceevent/event-parse-api.c| 2 +-
tools/lib/traceevent/event-parse-local.h | 6 +-
tools/lib/traceevent/event-parse.c| 188 +-
tools/lib/traceevent/event-parse.h| 62 +++---
tools/lib/traceevent/parse-filter.c | 42 ++--
tools/lib/traceevent/plugin_function.c| 2 +-
tools/lib/traceevent/plugin_hrtimer.c | 4 +-
tools/lib/traceevent/plugin_kmem.c| 2 +-
tools/lib/traceevent/plugin_kvm.c | 14 +-
tools/lib/traceevent/plugin_mac80211.c| 4 +-
tools/lib/traceevent/plugin_sched_switch.c| 4 +-
tools/perf/builtin-trace.c| 2 +-
tools/perf/util/evsel.h | 4 +-
tools/perf/util/header.c | 2 +-
tools/perf/util/python.c | 4 +-
.../util/scripting-engines/trace-event-perl.c | 6 +-
.../scripting-engines/trace-event-python.c| 8 +-
tools/perf/util/trace-event-parse.c | 16 +-
tools/perf/util/trace-event.c | 8 +-
tools/perf/util/trace-event.h | 16 +-
20 files changed, 198 insertions(+), 198 deletions(-)
diff --git a/tools/lib/traceevent/event-parse-api.c
b/tools/lib/traceevent/event-parse-api.c
index 61f7149085ee..0dc011154ee9 100644
--- a/tools/lib/traceevent/event-parse-api.c
+++ b/tools/lib/traceevent/event-parse-api.c
@@ -15,7 +15,7 @@
* This returns pointer to the first element of the events array
* If @tep is NULL, NULL is returned.
*/
-struct tep_event_format *tep_get_first_event(struct tep_handle *tep)
+struct tep_event *tep_get_first_event(struct tep_handle *tep)
{
if (tep && tep->events)
return tep->events[0];
diff --git a/tools/lib/traceevent/event-parse-local.h
b/tools/lib/traceevent/event-parse-local.h
index b9bddde577f8..94746efef433 100644
--- a/tools/lib/traceevent/event-parse-local.h
+++ b/tools/lib/traceevent/event-parse-local.h
@@ -50,9 +50,9 @@ struct tep_handle {
unsigned int printk_count;
- struct tep_event_format **events;
+ struct tep_event **events;
int nr_events;
- struct tep_event_format **sort_events;
+ struct tep_event **sort_events;
enum tep_event_sort_type last_type;
int type_offset;
@@ -84,7 +84,7 @@ struct tep_handle {
struct tep_function_handler *func_handlers;
/* cache */
- struct tep_event_format *last_event;
+ struct tep_event *last_event;
char *trace_clock;
};
diff --git a/tools/lib/traceevent/event-parse.c
b/tools/lib/traceevent/event-parse.c
index a5f3e37f81b5..bacd86c41563 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -96,7 +96,7 @@ struct tep_function_handler {
static unsigned long long
process_defined_func(struct trace_seq *s, void *data, int size,
-struct tep_event_format *event, struct tep_print_arg *arg);
+struct tep_event *event, struct tep_print_arg *arg);
static void free_func_handle(struct tep_function_handler *func);
@@ -739,16 +739,16 @@ void tep_print_printk(struct tep_handle *pevent)
}
}
-static struct tep_event_format *alloc_event(void)
+static struct tep_event *alloc_event(void)
{
- return calloc(1, sizeof(struct tep_event_format));
+ return calloc(1, sizeof(struct tep_event));
}
-static int add_event(struct tep_handle *pevent, struct tep_event_format *event)
+static int add_event(struct tep_handle *pevent, struct tep_event *event)
{
int i;
- struct tep_event_format **events = realloc(pevent->events,
sizeof(event) *
- (pevent->nr_events + 1));
+ struct tep_event **events = realloc(pevent->events, sizeof(event) *
+ (pevent->nr_events + 1));
if (!events)
return -1;
@@ -1355,7 +1355,7 @@ static unsigned int type_size(const char *name)
return 0;
}
-static int event_read_fields(struct tep_event_format *event, struct
tep_format_field **fields)
+static int event_read_fields(struct tep_event *event, struct tep_format_field
**fields)
{
struct tep_format_field *field = NULL;
enum tep_event_type type;
@@ -1642,7 +1642,7 @@ static int event_read_fields(struct tep_event_format
*event, struct tep_format_f
return -1;
}
-static int event_read_format(struct tep_event_format *event)
+static int event_read_format(struct tep_event *event)
{
char *token;
int ret;
@@ -1675,11
