X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Fevent.h;h=fff20d762c0bb7a6f1820bc33b52b98b3379e4be;hb=bdb288b3e94e412a33c8647d44f6cfac66ca0665;hp=71318f95b626b3b8e11b8db83f3e603d2f00d9f9;hpb=185ecf645233ced089ad72b060a420e8f6f7edeb;p=babeltrace.git

diff --git a/src/lib/trace-ir/event.h b/src/lib/trace-ir/event.h
index 71318f95..fff20d76 100644
--- a/src/lib/trace-ir/event.h
+++ b/src/lib/trace-ir/event.h
@@ -46,8 +46,8 @@
 #include "packet.h"
 #include "stream.h"
 
-#define BT_ASSERT_PRE_EVENT_HOT(_event) \
-	BT_ASSERT_PRE_HOT(((const struct bt_event *) (_event)), 	\
+#define BT_ASSERT_PRE_DEV_EVENT_HOT(_event)				\
+	BT_ASSERT_PRE_DEV_HOT(((const struct bt_event *) (_event)), 	\
 		"Event", ": %!+e", (_event))
 
 struct bt_event {
@@ -171,10 +171,10 @@ void bt_event_recycle(struct bt_event *event)
 static inline
 void bt_event_set_packet(struct bt_event *event, struct bt_packet *packet)
 {
-	BT_ASSERT_PRE_NON_NULL(event, "Event");
-	BT_ASSERT_PRE_NON_NULL(packet, "Packet");
-	BT_ASSERT_PRE_EVENT_HOT(event);
-	BT_ASSERT_PRE(bt_event_class_borrow_stream_class(
+	BT_ASSERT_PRE_DEV_NON_NULL(event, "Event");
+	BT_ASSERT_PRE_DEV_NON_NULL(packet, "Packet");
+	BT_ASSERT_PRE_DEV_EVENT_HOT(event);
+	BT_ASSERT_PRE_DEV(bt_event_class_borrow_stream_class(
 		event->class) == packet->stream->class,
 		"Packet's stream class and event's stream class differ: "
 		"%![event-]+e, %![packet-]+a", event, packet);
@@ -189,10 +189,10 @@ void bt_event_set_packet(struct bt_event *event, struct bt_packet *packet)
 static inline
 void bt_event_set_stream(struct bt_event *event, struct bt_stream *stream)
 {
-	BT_ASSERT_PRE_NON_NULL(event, "Event");
-	BT_ASSERT_PRE_NON_NULL(stream, "Stream");
-	BT_ASSERT_PRE_EVENT_HOT(event);
-	BT_ASSERT_PRE(bt_event_class_borrow_stream_class(
+	BT_ASSERT_PRE_DEV_NON_NULL(event, "Event");
+	BT_ASSERT_PRE_DEV_NON_NULL(stream, "Stream");
+	BT_ASSERT_PRE_DEV_EVENT_HOT(event);
+	BT_ASSERT_PRE_DEV(bt_event_class_borrow_stream_class(
 		event->class) == stream->class,
 		"Stream's class and event's stream class differ: "
 		"%![event-]+e, %![stream-]+s", event, stream);