ir: stream: add bt_ctf_stream_is_writer()

[babeltrace.git] / formats / ctf / ir / trace.c

diff --git a/formats/ctf/ir/trace.c b/formats/ctf/ir/trace.c
index 55967275a84d56fea4202c06b96caee745db697f..dfb815514f55a145fa2c10ea2a3c7f3c090a4079 100644 (file)
--- a/formats/ctf/ir/trace.c
+++ b/formats/ctf/ir/trace.c
@@ -124,6 +124,38 @@ error:
        return trace;
 }
 
+const char *bt_ctf_trace_get_name(struct bt_ctf_trace *trace)
+{
+       const char *name = NULL;
+
+       if (!trace || !trace->name) {
+               goto end;
+       }
+
+       name = trace->name->str;
+end:
+       return name;
+}
+
+int bt_ctf_trace_set_name(struct bt_ctf_trace *trace, const char *name)
+{
+       int ret = 0;
+
+       if (!trace || !name || trace->frozen) {
+               ret = -1;
+               goto end;
+       }
+
+       trace->name = trace->name ? g_string_assign(trace->name, name) :
+                       g_string_new(name);
+       if (!trace->name) {
+               ret = -1;
+               goto end;
+       }
+end:
+       return ret;
+}
+
 void bt_ctf_trace_destroy(struct bt_object *obj)
 {
        struct bt_ctf_trace *trace;
@@ -133,6 +165,10 @@ void bt_ctf_trace_destroy(struct bt_object *obj)
                bt_ctf_attributes_destroy(trace->environment);
        }
 
+       if (trace->name) {
+               g_string_free(trace->name, TRUE);
+       }
+
        if (trace->clocks) {
                g_ptr_array_free(trace->clocks, TRUE);
        }
@@ -660,7 +696,7 @@ int bt_ctf_trace_add_stream_class(struct bt_ctf_trace *trace,
 
        /* Notifiy listeners of the trace's schema modification. */
        bt_ctf_stream_class_visit(stream_class,
-                       bt_ctf_trace_element_modification, trace);
+                       bt_ctf_trace_object_modification, trace);
 end:
        if (ret) {
                bt_object_set_parent(stream_class, NULL);
@@ -1037,21 +1073,21 @@ int bt_ctf_trace_set_packet_header_type(struct bt_ctf_trace *trace,
 {
        int ret = 0;
 
-       if (!trace || !packet_header_type || trace->frozen) {
+       if (!trace || trace->frozen) {
                ret = -1;
                goto end;
        }
 
-       /* packet_header_type must be a structure */
-       if (bt_ctf_field_type_get_type_id(packet_header_type) !=
-               BT_CTF_TYPE_ID_STRUCT) {
+       /* packet_header_type must be a structure. */
+       if (packet_header_type &&
+                       bt_ctf_field_type_get_type_id(packet_header_type) !=
+                               BT_CTF_TYPE_ID_STRUCT) {
                ret = -1;
                goto end;
        }
 
-       bt_get(packet_header_type);
        bt_put(trace->packet_header_type);
-       trace->packet_header_type = packet_header_type;
+       trace->packet_header_type = bt_get(packet_header_type);
 end:
        return ret;
 }
@@ -1071,35 +1107,35 @@ void *get_stream_class(void *element, int i)
 }
 
 static
-int visit_stream_class(void *element, bt_ctf_ir_visitor visitor,void *data)
+int visit_stream_class(void *object, bt_ctf_visitor visitor,void *data)
 {
-       return bt_ctf_stream_class_visit(element, visitor, data);
+       return bt_ctf_stream_class_visit(object, visitor, data);
 }
 
 int bt_ctf_trace_visit(struct bt_ctf_trace *trace,
-               bt_ctf_ir_visitor visitor, void *data)
+               bt_ctf_visitor visitor, void *data)
 {
        int ret;
-       struct bt_ctf_ir_element element =
-                       { .element = trace, .type = BT_CTF_IR_TYPE_TRACE };
+       struct bt_ctf_object obj =
+                       { .object = trace, .type = BT_CTF_OBJECT_TYPE_TRACE };
 
        if (!trace || !visitor) {
                ret = -1;
                goto end;
        }
 
-       ret = visitor_helper(&element, get_stream_class_count,
+       ret = visitor_helper(&obj, get_stream_class_count,
                        get_stream_class, visit_stream_class, visitor, data);
 end:
        return ret;
 }
 
 static
-int invoke_listener(struct bt_ctf_ir_element *element, void *data)
+int invoke_listener(struct bt_ctf_object *object, void *data)
 {
        struct listener_wrapper *listener_wrapper = data;
 
-       listener_wrapper->listener(element, listener_wrapper->data);
+       listener_wrapper->listener(object, listener_wrapper->data);
        return 0;
 }
 
@@ -1136,14 +1172,14 @@ error:
 }
 
 BT_HIDDEN
-int bt_ctf_trace_element_modification(struct bt_ctf_ir_element *element,
+int bt_ctf_trace_object_modification(struct bt_ctf_object *object,
                void *trace_ptr)
 {
        size_t i;
        struct bt_ctf_trace *trace = trace_ptr;
 
        assert(trace);
-       assert(element);
+       assert(object);
 
        if (trace->listeners->len == 0) {
                goto end;
@@ -1153,7 +1189,7 @@ int bt_ctf_trace_element_modification(struct bt_ctf_ir_element *element,
                struct listener_wrapper *listener =
                                g_ptr_array_index(trace->listeners, i);
 
-               listener->listener(element, listener->data);
+               listener->listener(object, listener->data);
        }
 end:
        return 0;