X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fgraph%2Fnotification%2Fstream.c;h=e6015c250d15b06b2b632e8881c6ecc2be8cdcbf;hp=68b999c0c6e0d36c7c02d0eea5f8b58656684b17;hb=44c440bc5fe8219cc17d1b786d91fd83c4c9860a;hpb=3230ee6b4f3a704958b761daecae835c56938bc9

diff --git a/lib/graph/notification/stream.c b/lib/graph/notification/stream.c
index 68b999c0..e6015c25 100644
--- a/lib/graph/notification/stream.c
+++ b/lib/graph/notification/stream.c
@@ -24,9 +24,18 @@
  * SOFTWARE.
  */
 
+#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/ctf-ir/stream-class-internal.h>
 #include <babeltrace/graph/notification-stream-internal.h>
+#include <babeltrace/graph/private-connection-private-notification-iterator.h>
+#include <babeltrace/assert-internal.h>
+#include <inttypes.h>
 
 static
 void bt_notification_stream_end_destroy(struct bt_object *obj)
@@ -34,37 +43,110 @@ void bt_notification_stream_end_destroy(struct bt_object *obj)
 	struct bt_notification_stream_end *notification =
 			(struct bt_notification_stream_end *) obj;
 
+	BT_LOGD("Destroying stream end notification: addr=%p",
+		notification);
+	BT_LOGD_STR("Putting stream.");
 	BT_PUT(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_ctf_stream *stream)
+		struct bt_private_connection_private_notification_iterator *notif_iter,
+		struct bt_stream *stream)
 {
 	struct bt_notification_stream_end *notification;
+	struct bt_stream_class *stream_class;
 
-	if (!stream || stream->pos.fd >= 0) {
+	BT_ASSERT_PRE_NON_NULL(stream, "Stream");
+	stream_class = bt_stream_borrow_class(stream);
+	BT_ASSERT(stream_class);
+	BT_LOGD("Creating stream end notification object: "
+		"stream-addr=%p, stream-name=\"%s\", "
+		"stream-class-addr=%p, stream-class-name=\"%s\", "
+		"stream-class-id=%" PRId64,
+		stream, bt_stream_get_name(stream),
+		stream_class,
+		bt_stream_class_get_name(stream_class),
+		bt_stream_class_get_id(stream_class));
+	notification = g_new0(struct bt_notification_stream_end, 1);
+	if (!notification) {
+		BT_LOGE_STR("Failed to allocate one stream end notification.");
 		goto error;
 	}
 
-	notification = g_new0(struct bt_notification_stream_end, 1);
 	bt_notification_init(&notification->parent,
 			BT_NOTIFICATION_TYPE_STREAM_END,
-			bt_notification_stream_end_destroy);
+			bt_notification_stream_end_destroy, NULL);
 	notification->stream = bt_get(stream);
+	BT_LOGD("Created stream end notification object: "
+		"stream-addr=%p, stream-name=\"%s\", "
+		"stream-class-addr=%p, stream-class-name=\"%s\", "
+		"stream-class-id=%" PRId64 ", addr=%p",
+		stream, bt_stream_get_name(stream),
+		stream_class,
+		bt_stream_class_get_name(stream_class),
+		bt_stream_class_get_id(stream_class), notification);
 	return &notification->parent;
 error:
 	return NULL;
 }
 
-struct bt_ctf_packet *bt_notification_stream_end_get_stream(
+struct bt_stream *bt_notification_stream_end_borrow_stream(
 		struct bt_notification *notification)
 {
 	struct bt_notification_stream_end *stream_end;
 
+	BT_ASSERT_PRE_NON_NULL(notification, "Notification");
+	BT_ASSERT_PRE_NOTIF_IS_TYPE(notification,
+		BT_NOTIFICATION_TYPE_STREAM_END);
 	stream_end = container_of(notification,
 			struct bt_notification_stream_end, parent);
-	return bt_get(stream_end->stream);
+	return stream_end->stream;
+}
+
+int bt_notification_stream_end_set_default_clock_value(
+		struct bt_notification *notif, uint64_t value_cycles)
+{
+	int ret = 0;
+	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
@@ -73,35 +155,108 @@ void bt_notification_stream_begin_destroy(struct bt_object *obj)
 	struct bt_notification_stream_begin *notification =
 			(struct bt_notification_stream_begin *) obj;
 
+	BT_LOGD("Destroying stream beginning notification: addr=%p",
+		notification);
+	BT_LOGD_STR("Putting stream.");
 	BT_PUT(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_ctf_stream *stream)
+		struct bt_private_connection_private_notification_iterator *notif_iter,
+		struct bt_stream *stream)
 {
 	struct bt_notification_stream_begin *notification;
+	struct bt_stream_class *stream_class;
 
-	if (!stream || stream->pos.fd >= 0) {
+	BT_ASSERT_PRE_NON_NULL(stream, "Stream");
+	stream_class = bt_stream_borrow_class(stream);
+	BT_ASSERT(stream_class);
+	BT_LOGD("Creating stream beginning notification object: "
+		"stream-addr=%p, stream-name=\"%s\", "
+		"stream-class-addr=%p, stream-class-name=\"%s\", "
+		"stream-class-id=%" PRId64,
+		stream, bt_stream_get_name(stream),
+		stream_class,
+		bt_stream_class_get_name(stream_class),
+		bt_stream_class_get_id(stream_class));
+	notification = g_new0(struct bt_notification_stream_begin, 1);
+	if (!notification) {
+		BT_LOGE_STR("Failed to allocate one stream beginning notification.");
 		goto error;
 	}
 
-	notification = g_new0(struct bt_notification_stream_begin, 1);
 	bt_notification_init(&notification->parent,
 			BT_NOTIFICATION_TYPE_STREAM_BEGIN,
-			bt_notification_stream_begin_destroy);
+			bt_notification_stream_begin_destroy, NULL);
 	notification->stream = bt_get(stream);
+	BT_LOGD("Created stream beginning notification object: "
+		"stream-addr=%p, stream-name=\"%s\", "
+		"stream-class-addr=%p, stream-class-name=\"%s\", "
+		"stream-class-id=%" PRId64 ", addr=%p",
+		stream, bt_stream_get_name(stream),
+		stream_class,
+		bt_stream_class_get_name(stream_class),
+		bt_stream_class_get_id(stream_class), notification);
 	return &notification->parent;
 error:
 	return NULL;
 }
 
-struct bt_ctf_packet *bt_notification_stream_begin_get_stream(
+struct bt_stream *bt_notification_stream_begin_borrow_stream(
 		struct bt_notification *notification)
 {
 	struct bt_notification_stream_begin *stream_begin;
 
+	BT_ASSERT_PRE_NON_NULL(notification, "Notification");
+	BT_ASSERT_PRE_NOTIF_IS_TYPE(notification,
+		BT_NOTIFICATION_TYPE_STREAM_BEGIN);
 	stream_begin = container_of(notification,
 			struct bt_notification_stream_begin, parent);
-	return bt_get(stream_begin->stream);
+	return stream_begin->stream;
+}
+
+int bt_notification_stream_begin_set_default_clock_value(
+		struct bt_notification *notif, uint64_t value_cycles)
+{
+	int ret = 0;
+	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;
 }