X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fir%2Ftrace.c;h=dfb815514f55a145fa2c10ea2a3c7f3c090a4079;hb=835b2d10c5c80ebad6427ba3794d712dd44ef145;hp=2b3fb0e65e580851e4cf690438ac8b07d54ee8d9;hpb=50ad4244902f4a54207862e0fe289775b2ea22fd;p=babeltrace.git

diff --git a/formats/ctf/ir/trace.c b/formats/ctf/ir/trace.c
index 2b3fb0e6..dfb81551 100644
--- a/formats/ctf/ir/trace.c
+++ b/formats/ctf/ir/trace.c
@@ -111,6 +111,12 @@ struct bt_ctf_trace *bt_ctf_trace_create(void)
 		goto error;
 	}
 
+	trace->listeners = g_ptr_array_new_with_free_func(
+			(GDestroyNotify) g_free);
+	if (!trace->listeners) {
+		goto error;
+	}
+
 	return trace;
 
 error:
@@ -118,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;
@@ -127,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);
 	}
@@ -139,6 +181,10 @@ void bt_ctf_trace_destroy(struct bt_object *obj)
 		g_ptr_array_free(trace->stream_classes, TRUE);
 	}
 
+	if (trace->listeners) {
+		g_ptr_array_free(trace->listeners, TRUE);
+	}
+
 	bt_put(trace->packet_header_type);
 	g_free(trace);
 }
@@ -343,7 +389,7 @@ int bt_ctf_trace_add_clock(struct bt_ctf_trace *trace,
 	int ret = 0;
 	struct search_query query = { .value = clock, .found = 0 };
 
-	if (!trace || !clock) {
+	if (!trace || !bt_ctf_clock_is_valid(clock)) {
 		ret = -1;
 		goto end;
 	}
@@ -420,12 +466,20 @@ int bt_ctf_trace_add_stream_class(struct bt_ctf_trace *trace,
 	struct bt_ctf_field_type *stream_event_ctx_type = NULL;
 	int event_class_count;
 	struct bt_ctf_clock *clock_to_add_to_trace = NULL;
+	struct bt_ctf_trace *current_parent_trace = NULL;
 
 	if (!trace || !stream_class) {
 		ret = -1;
 		goto end;
 	}
 
+	current_parent_trace = bt_ctf_stream_class_get_trace(stream_class);
+	if (current_parent_trace) {
+		/* Stream class is already associated to a trace, abort. */
+		ret = -1;
+		goto end;
+	}
+
 	event_class_count =
 		bt_ctf_stream_class_get_event_class_count(stream_class);
 	assert(event_class_count >= 0);
@@ -640,6 +694,9 @@ int bt_ctf_trace_add_stream_class(struct bt_ctf_trace *trace,
 	bt_ctf_stream_class_freeze(stream_class);
 	bt_ctf_trace_freeze(trace);
 
+	/* Notifiy listeners of the trace's schema modification. */
+	bt_ctf_stream_class_visit(stream_class,
+			bt_ctf_trace_object_modification, trace);
 end:
 	if (ret) {
 		bt_object_set_parent(stream_class, NULL);
@@ -655,6 +712,7 @@ end:
 	g_free(ec_validation_outputs);
 	bt_ctf_validation_output_put_types(&trace_sc_validation_output);
 	BT_PUT(clock_to_add_to_trace);
+	bt_put(current_parent_trace);
 	assert(!packet_header_type);
 	assert(!packet_context_type);
 	assert(!event_header_type);
@@ -1015,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;
 }
@@ -1049,54 +1107,36 @@ 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 ir_visitor(struct bt_ctf_ir_element *element, void *data)
+int invoke_listener(struct bt_ctf_object *object, void *data)
 {
-	int ret = 0;
+	struct listener_wrapper *listener_wrapper = data;
 
-	switch (element->type) {
-	case BT_CTF_IR_TYPE_TRACE:
-	{
-		break;
-	}
-	case BT_CTF_IR_TYPE_STREAM_CLASS:
-	{
-		break;
-	}
-	case BT_CTF_IR_TYPE_EVENT_CLASS:
-	{
-		break;
-	}
-	default:
-		assert(0);
-		ret = -1;
-		goto end;
-	}
-end:
-	return ret;
+	listener_wrapper->listener(object, listener_wrapper->data);
+	return 0;
 }
 
 int bt_ctf_trace_add_listener(struct bt_ctf_trace *trace,
@@ -1115,7 +1155,7 @@ int bt_ctf_trace_add_listener(struct bt_ctf_trace *trace,
 	listener_wrapper->data = listener_data;
 
 	/* Visit the current schema. */
-	ret = bt_ctf_trace_visit(trace, ir_visitor, listener_wrapper);
+	ret = bt_ctf_trace_visit(trace, invoke_listener, listener_wrapper);
 	if (ret) {
 		goto error;
 	}
@@ -1131,6 +1171,30 @@ error:
 	return ret;
 }
 
+BT_HIDDEN
+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(object);
+
+	if (trace->listeners->len == 0) {
+		goto end;
+	}
+
+	for (i = 0; i < trace->listeners->len; i++) {
+		struct listener_wrapper *listener =
+				g_ptr_array_index(trace->listeners, i);
+
+		listener->listener(object, listener->data);
+	}
+end:
+	return 0;
+}
+
 BT_HIDDEN
 struct bt_ctf_field_type *get_field_type(enum field_type_alias alias)
 {