X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fgraph%2Fnotification%2Fpacket.c;h=8e02201d4539038b5a995da8557ebe6a8dcae6d7;hb=56e18c4ce186892c36d7f2cb5078087425e60134;hp=fb590c3c512c9611fc8c68c722ab77456af44f9f;hpb=094ff7c009937bb23c056333baffe734308a6b06;p=babeltrace.git

diff --git a/lib/graph/notification/packet.c b/lib/graph/notification/packet.c
index fb590c3c..8e02201d 100644
--- a/lib/graph/notification/packet.c
+++ b/lib/graph/notification/packet.c
@@ -28,49 +28,53 @@
 #include <babeltrace/lib-logging-internal.h>
 
 #include <babeltrace/compiler-internal.h>
-#include <babeltrace/ctf-ir/packet.h>
-#include <babeltrace/ctf-ir/packet-internal.h>
-#include <babeltrace/ctf-ir/stream-class.h>
-#include <babeltrace/ctf-ir/stream.h>
-#include <babeltrace/ctf-ir/stream-internal.h>
+#include <babeltrace/trace-ir/packet.h>
+#include <babeltrace/trace-ir/packet-internal.h>
+#include <babeltrace/trace-ir/stream-class.h>
+#include <babeltrace/trace-ir/stream.h>
+#include <babeltrace/trace-ir/stream-internal.h>
+#include <babeltrace/graph/graph-internal.h>
 #include <babeltrace/graph/notification-packet-internal.h>
+#include <babeltrace/graph/private-connection-private-notification-iterator.h>
 #include <babeltrace/assert-internal.h>
 #include <babeltrace/assert-pre-internal.h>
+#include <babeltrace/object-internal.h>
 #include <inttypes.h>
 
-static
-void bt_notification_packet_begin_destroy(struct bt_object *obj)
+BT_HIDDEN
+struct bt_notification *bt_notification_packet_begin_new(struct bt_graph *graph)
 {
-	struct bt_notification_packet_begin *notification =
-			(struct bt_notification_packet_begin *) obj;
+	struct bt_notification_packet_begin *notification;
 
-	BT_LOGD("Destroying packet beginning notification: addr=%p",
-		notification);
-	BT_LOGD_STR("Putting packet.");
-	BT_PUT(notification->packet);
-	g_free(notification);
-}
+	notification = g_new0(struct bt_notification_packet_begin, 1);
+	if (!notification) {
+		BT_LOGE_STR("Failed to allocate one packet beginning notification.");
+		goto error;
+	}
 
