X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fgraph%2Fnotification%2Fstream.c;h=523e8142d880028734fe1f463b2d76320a12dbc9;hb=e5be10efe4d5543ba697c7e607ca0a5c33fa3ccb;hp=8f35e3c631d849488c0b487290314344ea1cceb0;hpb=094ff7c009937bb23c056333baffe734308a6b06;p=babeltrace.git

diff --git a/lib/graph/notification/stream.c b/lib/graph/notification/stream.c
index 8f35e3c6..523e8142 100644
--- a/lib/graph/notification/stream.c
+++ b/lib/graph/notification/stream.c
@@ -1,6 +1,4 @@
 /*
- * Babeltrace Plug-in Stream-related Notifications
- *
  * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
  * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
@@ -27,12 +25,16 @@
 #define BT_LOG_TAG "NOTIF-STREAM"
 #include <babeltrace/lib-logging-internal.h>
 
+#include <babeltrace/assert-pre-internal.h>
 #include <babeltrace/compiler-internal.h>
-#include <babeltrace/ctf-ir/stream-internal.h>
-#include <babeltrace/ctf-ir/stream-class.h>
+#include <babeltrace/trace-ir/stream-internal.h>
+#include <babeltrace/trace-ir/stream-class.h>
+#include <babeltrace/trace-ir/stream-class-internal.h>
+#include <babeltrace/graph/private-notification-stream.h>
 #include <babeltrace/graph/notification-stream-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.h>
 #include <inttypes.h>
 
 static
@@ -44,13 +46,20 @@ void bt_notification_stream_end_destroy(struct bt_object *obj)
 	BT_LOGD("Destroying stream end notification: addr=%p",
 		notification);
 	BT_LOGD_STR("Putting stream.");
-	BT_PUT(notification->stream);
+	BT_OBJECT_PUT_REF_AND_RESET(notification->stream);
+
+	if (notification->default_cv) {
+		bt_clock_value_recycle(notification->default_cv);
+	}
+
 	g_free(notification);
 }
 
-struct bt_notification *bt_notification_stream_end_create(
-		struct bt_stream *stream)
+struct bt_private_notification *bt_private_notification_stream_end_create(
+		struct bt_private_connection_private_notification_iterator *notif_iter,
+		struct bt_private_stream *priv_stream)
 {
+	struct bt_stream *stream = (void *) priv_stream;
 	struct bt_notification_stream_end *notification;
 	struct bt_stream_class *stream_class;
 
@@ -73,8 +82,8 @@ struct bt_notification *bt_notification_stream_end_create(
 
 	bt_notification_init(&notification->parent,
 			BT_NOTIFICATION_TYPE_STREAM_END,
-			bt_notification_stream_end_destroy);
-	notification->stream = bt_get(stream);
+			bt_notification_stream_end_destroy, NULL);
+	notification->stream = bt_object_get_ref(stream);
 	BT_LOGD("Created stream end notification object: "
 		"stream-addr=%p, stream-name=\"%s\", "
 		"stream-class-addr=%p, stream-class-name=\"%s\", "
@@ -83,7 +92,8 @@ struct bt_notification *bt_notification_stream_end_create(
 		stream_class,
 		bt_stream_class_get_name(stream_class),
 		bt_stream_class_get_id(stream_class), notification);
-	return &notification->parent;
+
+	return (void *) &notification->parent;
 error:
 	return NULL;
 }
@@ -101,6 +111,55 @@ struct bt_stream *bt_notification_stream_end_borrow_stream(
 	return stream_end->stream;
 }
 
+struct bt_private_stream *bt_private_notification_stream_end_borrow_stream(
+		struct bt_private_notification *notification)
+{
+	return (void *) bt_notification_stream_end_borrow_stream(
+		(void *) notification);
+}
+
+int bt_private_notification_stream_end_set_default_clock_value(
+		struct bt_private_notification *priv_notif,
+		uint64_t value_cycles)
+{
+	int ret = 0;
+	struct bt_notification *notif = (void *) priv_notif;
+	struct bt_notification_stream_end *se_notif = (void *) notif;
+
+	BT_ASSERT_PRE_NON_NULL(notif, "Notification");
+	BT_ASSERT_PRE_HOT(notif, "Notification", ": %!+n", notif);
+	BT_ASSERT_PRE_NOTIF_IS_TYPE(notif, BT_NOTIFICATION_TYPE_STREAM_END);
+	BT_ASSERT_PRE(se_notif->stream->class->default_clock_class,
+		"Notification's stream class has no default clock class: "
+		"%![notif-]+n, %![sc-]+S", notif, se_notif->stream->class);
+
+	if (!se_notif->default_cv) {
+		se_notif->default_cv = bt_clock_value_create(
+			se_notif->stream->class->default_clock_class);
+		if (!se_notif->default_cv) {
+			ret = -1;
+			goto end;
+		}
+	}
+
+	bt_clock_value_set_value_inline(se_notif->default_cv, value_cycles);
+	BT_LIB_LOGV("Set notification's default clock value: %![notif-]+n, "
+		"value=%" PRIu64, value_cycles);
+
+end:
+	return ret;
+}
+
+struct bt_clock_value *bt_notification_stream_end_borrow_default_clock_value(
+		struct bt_notification *notif)
+{
+	struct bt_notification_stream_end *stream_end = (void *) notif;
+
+	BT_ASSERT_PRE_NON_NULL(notif, "Notification");
+	BT_ASSERT_PRE_NOTIF_IS_TYPE(notif, BT_NOTIFICATION_TYPE_STREAM_END);
+	return stream_end->default_cv;
+}
+
 static
 void bt_notification_stream_begin_destroy(struct bt_object *obj)
 {
@@ -110,13 +169,20 @@ void bt_notification_stream_begin_destroy(struct bt_object *obj)
 	BT_LOGD("Destroying stream beginning notification: addr=%p",
 		notification);
 	BT_LOGD_STR("Putting stream.");
-	BT_PUT(notification->stream);
+	BT_OBJECT_PUT_REF_AND_RESET(notification->stream);
+
+	if (notification->default_cv) {
+		bt_clock_value_recycle(notification->default_cv);
+	}
+
 	g_free(notification);
 }
 
-struct bt_notification *bt_notification_stream_begin_create(
-		struct bt_stream *stream)
+struct bt_private_notification *bt_private_notification_stream_begin_create(
+		struct bt_private_connection_private_notification_iterator *notif_iter,
+		struct bt_private_stream *priv_stream)
 {
+	struct bt_stream *stream = (void *) priv_stream;
 	struct bt_notification_stream_begin *notification;
 	struct bt_stream_class *stream_class;
 
@@ -139,8 +205,8 @@ struct bt_notification *bt_notification_stream_begin_create(
 
 	bt_notification_init(&notification->parent,
 			BT_NOTIFICATION_TYPE_STREAM_BEGIN,
-			bt_notification_stream_begin_destroy);
-	notification->stream = bt_get(stream);
+			bt_notification_stream_begin_destroy, NULL);
+	notification->stream = bt_object_get_ref(stream);
 	BT_LOGD("Created stream beginning notification object: "
 		"stream-addr=%p, stream-name=\"%s\", "
 		"stream-class-addr=%p, stream-class-name=\"%s\", "
@@ -149,7 +215,7 @@ struct bt_notification *bt_notification_stream_begin_create(
 		stream_class,
 		bt_stream_class_get_name(stream_class),
 		bt_stream_class_get_id(stream_class), notification);
-	return &notification->parent;
+	return (void *) &notification->parent;
 error:
 	return NULL;
 }
@@ -166,3 +232,52 @@ struct bt_stream *bt_notification_stream_begin_borrow_stream(
 			struct bt_notification_stream_begin, parent);
 	return stream_begin->stream;
 }
+
+struct bt_private_stream *bt_private_notification_stream_begin_borrow_stream(
+		struct bt_private_notification *notification)
+{
+	return (void *) bt_notification_stream_begin_borrow_stream(
+		(void *) notification);
+}
+
+int bt_private_notification_stream_begin_set_default_clock_value(
+		struct bt_private_notification *priv_notif,
+		uint64_t value_cycles)
+{
+	int ret = 0;
+	struct bt_notification *notif = (void *) priv_notif;
+	struct bt_notification_stream_begin *sb_notif = (void *) notif;
+
+	BT_ASSERT_PRE_NON_NULL(notif, "Notification");
+	BT_ASSERT_PRE_HOT(notif, "Notification", ": %!+n", notif);
+	BT_ASSERT_PRE_NOTIF_IS_TYPE(notif, BT_NOTIFICATION_TYPE_STREAM_BEGIN);
+	BT_ASSERT_PRE(sb_notif->stream->class->default_clock_class,
+		"Notification's stream class has no default clock class: "
+		"%![notif-]+n, %![sc-]+S", notif, sb_notif->stream->class);
+
+	if (!sb_notif->default_cv) {
+		sb_notif->default_cv = bt_clock_value_create(
+			sb_notif->stream->class->default_clock_class);
+		if (!sb_notif->default_cv) {
+			ret = -1;
+			goto end;
+		}
+	}
+
+	bt_clock_value_set_value_inline(sb_notif->default_cv, value_cycles);
+	BT_LIB_LOGV("Set notification's default clock value: %![notif-]+n, "
+		"value=%" PRIu64, value_cycles);
+
+end:
+	return ret;
+}
+
+struct bt_clock_value *bt_notification_stream_begin_borrow_default_clock_value(
+		struct bt_notification *notif)
+{
+	struct bt_notification_stream_begin *stream_begin = (void *) notif;
+
+	BT_ASSERT_PRE_NON_NULL(notif, "Notification");
+	BT_ASSERT_PRE_NOTIF_IS_TYPE(notif, BT_NOTIFICATION_TYPE_STREAM_BEGIN);
+	return stream_begin->default_cv;
+}