Revert "Add event header accessors and support for custom event headers"

[babeltrace.git] / formats / ctf / ir / stream-class.c

diff --git a/formats/ctf/ir/stream-class.c b/formats/ctf/ir/stream-class.c
index 48c3d4c5c10970a37b8219a862c555185d45115b..058f4b29ecd1765f6a7d0521d58c02eb559a73c5 100644 (file)
--- a/formats/ctf/ir/stream-class.c
+++ b/formats/ctf/ir/stream-class.c
@@ -151,7 +151,7 @@ int bt_ctf_stream_class_set_id(struct bt_ctf_stream_class *stream_class,
 {
        int ret = 0;
 
-       if (!stream_class) {
+       if (!stream_class || stream_class->frozen) {
                ret = -1;
                goto end;
        }
@@ -203,27 +203,28 @@ end:
        return ret;
 }
 
-int64_t bt_ctf_stream_class_get_event_class_count(
+int bt_ctf_stream_class_get_event_class_count(
                struct bt_ctf_stream_class *stream_class)
 {
-       int64_t ret;
+       int ret;
 
        if (!stream_class) {
                ret = -1;
                goto end;
        }
 
-       ret = (int64_t) stream_class->event_classes->len;
+       ret = (int) stream_class->event_classes->len;
 end:
        return ret;
 }
 
 struct bt_ctf_event_class *bt_ctf_stream_class_get_event_class(
-               struct bt_ctf_stream_class *stream_class, size_t index)
+               struct bt_ctf_stream_class *stream_class, int index)
 {
        struct bt_ctf_event_class *event_class = NULL;
 
-       if (!stream_class || index >= stream_class->event_classes->len) {
+       if (!stream_class || index < 0 ||
+               index >= stream_class->event_classes->len) {
                goto end;
        }
 
@@ -285,13 +286,13 @@ int bt_ctf_stream_class_set_packet_context_type(
 {
        int ret = 0;
 
-       if (!stream_class || !packet_context_type) {
+       if (!stream_class || !packet_context_type || stream_class->frozen) {
                ret = -1;
                goto end;
        }
 
        assert(stream_class->packet_context_type);
-       if (bt_ctf_field_type_get_type_id(stream_class->packet_context_type) !=
+       if (bt_ctf_field_type_get_type_id(packet_context_type) !=
                CTF_TYPE_STRUCT) {
                /* A packet context must be a structure */
                ret = -1;
@@ -305,6 +306,47 @@ end:
        return ret;
 }
 
+struct bt_ctf_field_type *bt_ctf_stream_class_get_event_context_type(
+               struct bt_ctf_stream_class *stream_class)
+{
+       struct bt_ctf_field_type *ret = NULL;
+
+       if (!stream_class || !stream_class->event_context_type) {
+               goto end;
+       }
+
+       assert(stream_class->event_context_type);
+       bt_ctf_field_type_get(stream_class->event_context_type);
+       ret = stream_class->event_context_type;
+end:
+       return ret;
+}
+
+int bt_ctf_stream_class_set_event_context_type(
+               struct bt_ctf_stream_class *stream_class,
+               struct bt_ctf_field_type *event_context_type)
+{
+       int ret = 0;
+
+       if (!stream_class || !event_context_type || stream_class->frozen) {
+               ret = -1;
+               goto end;
+       }
+
+       if (bt_ctf_field_type_get_type_id(event_context_type) !=
+               CTF_TYPE_STRUCT) {
+               /* A packet context must be a structure */
+               ret = -1;
+               goto end;
+       }
+
+       bt_ctf_field_type_put(stream_class->event_context_type);
+       bt_ctf_field_type_get(event_context_type);
+       stream_class->event_context_type = event_context_type;
+end:
+       return ret;
+}
+
 void bt_ctf_stream_class_get(struct bt_ctf_stream_class *stream_class)
 {
        if (!stream_class) {
@@ -332,6 +374,7 @@ void bt_ctf_stream_class_freeze(struct bt_ctf_stream_class *stream_class)
 
        stream_class->frozen = 1;
        bt_ctf_field_type_freeze(stream_class->packet_context_type);
+       bt_ctf_field_type_freeze(stream_class->event_context_type);
        bt_ctf_clock_freeze(stream_class->clock);
        g_ptr_array_foreach(stream_class->event_classes,
                (GFunc)bt_ctf_event_class_freeze, NULL);
@@ -439,8 +482,9 @@ void bt_ctf_stream_class_destroy(struct bt_ctf_ref *ref)
        bt_ctf_field_type_put(stream_class->event_header_type);
        bt_ctf_field_put(stream_class->event_header);
        bt_ctf_field_type_put(stream_class->packet_context_type);
-       bt_ctf_field_type_put(stream_class->event_context_type);
-       bt_ctf_field_put(stream_class->event_context);
+       if (stream_class->event_context_type) {
+               bt_ctf_field_type_put(stream_class->event_context_type);
+       }
        g_free(stream_class);
 }