X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fir%2Fstream-class.c;h=aba76cd17229dbc452c45312670ff0950705b0c8;hb=29664b2a3a15c7233d916887d2f58fc42e18521e;hp=9ef5ca790d7bbf8c8fec5ed95620b2ec5f422cef;hpb=0d23acbeeb27ebede2278c50c2c7e0fe0b1ae8d2;p=babeltrace.git

diff --git a/formats/ctf/ir/stream-class.c b/formats/ctf/ir/stream-class.c
index 9ef5ca79..aba76cd1 100644
--- a/formats/ctf/ir/stream-class.c
+++ b/formats/ctf/ir/stream-class.c
@@ -87,6 +87,23 @@ error:
 	return stream_class;
 }
 
+struct bt_ctf_trace *bt_ctf_stream_class_get_trace(
+		struct bt_ctf_stream_class *stream_class)
+{
+	struct bt_ctf_trace *trace = NULL;
+
+	if (!stream_class) {
+		goto end;
+	}
+
+	trace = stream_class->trace;
+	if (trace) {
+		bt_ctf_trace_get(trace);
+	}
+end:
+	return trace;
+}
+
 const char *bt_ctf_stream_class_get_name(
 		struct bt_ctf_stream_class *stream_class)
 {
@@ -202,13 +219,36 @@ int _bt_ctf_stream_class_set_id(
 	return 0;
 }
 
-int bt_ctf_stream_class_set_id(struct bt_ctf_stream_class *stream_class,
-		uint32_t id)
+struct event_class_set_stream_id_data {
+	uint32_t stream_id;
+	int ret;
+};
+
+static
+void event_class_set_stream_id(gpointer event_class, gpointer data)
+{
+	struct event_class_set_stream_id_data *typed_data = data;
+
+	typed_data->ret |= bt_ctf_event_class_set_stream_id(event_class,
+		typed_data->stream_id);
+}
+
+BT_HIDDEN
+int bt_ctf_stream_class_set_id_no_check(
+		struct bt_ctf_stream_class *stream_class, uint32_t id)
 {
 	int ret = 0;
+	struct event_class_set_stream_id_data data =
+		{ .stream_id = id, .ret = 0 };
 
-	if (!stream_class || stream_class->frozen) {
-		ret = -1;
+	/*
+	 * Make sure all event classes have their "stream_id" attribute
+	 * set to this value.
+	 */
+	g_ptr_array_foreach(stream_class->event_classes,
+		event_class_set_stream_id, &data);
+	ret = data.ret;
+	if (ret) {
 		goto end;
 	}
 
@@ -220,6 +260,21 @@ end:
 	return ret;
 }
 
+int bt_ctf_stream_class_set_id(struct bt_ctf_stream_class *stream_class,
+		uint32_t id)
+{
+	int ret = 0;
+
+	if (!stream_class || stream_class->frozen) {
+		ret = -1;
+		goto end;
+	}
+
+	ret = bt_ctf_stream_class_set_id_no_check(stream_class, id);
+end:
+	return ret;
+}
+
 static
 void event_class_exists(gpointer element, gpointer query)
 {
@@ -300,6 +355,11 @@ int bt_ctf_stream_class_add_event_class(
 		goto end;
 	}
 
+	ret = bt_ctf_event_class_set_stream_id(event_class, stream_class->id);
+	if (ret) {
+		goto end;
+	}
+
 	bt_ctf_event_class_get(event_class);
 	g_ptr_array_add(stream_class->event_classes, event_class);
 	bt_ctf_event_class_freeze(event_class);
@@ -666,6 +726,28 @@ end:
 	return ret;
 }
 
+BT_HIDDEN
+int bt_ctf_stream_class_set_trace(struct bt_ctf_stream_class *stream_class,
+		struct bt_ctf_trace *trace)
+{
+	int ret = 0;
+
+	if (!stream_class) {
+		ret = -1;
+		goto end;
+	}
+
+	if (stream_class->trace && trace) {
+		/* Already attached to a trace */
+		ret = -1;
+		goto end;
+	}
+
+	stream_class->trace = trace;
+end:
+	return ret;
+}
+
 static
 void bt_ctf_stream_class_destroy(struct bt_ctf_ref *ref)
 {