X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fgraph%2Fnotification-internal.h;h=81f7d660a22482dbfb8968c5e7591926470bc685;hb=56e18c4ce186892c36d7f2cb5078087425e60134;hp=631d0adf7bbfe4c53c51afcb6c25415d126bfda9;hpb=50842bdc4c21f3de2b63e29cdac730af8b6dcca6;p=babeltrace.git

diff --git a/include/babeltrace/graph/notification-internal.h b/include/babeltrace/graph/notification-internal.h
index 631d0adf..81f7d660 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
@@ -27,11 +27,13 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/ref-internal.h>
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/object-internal.h>
+#include <babeltrace/assert-internal.h>
+#include <babeltrace/graph/graph.h>
 #include <babeltrace/graph/notification.h>
-#include <babeltrace/ctf-ir/stream.h>
+#include <babeltrace/trace-ir/stream.h>
+#include <babeltrace/object-pool-internal.h>
 #include <babeltrace/types.h>
 
 typedef struct bt_stream *(*get_stream_func)(
@@ -40,30 +42,83 @@ typedef struct bt_stream *(*get_stream_func)(
 struct bt_notification {
 	struct bt_object base;
 	enum bt_notification_type type;
-	get_stream_func get_stream;
+	uint64_t seq_num;
 	bt_bool frozen;
+
+	/* Owned by this; keeps the graph alive while the notif. is alive */
+	struct bt_graph *graph;
 };
 
+#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,
-		bt_object_release_func release);
+		bt_object_release_func release,
+		struct bt_graph *graph);
 
-static inline void bt_notification_freeze(struct bt_notification *notification)
+static inline
+void bt_notification_reset(struct bt_notification *notification)
+{
+	BT_ASSERT(notification);
+
+#ifdef BT_DEV_MODE
+	notification->frozen = BT_FALSE;
+	notification->seq_num = UINT64_C(-1);
+#endif
+}
+
+static inline
+struct bt_notification *bt_notification_create_from_pool(
+		struct bt_object_pool *pool, struct bt_graph *graph)
+{
+	struct bt_notification *notif = bt_object_pool_create_object(pool);
+
+	if (unlikely(!notif)) {
+#ifdef BT_LIB_LOGE
+		BT_LIB_LOGE("Cannot allocate one notification from notification pool: "
+			"%![pool-]+o, %![graph-]+g", pool, graph);
+#endif
+		goto error;
+	}
+
+	if (likely(!notif->graph)) {
+		notif->graph = graph;
+	}
+
+	goto end;
+
+error:
+	BT_ASSERT(!notif);
+
+end:
+	return notif;
+}
+
+static inline void _bt_notification_freeze(struct bt_notification *notification)
 {
 	notification->frozen = BT_TRUE;
 }
 
+BT_HIDDEN
+void bt_notification_unlink_graph(struct bt_notification *notif);
+
+#ifdef BT_DEV_MODE
+# define bt_notification_freeze		_bt_notification_freeze
+#else
+# define bt_notification_freeze(_x)
+#endif /* BT_DEV_MODE */
+
 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,13 +131,9 @@ 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 */