X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Fstream.c;h=23692399f6b35cc0dca4279295c4eba19fa441fd;hb=6769570a7eb51bfa5c8d1aa3573e636eda47b131;hp=1904143708186babd4969cdcd1a5a26318863332;hpb=d24d56638469189904fb6ddbb3c725817b3e9417;p=babeltrace.git

diff --git a/src/lib/trace-ir/stream.c b/src/lib/trace-ir/stream.c
index 19041437..23692399 100644
--- a/src/lib/trace-ir/stream.c
+++ b/src/lib/trace-ir/stream.c
@@ -42,8 +42,8 @@
 #include "trace.h"
 #include "lib/func-status.h"
 
-#define BT_ASSERT_PRE_STREAM_HOT(_stream) \
-	BT_ASSERT_PRE_HOT((_stream), "Stream", ": %!+s", (_stream))
+#define BT_ASSERT_PRE_DEV_STREAM_HOT(_stream) \
+	BT_ASSERT_PRE_DEV_HOT((_stream), "Stream", ": %!+s", (_stream))
 
 static
 void destroy_stream(struct bt_object *obj)
@@ -70,7 +70,6 @@ void bt_stream_free_packet(struct bt_packet *packet, struct bt_stream *stream)
 	bt_packet_destroy(packet);
 }
 
-BT_ASSERT_PRE_FUNC
 static inline
 bool stream_id_is_unique(struct bt_trace *trace,
 		struct bt_stream_class *stream_class, uint64_t id)
@@ -114,14 +113,14 @@ struct bt_stream *create_stream_with_id(struct bt_stream_class *stream_class,
 		trace, id);
 	stream = g_new0(struct bt_stream, 1);
 	if (!stream) {
-		BT_LOGE_STR("Failed to allocate one stream.");
+		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one stream.");
 		goto error;
 	}
 
 	bt_object_init_shared_with_parent(&stream->base, destroy_stream);
 	stream->name.str = g_string_new(NULL);
 	if (!stream->name.str) {
-		BT_LOGE_STR("Failed to allocate a GString.");
+		BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GString.");
 		goto error;
 	}
 
@@ -131,7 +130,8 @@ struct bt_stream *create_stream_with_id(struct bt_stream_class *stream_class,
 		(bt_object_pool_destroy_object_func) bt_stream_free_packet,
 		stream);
 	if (ret) {
-		BT_LOGE("Failed to initialize packet pool: ret=%d", ret);
+		BT_LIB_LOGE_APPEND_CAUSE(
+			"Failed to initialize packet pool: ret=%d", ret);
 		goto error;
 	}
 
@@ -179,7 +179,7 @@ struct bt_stream *bt_stream_create_with_id(struct bt_stream_class *stream_class,
 
 struct bt_stream_class *bt_stream_borrow_class(struct bt_stream *stream)
 {
-	BT_ASSERT_PRE_NON_NULL(stream, "Stream");
+	BT_ASSERT_PRE_DEV_NON_NULL(stream, "Stream");
 	return stream->class;
 }
 
@@ -191,7 +191,7 @@ const struct bt_stream_class *bt_stream_borrow_class_const(
 
 struct bt_trace *bt_stream_borrow_trace(struct bt_stream *stream)
 {
-	BT_ASSERT_PRE_NON_NULL(stream, "Stream");
+	BT_ASSERT_PRE_DEV_NON_NULL(stream, "Stream");
 	return bt_stream_borrow_trace_inline(stream);
 }
 
@@ -203,7 +203,7 @@ const struct bt_trace *bt_stream_borrow_trace_const(
 
 const char *bt_stream_get_name(const struct bt_stream *stream)
 {
-	BT_ASSERT_PRE_NON_NULL(stream, "Stream");
+	BT_ASSERT_PRE_DEV_NON_NULL(stream, "Stream");
 	return stream->name.value;
 }
 
@@ -212,7 +212,7 @@ enum bt_stream_set_name_status bt_stream_set_name(struct bt_stream *stream,
 {
 	BT_ASSERT_PRE_NON_NULL(stream, "Stream");
 	BT_ASSERT_PRE_NON_NULL(name, "Name");
-	BT_ASSERT_PRE_STREAM_HOT(stream);
+	BT_ASSERT_PRE_DEV_STREAM_HOT(stream);
 	g_string_assign(stream->name.str, name);
 	stream->name.value = stream->name.str->str;
 	BT_LIB_LOGD("Set stream's name: %!+s", stream);
@@ -221,7 +221,7 @@ enum bt_stream_set_name_status bt_stream_set_name(struct bt_stream *stream,
 
 uint64_t bt_stream_get_id(const struct bt_stream *stream)
 {
-	BT_ASSERT_PRE_NON_NULL(stream, "Stream class");
+	BT_ASSERT_PRE_DEV_NON_NULL(stream, "Stream class");
 	return stream->id;
 }