X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Fstream-class.c;h=aeccff72cac2e12f0ebd4779afbf12463fbee151;hb=bdb288b3e94e412a33c8647d44f6cfac66ca0665;hp=edeccbecc730391c62857f6c371839da5c9bccbb;hpb=185ecf645233ced089ad72b060a420e8f6f7edeb;p=babeltrace.git

diff --git a/src/lib/trace-ir/stream-class.c b/src/lib/trace-ir/stream-class.c
index edeccbec..aeccff72 100644
--- a/src/lib/trace-ir/stream-class.c
+++ b/src/lib/trace-ir/stream-class.c
@@ -46,8 +46,8 @@
 #include "utils.h"
 #include "lib/func-status.h"
 
-#define BT_ASSERT_PRE_STREAM_CLASS_HOT(_sc) \
-	BT_ASSERT_PRE_HOT((_sc), "Stream class", ": %!+S", (_sc))
+#define BT_ASSERT_PRE_DEV_STREAM_CLASS_HOT(_sc) \
+	BT_ASSERT_PRE_DEV_HOT((_sc), "Stream class", ": %!+S", (_sc))
 
 static
 void destroy_stream_class(struct bt_object *obj)
@@ -192,7 +192,7 @@ struct bt_stream_class *bt_stream_class_create_with_id(
 struct bt_trace_class *bt_stream_class_borrow_trace_class(
 		struct bt_stream_class *stream_class)
 {
-	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
+	BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class");
 	return bt_stream_class_borrow_trace_class_inline(stream_class);
 }
 
@@ -204,7 +204,7 @@ const struct bt_trace_class *bt_stream_class_borrow_trace_class_const(
 
 const char *bt_stream_class_get_name(const struct bt_stream_class *stream_class)
 {
-	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
+	BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class");
 	return stream_class->name.value;
 }
 
@@ -214,7 +214,7 @@ enum bt_stream_class_set_name_status bt_stream_class_set_name(
 {
 	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
 	BT_ASSERT_PRE_NON_NULL(name, "Name");
-	BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class);
+	BT_ASSERT_PRE_DEV_STREAM_CLASS_HOT(stream_class);
 	g_string_assign(stream_class->name.str, name);
 	stream_class->name.value = stream_class->name.str->str;
 	BT_LIB_LOGD("Set stream class's name: %!+S", stream_class);
@@ -223,22 +223,22 @@ enum bt_stream_class_set_name_status bt_stream_class_set_name(
 
 uint64_t bt_stream_class_get_id(const struct bt_stream_class *stream_class)
 {
-	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
+	BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class");
 	return stream_class->id;
 }
 
 uint64_t bt_stream_class_get_event_class_count(
 		const struct bt_stream_class *stream_class)
 {
-	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
+	BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class");
 	return (uint64_t) stream_class->event_classes->len;
 }
 
 struct bt_event_class *bt_stream_class_borrow_event_class_by_index(
 		struct bt_stream_class *stream_class, uint64_t index)
 {
-	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
-	BT_ASSERT_PRE_VALID_INDEX(index, stream_class->event_classes->len);
+	BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class");
+	BT_ASSERT_PRE_DEV_VALID_INDEX(index, stream_class->event_classes->len);
 	return g_ptr_array_index(stream_class->event_classes, index);
 }
 
@@ -256,7 +256,7 @@ struct bt_event_class *bt_stream_class_borrow_event_class_by_id(
 	struct bt_event_class *event_class = NULL;
 	uint64_t i;
 
-	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
+	BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class");
 
 	for (i = 0; i < stream_class->event_classes->len; i++) {
 		struct bt_event_class *event_class_candidate =
@@ -284,7 +284,7 @@ const struct bt_field_class *
 bt_stream_class_borrow_packet_context_field_class_const(
 		const struct bt_stream_class *stream_class)
 {
-	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
+	BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class");
 	return stream_class->packet_context_fc;
 }
 
@@ -292,7 +292,7 @@ struct bt_field_class *
 bt_stream_class_borrow_packet_context_field_class(
 		struct bt_stream_class *stream_class)
 {
-	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
+	BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class");
 	return stream_class->packet_context_fc;
 }
 
@@ -314,7 +314,7 @@ bt_stream_class_set_packet_context_field_class(
 		"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_DEV_STREAM_CLASS_HOT(stream_class);
 	BT_ASSERT_PRE(bt_field_class_get_type(field_class) ==
 		BT_FIELD_CLASS_TYPE_STRUCTURE,
 		"Packet context field class is not a structure field class: %!+F",
@@ -346,7 +346,7 @@ const struct bt_field_class *
 bt_stream_class_borrow_event_common_context_field_class_const(
 		const struct bt_stream_class *stream_class)
 {
-	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
+	BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class");
 	return stream_class->event_common_context_fc;
 }
 
@@ -354,7 +354,7 @@ struct bt_field_class *
 bt_stream_class_borrow_event_common_context_field_class(
 		struct bt_stream_class *stream_class)
 {
-	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
+	BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class");
 	return stream_class->event_common_context_fc;
 }
 
@@ -373,7 +373,7 @@ bt_stream_class_set_event_common_context_field_class(
 
 	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
 	BT_ASSERT_PRE_NON_NULL(field_class, "Field class");
-	BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class);
+	BT_ASSERT_PRE_DEV_STREAM_CLASS_HOT(stream_class);
 	BT_ASSERT_PRE(bt_field_class_get_type(field_class) ==
 		BT_FIELD_CLASS_TYPE_STRUCTURE,
 		"Event common context field class is not a structure field class: %!+F",
@@ -418,7 +418,7 @@ bt_stream_class_set_default_clock_class(
 {
 	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
 	BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
-	BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class);
+	BT_ASSERT_PRE_DEV_STREAM_CLASS_HOT(stream_class);
 	bt_object_put_ref(stream_class->default_clock_class);
 	stream_class->default_clock_class = clock_class;
 	bt_object_get_no_null_check(stream_class->default_clock_class);
@@ -431,21 +431,21 @@ bt_stream_class_set_default_clock_class(
 struct bt_clock_class *bt_stream_class_borrow_default_clock_class(
 		struct bt_stream_class *stream_class)
 {
-	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
+	BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class");
 	return stream_class->default_clock_class;
 }
 
 const struct bt_clock_class *bt_stream_class_borrow_default_clock_class_const(
 		const struct bt_stream_class *stream_class)
 {
-	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
+	BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class");
 	return stream_class->default_clock_class;
 }
 
 bt_bool bt_stream_class_assigns_automatic_event_class_id(
 		const struct bt_stream_class *stream_class)
 {
-	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
+	BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class");
 	return (bt_bool) stream_class->assigns_automatic_event_class_id;
 }
 
@@ -454,7 +454,7 @@ void bt_stream_class_set_assigns_automatic_event_class_id(
 		bt_bool value)
 {
 	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
-	BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class);
+	BT_ASSERT_PRE_DEV_STREAM_CLASS_HOT(stream_class);
 	stream_class->assigns_automatic_event_class_id = (bool) value;
 	BT_LIB_LOGD("Set stream class's automatic event class ID "
 		"assignment property: %!+S", stream_class);
@@ -463,7 +463,7 @@ void bt_stream_class_set_assigns_automatic_event_class_id(
 bt_bool bt_stream_class_assigns_automatic_stream_id(
 		const struct bt_stream_class *stream_class)
 {
-	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
+	BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class");
 	return (bt_bool) stream_class->assigns_automatic_stream_id;
 }
 
@@ -473,7 +473,7 @@ void bt_stream_class_set_supports_discarded_events(
 		bt_bool with_default_clock_snapshots)
 {
 	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
-	BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class);
+	BT_ASSERT_PRE_DEV_STREAM_CLASS_HOT(stream_class);
 	BT_ASSERT_PRE(supports_discarded_events ||
 		!with_default_clock_snapshots,
 		"Discarded events cannot have default clock snapshots when "
@@ -492,14 +492,14 @@ void bt_stream_class_set_supports_discarded_events(
 bt_bool bt_stream_class_supports_discarded_events(
 		const struct bt_stream_class *stream_class)
 {
-	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
+	BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class");
 	return (bt_bool) stream_class->supports_discarded_events;
 }
 
 bt_bool bt_stream_class_discarded_events_have_default_clock_snapshots(
 		const struct bt_stream_class *stream_class)
 {
-	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
+	BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class");
 	return (bt_bool) stream_class->discarded_events_have_default_clock_snapshots;
 }
 
@@ -509,7 +509,7 @@ void bt_stream_class_set_supports_discarded_packets(
 		bt_bool with_default_clock_snapshots)
 {
 	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
-	BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class);
+	BT_ASSERT_PRE_DEV_STREAM_CLASS_HOT(stream_class);
 	BT_ASSERT_PRE(!supports_discarded_packets ||
 		stream_class->supports_packets,
 		"Stream class does not support packets: %!+S",
@@ -532,14 +532,14 @@ void bt_stream_class_set_supports_discarded_packets(
 bt_bool bt_stream_class_supports_discarded_packets(
 		const struct bt_stream_class *stream_class)
 {
-	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
+	BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class");
 	return (bt_bool) stream_class->supports_discarded_packets;
 }
 
 bt_bool bt_stream_class_discarded_packets_have_default_clock_snapshots(
 		const struct bt_stream_class *stream_class)
 {
-	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
+	BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class");
 	return (bt_bool) stream_class->discarded_packets_have_default_clock_snapshots;
 }
 
@@ -553,7 +553,7 @@ void bt_stream_class_set_supports_packets(
 		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_DEV_STREAM_CLASS_HOT(stream_class);
 	BT_ASSERT_PRE(supports_packets ||
 		!with_default_clock_snapshot,
 		"Packets cannot have default clock snapshots when "
@@ -587,14 +587,14 @@ bt_bool bt_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");
+	BT_ASSERT_PRE_DEV_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");
+	BT_ASSERT_PRE_DEV_NON_NULL(stream_class, "Stream class");
 	return (bt_bool) stream_class->packets_have_end_default_clock_snapshot;
 }
 
@@ -603,7 +603,7 @@ void bt_stream_class_set_assigns_automatic_stream_id(
 		bt_bool value)
 {
 	BT_ASSERT_PRE_NON_NULL(stream_class, "Stream class");
-	BT_ASSERT_PRE_STREAM_CLASS_HOT(stream_class);
+	BT_ASSERT_PRE_DEV_STREAM_CLASS_HOT(stream_class);
 	stream_class->assigns_automatic_stream_id = (bool) value;
 	BT_LIB_LOGD("Set stream class's automatic stream ID "
 		"assignment property: %!+S", stream_class);