From 4716614abaa127d6d6722c845a413495d9cb2b6f Mon Sep 17 00:00:00 2001 From: Julien Desfossez Date: Fri, 30 Mar 2012 15:48:32 -0400 Subject: [PATCH] Rename ctf_event to ctf_event_declaration Signed-off-by: Julien Desfossez Signed-off-by: Mathieu Desnoyers --- formats/ctf-text/ctf-text.c | 2 +- formats/ctf/callbacks.c | 2 +- formats/ctf/ctf.c | 4 ++-- formats/ctf/events.c | 2 +- formats/ctf/metadata/ctf-visitor-generate-io-struct.c | 6 +++--- include/babeltrace/ctf-ir/metadata.h | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c index aa07b7ca..3b38ecac 100644 --- a/formats/ctf-text/ctf-text.c +++ b/formats/ctf-text/ctf-text.c @@ -218,7 +218,7 @@ int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition * container_of(ppos, struct ctf_text_stream_pos, parent); struct ctf_stream_declaration *stream_class = stream->stream_class; int field_nr_saved; - struct ctf_event *event_class; + struct ctf_event_declaration *event_class; struct ctf_event_definition *event; uint64_t id; int ret; diff --git a/formats/ctf/callbacks.c b/formats/ctf/callbacks.c index e27a6a3d..0b4da9c5 100644 --- a/formats/ctf/callbacks.c +++ b/formats/ctf/callbacks.c @@ -149,7 +149,7 @@ static struct ctf_event_definition *extract_ctf_stream_event(struct ctf_stream_definition *stream) { struct ctf_stream_declaration *stream_class = stream->stream_class; - struct ctf_event *event_class; + struct ctf_event_declaration *event_class; struct ctf_event_definition *event; uint64_t id = stream->event_id; diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c index 22051f18..c2a1e17d 100644 --- a/formats/ctf/ctf.c +++ b/formats/ctf/ctf.c @@ -900,7 +900,7 @@ end_stream: static struct ctf_event_definition *create_event_definitions(struct ctf_trace *td, struct ctf_stream_definition *stream, - struct ctf_event *event) + struct ctf_event_declaration *event) { struct ctf_event_definition *stream_event = g_new0(struct ctf_event_definition, 1); @@ -987,7 +987,7 @@ int create_stream_definitions(struct ctf_trace *td, struct ctf_stream_definition stream->events_by_id = g_ptr_array_new(); g_ptr_array_set_size(stream->events_by_id, stream_class->events_by_id->len); for (i = 0; i < stream->events_by_id->len; i++) { - struct ctf_event *event = g_ptr_array_index(stream_class->events_by_id, i); + struct ctf_event_declaration *event = g_ptr_array_index(stream_class->events_by_id, i); struct ctf_event_definition *stream_event; if (!event) diff --git a/formats/ctf/events.c b/formats/ctf/events.c index 5b881113..71665ce0 100644 --- a/formats/ctf/events.c +++ b/formats/ctf/events.c @@ -140,7 +140,7 @@ const struct definition *bt_ctf_get_index(const struct bt_ctf_event *event, const char *bt_ctf_event_name(const struct bt_ctf_event *event) { - struct ctf_event *event_class; + struct ctf_event_declaration *event_class; struct ctf_stream_declaration *stream_class; if (!event) diff --git a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c index 9c381c5f..52e0cf3f 100644 --- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c +++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c @@ -1585,7 +1585,7 @@ struct declaration *ctf_type_specifier_list_visit(FILE *fd, } static -int ctf_event_declaration_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_event *event, struct ctf_trace *trace) +int ctf_event_declaration_visit(FILE *fd, int depth, struct ctf_node *node, struct ctf_event_declaration *event, struct ctf_trace *trace) { int ret = 0; @@ -1741,9 +1741,9 @@ int ctf_event_visit(FILE *fd, int depth, struct ctf_node *node, { int ret = 0; struct ctf_node *iter; - struct ctf_event *event; + struct ctf_event_declaration *event; - event = g_new0(struct ctf_event, 1); + event = g_new0(struct ctf_event_declaration, 1); event->declaration_scope = new_declaration_scope(parent_declaration_scope); event->loglevel = -1; bt_list_for_each_entry(iter, &node->u.event.declaration_list, siblings) { diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h index fb78439b..bd5288a7 100644 --- a/include/babeltrace/ctf-ir/metadata.h +++ b/include/babeltrace/ctf-ir/metadata.h @@ -31,7 +31,7 @@ struct ctf_trace; struct ctf_stream_declaration; struct ctf_stream_definition; -struct ctf_event; +struct ctf_event_declaration; struct ctf_stream_definition; struct ctf_clock; @@ -191,7 +191,7 @@ struct ctf_stream_declaration { struct declaration_scope *declaration_scope; /* innermost definition scope. to be used as parent of event. */ struct definition_scope *definition_scope; - GPtrArray *events_by_id; /* Array of struct ctf_event pointers indexed by id */ + GPtrArray *events_by_id; /* Array of struct ctf_event_declaration pointers indexed by id */ GHashTable *event_quark_to_id; /* GQuark to numeric id */ struct declaration_struct *packet_context_decl; @@ -221,7 +221,7 @@ struct ctf_stream_declaration { (ctf_event)->(field); \ }) -struct ctf_event { +struct ctf_event_declaration { /* stream mapped by stream_id */ struct ctf_stream_declaration *stream; /* parent is lexical scope conaining the event scope */ -- 2.34.1