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

diff --git a/lib/graph/notification/packet.c b/lib/graph/notification/packet.c
index 552a99f1..8e02201d 100644
--- a/lib/graph/notification/packet.c
+++ b/lib/graph/notification/packet.c
@@ -28,11 +28,11 @@
 #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>
@@ -73,7 +73,6 @@ struct bt_notification *bt_notification_packet_begin_create(
 	struct bt_stream *stream;
 	struct bt_stream_class *stream_class;
 	struct bt_graph *graph;
-	int ret;
 
 	BT_ASSERT_PRE_NON_NULL(notif_iter, "Notification iterator");
 	BT_ASSERT_PRE_NON_NULL(packet, "Packet");
@@ -89,16 +88,6 @@ struct bt_notification *bt_notification_packet_begin_create(
 		stream_class,
 		bt_stream_class_get_name(stream_class),
 		bt_stream_class_get_id(stream_class));
-
-	if (likely(!packet->props_are_set)) {
-		ret = bt_packet_set_properties(packet);
-		if (ret) {
-			BT_LIB_LOGE("Cannot update packet's properties: "
-				"%![prev-packet-]+a", packet);
-			goto end;
-		}
-	}
-
 	graph = bt_private_connection_private_notification_iterator_borrow_graph(
 		notif_iter);
 	notification = (void *) bt_notification_create_from_pool(
@@ -113,7 +102,6 @@ struct bt_notification *bt_notification_packet_begin_create(
 	bt_object_get_no_null_check_no_parent_check(
 		&notification->packet->base);
 	bt_packet_set_is_frozen(packet, true);
-	bt_packet_validate_properties(packet);
 	BT_LOGD("Created packet beginning notification object: "
 		"packet-addr=%p, stream-addr=%p, stream-name=\"%s\", "
 		"stream-class-addr=%p, stream-class-name=\"%s\", "
@@ -206,7 +194,6 @@ struct bt_notification *bt_notification_packet_end_create(
 	struct bt_stream *stream;
 	struct bt_stream_class *stream_class;
 	struct bt_graph *graph;
-	int ret;
 
 	BT_ASSERT_PRE_NON_NULL(notif_iter, "Notification iterator");
 	BT_ASSERT_PRE_NON_NULL(packet, "Packet");
@@ -222,16 +209,6 @@ struct bt_notification *bt_notification_packet_end_create(
 		stream_class,
 		bt_stream_class_get_name(stream_class),
 		bt_stream_class_get_id(stream_class));
-
-	if (unlikely(!packet->props_are_set)) {
-		ret = bt_packet_set_properties(packet);
-		if (ret) {
-			BT_LIB_LOGE("Cannot update packet's properties: "
-				"%![prev-packet-]+a", packet);
-			goto end;
-		}
-	}
-
 	graph = bt_private_connection_private_notification_iterator_borrow_graph(
 		notif_iter);
 	notification = (void *) bt_notification_create_from_pool(
@@ -246,7 +223,6 @@ struct bt_notification *bt_notification_packet_end_create(
 	bt_object_get_no_null_check_no_parent_check(
 		&notification->packet->base);
 	bt_packet_set_is_frozen(packet, true);
-	bt_packet_validate_properties(packet);
 	BT_LOGD("Created packet end notification object: "
 		"packet-addr=%p, stream-addr=%p, stream-name=\"%s\", "
 		"stream-class-addr=%p, stream-class-name=\"%s\", "