X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Fstream-class.c;h=edeccbecc730391c62857f6c371839da5c9bccbb;hb=26fc5aedf;hp=7abea88491b456bdba8a7876608c99afd23cadf2;hpb=d24d56638469189904fb6ddbb3c725817b3e9417;p=babeltrace.git

diff --git a/src/lib/trace-ir/stream-class.c b/src/lib/trace-ir/stream-class.c
index 7abea884..edeccbec 100644
--- a/src/lib/trace-ir/stream-class.c
+++ b/src/lib/trace-ir/stream-class.c
@@ -120,7 +120,8 @@ struct bt_stream_class *create_stream_class_with_id(
 		tc, id);
 	stream_class = g_new0(struct bt_stream_class, 1);
 	if (!stream_class) {
-		BT_LOGE_STR("Failed to allocate one stream class.");
+		BT_LIB_LOGE_APPEND_CAUSE(
+			"Failed to allocate one stream class.");
 		goto error;
 	}
 
@@ -129,7 +130,7 @@ struct bt_stream_class *create_stream_class_with_id(
 
 	stream_class->name.str = g_string_new(NULL);
 	if (!stream_class->name.str) {
-		BT_LOGE_STR("Failed to allocate a GString.");
+		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GString.");
 		ret = -1;
 		goto end;
 	}
@@ -140,7 +141,7 @@ struct bt_stream_class *create_stream_class_with_id(
 	stream_class->event_classes = g_ptr_array_new_with_free_func(
 		(GDestroyNotify) bt_object_try_spec_release);
 	if (!stream_class->event_classes) {
-		BT_LOGE_STR("Failed to allocate a GPtrArray.");
+		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GPtrArray.");
 		goto error;
 	}
 
@@ -149,7 +150,8 @@ struct bt_stream_class *create_stream_class_with_id(
 		(bt_object_pool_destroy_object_func) free_field_wrapper,
 		stream_class);
 	if (ret) {
-		BT_LOGE("Failed to initialize packet context field pool: ret=%d",
+		BT_LIB_LOGE_APPEND_CAUSE(
+			"Failed to initialize packet context field pool: ret=%d",
 			ret);
 		goto error;
 	}
@@ -308,6 +310,9 @@ bt_stream_class_set_packet_context_field_class(
 	};
 
 	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
+	BT_ASSERT_PRE(stream_class->supports_packets,
+		"Stream class does not support packets: %![sc-]+S",
+		stream_class);
 	BT_ASSERT_PRE_NON_NULL(field_class, "Field class");
 	BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class);
 	BT_ASSERT_PRE(bt_field_class_get_type(field_class) ==
@@ -455,46 +460,6 @@ void bt_stream_class_set_assigns_automatic_event_class_id(
 		"assignment property: %!+S", stream_class);
 }
 
-bt_bool bt_stream_class_packets_have_beginning_default_clock_snapshot(
-		const struct bt_stream_class *stream_class)
-{
-	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
-	return (bt_bool) stream_class->packets_have_beginning_default_clock_snapshot;
-}
-
-void bt_stream_class_set_packets_have_beginning_default_clock_snapshot(
-		struct bt_stream_class *stream_class, bt_bool value)
-{
-	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
-	BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class);
-	BT_ASSERT_PRE(!value || stream_class->default_clock_class,
-		"Stream class has no default clock class: %!+S", stream_class);
-	stream_class->packets_have_beginning_default_clock_snapshot =
-		(bool) value;
-	BT_LIB_LOGD("Set stream class's \"packets have default beginning "
-		"clock snapshot\" property: %!+S", stream_class);
-}
-
-bt_bool bt_stream_class_packets_have_end_default_clock_snapshot(
-		const struct bt_stream_class *stream_class)
-{
-	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
-	return (bt_bool) stream_class->packets_have_end_default_clock_snapshot;
-}
-
-void bt_stream_class_set_packets_have_end_default_clock_snapshot(
-		struct bt_stream_class *stream_class, bt_bool value)
-{
-	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
-	BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class);
-	BT_ASSERT_PRE(!value || stream_class->default_clock_class,
-		"Stream class has no default clock class: %!+S", stream_class);
-	stream_class->packets_have_end_default_clock_snapshot =
-		(bool) value;
-	BT_LIB_LOGD("Set stream class's \"packets have default end "
-		"clock snapshot\" property: %!+S", stream_class);
-}
-
 bt_bool bt_stream_class_assigns_automatic_stream_id(
 		const struct bt_stream_class *stream_class)
 {
@@ -545,6 +510,10 @@ void bt_stream_class_set_supports_discarded_packets(
 {
 	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
 	BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class);
+	BT_ASSERT_PRE(!supports_discarded_packets ||
+		stream_class->supports_packets,
+		"Stream class does not support packets: %!+S",
+		stream_class);
 	BT_ASSERT_PRE(supports_discarded_packets ||
 		!with_default_clock_snapshots,
 		"Discarded packets cannot have default clock snapshots when "
@@ -574,6 +543,61 @@ bt_bool bt_stream_class_discarded_packets_have_default_clock_snapshots(
 	return (bt_bool) stream_class->discarded_packets_have_default_clock_snapshots;
 }
 
+void bt_stream_class_set_supports_packets(
+		struct bt_stream_class *stream_class,
+		bt_bool supports_packets,
+		bt_bool with_beginning_default_clock_snapshot,
+		bt_bool with_end_default_clock_snapshot)
+{
+	bt_bool with_default_clock_snapshot =
+		with_beginning_default_clock_snapshot ||
+		with_end_default_clock_snapshot;
+	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
+	BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class);
+	BT_ASSERT_PRE(supports_packets ||
+		!with_default_clock_snapshot,
+		"Packets cannot have default clock snapshots when "
+		"not supported: %!+S", stream_class);
+	BT_ASSERT_PRE(!with_default_clock_snapshot ||
+		stream_class->default_clock_class,
+		"Stream class has no default clock class: %!+S", stream_class);
+	BT_ASSERT_PRE(supports_packets || !stream_class->packet_context_fc,
+		"Stream class already has a packet context field class: %!+S",
+		stream_class);
+	BT_ASSERT_PRE(supports_packets ||
+		!stream_class->supports_discarded_packets,
+		"Stream class already supports discarded packets: %!+S",
+		stream_class);
+	stream_class->supports_packets = (bool) supports_packets;
+	stream_class->packets_have_beginning_default_clock_snapshot =
+		(bool) with_beginning_default_clock_snapshot;
+	stream_class->packets_have_end_default_clock_snapshot =
+		(bool) with_end_default_clock_snapshot;
+	BT_LIB_LOGD("Set stream class's packets support property: %!+S",
+		stream_class);
+}
+
+bt_bool bt_stream_class_supports_packets(
+		const struct bt_stream_class *stream_class)
+{
+	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
+	return (bt_bool) stream_class->supports_packets;
+}
+
+bt_bool bt_stream_class_packets_have_beginning_default_clock_snapshot(
+		const struct bt_stream_class *stream_class)
+{
+	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
+	return (bt_bool) stream_class->packets_have_beginning_default_clock_snapshot;
+}
+
+bt_bool bt_stream_class_packets_have_end_default_clock_snapshot(
+		const struct bt_stream_class *stream_class)
+{
+	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
+	return (bt_bool) stream_class->packets_have_end_default_clock_snapshot;
+}
+
 void bt_stream_class_set_assigns_automatic_stream_id(
 		struct bt_stream_class *stream_class,
 		bt_bool value)