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

diff --git a/lib/graph/notification/packet.c b/lib/graph/notification/packet.c
index 17b00d46..8e02201d 100644
--- a/lib/graph/notification/packet.c
+++ b/lib/graph/notification/packet.c
@@ -28,15 +28,17 @@
 #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>
 
 BT_HIDDEN
@@ -64,12 +66,15 @@ end:
 }
 
 struct bt_notification *bt_notification_packet_begin_create(
-		struct bt_graph *graph, struct bt_packet *packet)
+		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);
@@ -83,14 +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));
+	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_notification_create_from_pool() logs errors */
-		goto error;
+		goto end;
 	}
 
-	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\", "
@@ -101,9 +112,6 @@ struct bt_notification *bt_notification_packet_begin_create(
 		bt_stream_class_get_id(stream_class), notification);
 	goto end;
 
-error:
-	BT_PUT(notification);
-
 end:
 	return (void *) notification;
 }
@@ -127,14 +135,15 @@ void bt_notification_packet_begin_recycle(struct bt_notification *notif)
 
 	BT_ASSERT(packet_begin_notif);
 
-	if (!notif->graph) {
+	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_PUT(packet_begin_notif->packet);
+	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);
@@ -178,12 +187,15 @@ end:
 }
 
 struct bt_notification *bt_notification_packet_end_create(
-		struct bt_graph *graph, struct bt_packet *packet)
+		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);
@@ -197,14 +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));
+	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_notification_create_from_pool() logs errors */
-		goto error;
+		goto end;
 	}
 
-	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\", "
@@ -215,9 +233,6 @@ struct bt_notification *bt_notification_packet_end_create(
 		bt_stream_class_get_id(stream_class), notification);
 	goto end;
 
-error:
-	BT_PUT(notification);
-
 end:
 	return (void *) notification;
 }