-static
-void bt_notification_packet_end_destroy(struct bt_object *obj)
-{
-	struct bt_notification_packet_end *notification =
-			(struct bt_notification_packet_end *) obj;
+	bt_notification_init(&notification->parent,
+			BT_NOTIFICATION_TYPE_PACKET_BEGIN,
+			(bt_object_release_func) bt_notification_packet_begin_recycle,
+			graph);
+	goto end;
 
-	BT_LOGD("Destroying packet end notification: addr=%p",
-		notification);
-	BT_LOGD_STR("Putting packet.");
-	BT_PUT(notification->packet);
-	g_free(notification);
+error:
+	BT_PUT(notification);
+
+end:
+	return (void *) notification;
 }
 
 struct bt_notification *bt_notification_packet_begin_create(
+		struct bt_private_connection_private_notification_iterator *notif_iter,
 		struct bt_packet *packet)
 {
-	struct bt_notification_packet_begin *notification;
+	struct bt_notification_packet_begin *notification = NULL;
 	struct bt_stream *stream;
 	struct bt_stream_class *stream_class;
+	struct bt_graph *graph;
 
+	BT_ASSERT_PRE_NON_NULL(notif_iter, "Notification iterator");
 	BT_ASSERT_PRE_NON_NULL(packet, "Packet");
 	stream = bt_packet_borrow_stream(packet);
 	BT_ASSERT(stream);
@@ -84,16 +88,20 @@ struct bt_notification *bt_notification_packet_begin_create(
 		stream_class,
 		bt_stream_class_get_name(stream_class),
 		bt_stream_class_get_id(stream_class));
-	notification = g_new0(struct bt_notification_packet_begin, 1);
+	graph = bt_private_connection_private_notification_iterator_borrow_graph(
+		notif_iter);
+	notification = (void *) bt_notification_create_from_pool(
+		&graph->packet_begin_notif_pool, graph);
 	if (!notification) {
-		BT_LOGE_STR("Failed to allocate one packet beginning notification.");
-		goto error;
+		/* bt_notification_create_from_pool() logs errors */
+		goto end;
 	}
 
-	bt_notification_init(&notification->parent,
-			BT_NOTIFICATION_TYPE_PACKET_BEGIN,
-			bt_notification_packet_begin_destroy);
-	notification->packet = bt_get(packet);
+	BT_ASSERT(!notification->packet);
+	notification->packet = packet;
+	bt_object_get_no_null_check_no_parent_check(
+		&notification->packet->base);
+	bt_packet_set_is_frozen(packet, true);
 	BT_LOGD("Created packet beginning notification object: "
 		"packet-addr=%p, stream-addr=%p, stream-name=\"%s\", "
 		"stream-class-addr=%p, stream-class-name=\"%s\", "
@@ -102,9 +110,43 @@ struct bt_notification *bt_notification_packet_begin_create(
 		stream_class,
 		bt_stream_class_get_name(stream_class),
 		bt_stream_class_get_id(stream_class), notification);
-	return &notification->parent;
-error:
-	return NULL;
+	goto end;
+
+end:
+	return (void *) notification;
+}
+
+BT_HIDDEN
+void bt_notification_packet_begin_destroy(struct bt_notification *notif)
+{
+	struct bt_notification_packet_begin *packet_begin_notif = (void *) notif;
+
+	BT_LOGD("Destroying packet beginning notification: addr=%p", notif);
+	BT_LOGD_STR("Putting packet.");
+	BT_PUT(packet_begin_notif->packet);
+	g_free(notif);
+}
+
+BT_HIDDEN
+void bt_notification_packet_begin_recycle(struct bt_notification *notif)
+{
+	struct bt_notification_packet_begin *packet_begin_notif = (void *) notif;
+	struct bt_graph *graph;
+
+	BT_ASSERT(packet_begin_notif);
+
+	if (unlikely(!notif->graph)) {
+		bt_notification_packet_begin_destroy(notif);
+		return;
+	}
+
+	BT_LOGD("Recycling packet beginning notification: addr=%p", notif);
+	bt_notification_reset(notif);
+	bt_object_put_no_null_check(&packet_begin_notif->packet->base);
+	packet_begin_notif->packet = NULL;
+	graph = notif->graph;
+	notif->graph = NULL;
+	bt_object_pool_recycle_object(&graph->packet_begin_notif_pool, notif);
 }
 
 struct bt_packet *bt_notification_packet_begin_borrow_packet(
@@ -120,13 +162,40 @@ struct bt_packet *bt_notification_packet_begin_borrow_packet(
 	return packet_begin->packet;
 }
 
+BT_HIDDEN
+struct bt_notification *bt_notification_packet_end_new(struct bt_graph *graph)
+{
+	struct bt_notification_packet_end *notification;
+
+	notification = g_new0(struct bt_notification_packet_end, 1);
+	if (!notification) {
+		BT_LOGE_STR("Failed to allocate one packet end notification.");
+		goto error;
+	}
+
+	bt_notification_init(&notification->parent,
+			BT_NOTIFICATION_TYPE_PACKET_END,
+			(bt_object_release_func) bt_notification_packet_end_recycle,
+			graph);
+	goto end;
+
+error:
+	BT_PUT(notification);
+
+end:
+	return (void *) notification;
+}
+
 struct bt_notification *bt_notification_packet_end_create(
+		struct bt_private_connection_private_notification_iterator *notif_iter,
 		struct bt_packet *packet)
 {
-	struct bt_notification_packet_end *notification;
+	struct bt_notification_packet_end *notification = NULL;
 	struct bt_stream *stream;
 	struct bt_stream_class *stream_class;
+	struct bt_graph *graph;
 
+	BT_ASSERT_PRE_NON_NULL(notif_iter, "Notification iterator");
 	BT_ASSERT_PRE_NON_NULL(packet, "Packet");
 	stream = bt_packet_borrow_stream(packet);
 	BT_ASSERT(stream);
@@ -140,16 +209,20 @@ struct bt_notification *bt_notification_packet_end_create(
 		stream_class,
 		bt_stream_class_get_name(stream_class),
 		bt_stream_class_get_id(stream_class));
-	notification = g_new0(struct bt_notification_packet_end, 1);
+	graph = bt_private_connection_private_notification_iterator_borrow_graph(
+		notif_iter);
+	notification = (void *) bt_notification_create_from_pool(
+		&graph->packet_end_notif_pool, graph);
 	if (!notification) {
-		BT_LOGE_STR("Failed to allocate one packet end notification.");
-		goto error;
+		/* bt_notification_create_from_pool() logs errors */
+		goto end;
 	}
 
-	bt_notification_init(&notification->parent,
-			BT_NOTIFICATION_TYPE_PACKET_END,
-			bt_notification_packet_end_destroy);
-	notification->packet = bt_get(packet);
+	BT_ASSERT(!notification->packet);
+	notification->packet = packet;
+	bt_object_get_no_null_check_no_parent_check(
+		&notification->packet->base);
+	bt_packet_set_is_frozen(packet, true);
 	BT_LOGD("Created packet end notification object: "
 		"packet-addr=%p, stream-addr=%p, stream-name=\"%s\", "
 		"stream-class-addr=%p, stream-class-name=\"%s\", "
@@ -158,9 +231,42 @@ struct bt_notification *bt_notification_packet_end_create(
 		stream_class,
 		bt_stream_class_get_name(stream_class),
 		bt_stream_class_get_id(stream_class), notification);
-	return &notification->parent;
-error:
-	return NULL;
+	goto end;
+
+end:
+	return (void *) notification;
+}
+
+BT_HIDDEN
+void bt_notification_packet_end_destroy(struct bt_notification *notif)
+{
+	struct bt_notification_packet_end *packet_end_notif = (void *) notif;
+
+	BT_LOGD("Destroying packet end notification: addr=%p", notif);
+	BT_LOGD_STR("Putting packet.");
+	BT_PUT(packet_end_notif->packet);
+	g_free(notif);
+}
+
+BT_HIDDEN
+void bt_notification_packet_end_recycle(struct bt_notification *notif)
+{
+	struct bt_notification_packet_end *packet_end_notif = (void *) notif;
+	struct bt_graph *graph;
+
+	BT_ASSERT(packet_end_notif);
+
+	if (!notif->graph) {
+		bt_notification_packet_end_destroy(notif);
+		return;
+	}
+
+	BT_LOGD("Recycling packet end notification: addr=%p", notif);
+	bt_notification_reset(notif);
+	BT_PUT(packet_end_notif->packet);
+	graph = notif->graph;
+	notif->graph = NULL;
+	bt_object_pool_recycle_object(&graph->packet_end_notif_pool, notif);
 }
 
 struct bt_packet *bt_notification_packet_end_borrow_packet(