From c716f83b53677d5f2e6a15463408f464006eafb7 Mon Sep 17 00:00:00 2001 From: Julien Desfossez Date: Fri, 30 Mar 2012 15:47:37 -0400 Subject: [PATCH] Rename ctf_stream_event to ctf_event_definition Signed-off-by: Julien Desfossez Signed-off-by: Mathieu Desnoyers --- formats/ctf-text/ctf-text.c | 2 +- formats/ctf/callbacks.c | 4 ++-- formats/ctf/ctf.c | 12 ++++++------ include/babeltrace/ctf-ir/metadata.h | 4 ++-- include/babeltrace/ctf/events-internal.h | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c index 8aeae362..a4316e8f 100644 --- a/formats/ctf-text/ctf-text.c +++ b/formats/ctf-text/ctf-text.c @@ -219,7 +219,7 @@ int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream *stream) struct ctf_stream_declaration *stream_class = stream->stream_class; int field_nr_saved; struct ctf_event *event_class; - struct ctf_stream_event *event; + struct ctf_event_definition *event; uint64_t id; int ret; int dom_print = 0; diff --git a/formats/ctf/callbacks.c b/formats/ctf/callbacks.c index ea41344a..6130911f 100644 --- a/formats/ctf/callbacks.c +++ b/formats/ctf/callbacks.c @@ -146,11 +146,11 @@ int bt_ctf_iter_add_callback(struct bt_ctf_iter *iter, } static -struct ctf_stream_event *extract_ctf_stream_event(struct ctf_stream *stream) +struct ctf_event_definition *extract_ctf_stream_event(struct ctf_stream *stream) { struct ctf_stream_declaration *stream_class = stream->stream_class; struct ctf_event *event_class; - struct ctf_stream_event *event; + struct ctf_event_definition *event; uint64_t id = stream->event_id; if (id >= stream_class->events_by_id->len) { diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c index 494ba990..22a55e64 100644 --- a/formats/ctf/ctf.c +++ b/formats/ctf/ctf.c @@ -226,7 +226,7 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream) struct ctf_stream_pos *pos = container_of(ppos, struct ctf_stream_pos, parent); struct ctf_stream_declaration *stream_class = stream->stream_class; - struct ctf_stream_event *event; + struct ctf_event_definition *event; uint64_t id = 0; int ret; @@ -338,7 +338,7 @@ static int ctf_write_event(struct stream_pos *pos, struct ctf_stream *stream) { struct ctf_stream_declaration *stream_class = stream->stream_class; - struct ctf_stream_event *event; + struct ctf_event_definition *event; uint64_t id; int ret; @@ -898,11 +898,11 @@ end_stream: } static -struct ctf_stream_event *create_event_definitions(struct ctf_trace *td, +struct ctf_event_definition *create_event_definitions(struct ctf_trace *td, struct ctf_stream *stream, struct ctf_event *event) { - struct ctf_stream_event *stream_event = g_new0(struct ctf_stream_event, 1); + struct ctf_event_definition *stream_event = g_new0(struct ctf_event_definition, 1); if (event->context_decl) { struct definition *definition = @@ -988,7 +988,7 @@ int create_stream_definitions(struct ctf_trace *td, struct ctf_stream *stream) 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_stream_event *stream_event; + struct ctf_event_definition *stream_event; if (!event) continue; @@ -1001,7 +1001,7 @@ int create_stream_definitions(struct ctf_trace *td, struct ctf_stream *stream) error_event: for (i = 0; i < stream->events_by_id->len; i++) { - struct ctf_stream_event *stream_event = g_ptr_array_index(stream->events_by_id, i); + struct ctf_event_definition *stream_event = g_ptr_array_index(stream->events_by_id, i); if (stream_event) g_free(stream_event); } diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h index 75697396..f3e7b68c 100644 --- a/include/babeltrace/ctf-ir/metadata.h +++ b/include/babeltrace/ctf-ir/metadata.h @@ -47,7 +47,7 @@ struct ctf_stream { struct definition_struct *stream_packet_context; struct definition_struct *stream_event_header; struct definition_struct *stream_event_context; - GPtrArray *events_by_id; /* Array of struct ctf_stream_event pointers indexed by id */ + GPtrArray *events_by_id; /* Array of struct ctf_event_definition pointers indexed by id */ struct definition_scope *parent_def_scope; /* for initialization */ int stream_definitions_created; @@ -59,7 +59,7 @@ struct ctf_stream { uint64_t prev_timestamp_end; /* End-of-packet timestamp */ }; -struct ctf_stream_event { +struct ctf_event_definition { struct definition_struct *event_context; struct definition_struct *event_fields; }; diff --git a/include/babeltrace/ctf/events-internal.h b/include/babeltrace/ctf/events-internal.h index 9f579a06..c3ee8fcd 100644 --- a/include/babeltrace/ctf/events-internal.h +++ b/include/babeltrace/ctf/events-internal.h @@ -29,13 +29,13 @@ #include struct ctf_stream; -struct ctf_stream_event; +struct ctf_event_definition; /* * the structure to manipulate events */ struct bt_ctf_event { struct ctf_stream *stream; - struct ctf_stream_event *event; + struct ctf_event_definition *event; }; struct bt_ctf_iter { -- 2.34.1