Rename ctf_event to ctf_event_declaration

Signed-off-by: Julien Desfossez <julien.desfossez@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c
index aa07b7cab770a55e25d59a09bdcef8270cc9aaa1..3b38ecaca9671fe88815ea5639ef264797f3212b 100644 (file)
--- 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;
                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;
        struct ctf_event_definition *event;
        uint64_t id;
        int ret;

diff --git a/formats/ctf/callbacks.c b/formats/ctf/callbacks.c
index e27a6a3d31c18c31245c5c23c983281d14c97057..0b4da9c5599c4e2b995e0c41553f2babda53a231 100644 (file)
--- 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_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;
 
        struct ctf_event_definition *event;
        uint64_t id = stream->event_id;
 

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index 22051f18b027c922470b6bd5a069562a87f744e2..c2a1e17d03a3c513850c8ca4baf5fc13c97c862b 100644 (file)
--- 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,
 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);
 
 {
        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++) {
        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)
                struct ctf_event_definition *stream_event;
 
                if (!event)

diff --git a/formats/ctf/events.c b/formats/ctf/events.c
index 5b8811132ebef9c2abb077b2ec2ace4be1587269..71665ce01442aeadf3af2d276014eb797faf1b46 100644 (file)
--- 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)
 {
 
 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)
        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 9c381c5fac8a673d23d8e3a4ca080051d2ddf209..52e0cf3f9140a6bcf44b405fc4a461f2ad76ecfa 100644 (file)
--- 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
 }
 
 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;
 
 {
        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;
 {
        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) {
        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 fb78439b5491e0c2d907775899fa5ebea253f5ec..bd5288a7088e079e47fc8ae01632350ccdcbd7a1 100644 (file)
--- 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_trace;
 struct ctf_stream_declaration;
 struct ctf_stream_definition;

-struct ctf_event;
+struct ctf_event_declaration;

 struct ctf_stream_definition;
 struct ctf_clock;
 
 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;
        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;
        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);                                   \
        })
 
                (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 */
        /* stream mapped by stream_id */
        struct ctf_stream_declaration *stream;
        /* parent is lexical scope conaining the event scope */