X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fgraph%2Fnotification-internal.h;h=2fbdbb42cbc1ab38a0ec7c2f259b44756027f2a1;hb=312c056ae3d374b253fa0cfe5ed576c0b0e5e569;hp=00a8c7eeb7e9e148e0c5fd7915d916c6722cc239;hpb=5af447e5102d6226ee198e4db52b51e12075f1bb;p=babeltrace.git

diff --git a/include/babeltrace/graph/notification-internal.h b/include/babeltrace/graph/notification-internal.h
index 00a8c7ee..2fbdbb42 100644
--- a/include/babeltrace/graph/notification-internal.h
+++ b/include/babeltrace/graph/notification-internal.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_COMPONENT_NOTIFICATION_NOTIFICATION_INTERNAL_H
-#define BABELTRACE_COMPONENT_NOTIFICATION_NOTIFICATION_INTERNAL_H
+#ifndef BABELTRACE_GRAPH_NOTIFICATION_NOTIFICATION_INTERNAL_H
+#define BABELTRACE_GRAPH_NOTIFICATION_NOTIFICATION_INTERNAL_H
 
 /*
  * BabelTrace - Plug-in Notification internal
@@ -34,16 +34,23 @@
 #include <babeltrace/ctf-ir/stream.h>
 #include <babeltrace/types.h>
 
-typedef struct bt_ctf_stream *(*get_stream_func)(
+typedef struct bt_stream *(*get_stream_func)(
 		struct bt_notification *notification);
 
 struct bt_notification {
 	struct bt_object base;
 	enum bt_notification_type type;
 	get_stream_func get_stream;
+	uint64_t seq_num;
 	bt_bool frozen;
 };
 
+#define BT_ASSERT_PRE_NOTIF_IS_TYPE(_notif, _type)			\
+	BT_ASSERT_PRE((_notif)->type == (_type),			\
+		"Notification has the wrong type: expected-type=%s, "	\
+		"%![notif-]+n", bt_notification_type_string(_type),	\
+		(_notif))
+
 BT_HIDDEN
 void bt_notification_init(struct bt_notification *notification,
 		enum bt_notification_type type,
@@ -58,12 +65,8 @@ static inline
 const char *bt_notification_type_string(enum bt_notification_type type)
 {
 	switch (type) {
-	case BT_NOTIFICATION_TYPE_SENTINEL:
-		return "BT_NOTIFICATION_TYPE_SENTINEL";
 	case BT_NOTIFICATION_TYPE_UNKNOWN:
 		return "BT_NOTIFICATION_TYPE_UNKNOWN";
-	case BT_NOTIFICATION_TYPE_ALL:
-		return "BT_NOTIFICATION_TYPE_ALL";
 	case BT_NOTIFICATION_TYPE_EVENT:
 		return "BT_NOTIFICATION_TYPE_EVENT";
 	case BT_NOTIFICATION_TYPE_INACTIVITY:
@@ -76,9 +79,13 @@ const char *bt_notification_type_string(enum bt_notification_type type)
 		return "BT_NOTIFICATION_TYPE_PACKET_BEGIN";
 	case BT_NOTIFICATION_TYPE_PACKET_END:
 		return "BT_NOTIFICATION_TYPE_PACKET_END";
+	case BT_NOTIFICATION_TYPE_DISCARDED_EVENTS:
+		return "BT_NOTIFICATION_TYPE_DISCARDED_EVENTS";
+	case BT_NOTIFICATION_TYPE_DISCARDED_PACKETS:
+		return "BT_NOTIFICATION_TYPE_DISCARDED_PACKETS";
 	default:
 		return "(unknown)";
 	}
 }
 
-#endif /* BABELTRACE_COMPONENT_NOTIFICATION_NOTIFICATION_INTERNAL_H */
+#endif /* BABELTRACE_GRAPH_NOTIFICATION_NOTIFICATION_INTERNAL_H */