X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fgraph%2Fnotification%2Fstream.c;h=54293b42f10f935d809f7bc56ba1dd01724dd6f5;hb=65300d60e4b4f167e5fc8f584677757ce09a3844;hp=9908c9703a7a3c41ca16e0356e809372fb1cc086;hpb=9d408fcae74602e3591f66623ceb85f482d948ed;p=babeltrace.git

diff --git a/lib/graph/notification/stream.c b/lib/graph/notification/stream.c
index 9908c970..54293b42 100644
--- a/lib/graph/notification/stream.c
+++ b/lib/graph/notification/stream.c
@@ -27,10 +27,14 @@
 #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/notification-stream-internal.h>
+#include <babeltrace/graph/private-connection-private-notification-iterator.h>
+#include <babeltrace/assert-internal.h>
 #include <inttypes.h>
 
 static
@@ -42,43 +46,33 @@ 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_ctf_stream *stream)
+		struct bt_private_connection_private_notification_iterator *notif_iter,
+		struct bt_stream *stream)
 {
 	struct bt_notification_stream_end *notification;
-	struct bt_ctf_stream_class *stream_class;
-
-	if (!stream) {
-		BT_LOGW_STR("Invalid parameter: stream is NULL.");
-		goto error;
-	}
-
-	stream_class = bt_ctf_stream_borrow_stream_class(stream);
-	assert(stream_class);
-
-	if (stream->pos.fd >= 0) {
-		BT_LOGW("Invalid parameter: stream is a CTF writer stream: "
-			"stream-addr=%p, stream-name=\"%s\", "
-			"stream-class-addr=%p, stream-class-name\"%s\", "
-			"stream-class-id=%" PRId64,
-			stream, bt_ctf_stream_get_name(stream), stream_class,
-			bt_ctf_stream_class_get_name(stream_class),
-			bt_ctf_stream_class_get_id(stream_class));
-		goto error;
-	}
+	struct bt_stream_class *stream_class;
 
+	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_ctf_stream_get_name(stream),
+		stream, bt_stream_get_name(stream),
 		stream_class,
-		bt_ctf_stream_class_get_name(stream_class),
-		bt_ctf_stream_class_get_id(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.");
@@ -87,46 +81,72 @@ 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\", "
 		"stream-class-id=%" PRId64 ", addr=%p",
-		stream, bt_ctf_stream_get_name(stream),
+		stream, bt_stream_get_name(stream),
 		stream_class,
-		bt_ctf_stream_class_get_name(stream_class),
-		bt_ctf_stream_class_get_id(stream_class), notification);
+		bt_stream_class_get_name(stream_class),
+		bt_stream_class_get_id(stream_class), notification);
 	return &notification->parent;
 error:
 	return NULL;
 }
 
-struct bt_ctf_stream *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;
-	struct bt_ctf_stream *stream = NULL;
 
-	if (!notification) {
-		BT_LOGW_STR("Invalid parameter: notification is NULL.");
-		goto 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 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 (notification->type != BT_NOTIFICATION_TYPE_STREAM_END) {
-		BT_LOGW("Invalid parameter: notification is not a stream end notification: "
-			"addr%p, notif-type=%s",
-			notification, bt_notification_type_string(
-				bt_notification_get_type(notification)));
-		goto end;
+	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;
+		}
 	}
 
-	stream_end = container_of(notification,
-			struct bt_notification_stream_end, parent);
-	stream = bt_get(stream_end->stream);
+	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 stream;
+	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
@@ -138,43 +158,33 @@ 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_ctf_stream *stream)
+		struct bt_private_connection_private_notification_iterator *notif_iter,
+		struct bt_stream *stream)
 {
 	struct bt_notification_stream_begin *notification;
-	struct bt_ctf_stream_class *stream_class;
-
-	if (!stream) {
-		BT_LOGW_STR("Invalid parameter: stream is NULL.");
-		goto error;
-	}
-
-	stream_class = bt_ctf_stream_borrow_stream_class(stream);
-	assert(stream_class);
-
-	if (stream->pos.fd >= 0) {
-		BT_LOGW("Invalid parameter: stream is a CTF writer stream: "
-			"stream-addr=%p, stream-name=\"%s\", "
-			"stream-class-addr=%p, stream-class-name\"%s\", "
-			"stream-class-id=%" PRId64,
-			stream, bt_ctf_stream_get_name(stream), stream_class,
-			bt_ctf_stream_class_get_name(stream_class),
-			bt_ctf_stream_class_get_id(stream_class));
-		goto error;
-	}
+	struct bt_stream_class *stream_class;
 
+	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_ctf_stream_get_name(stream),
+		stream, bt_stream_get_name(stream),
 		stream_class,
-		bt_ctf_stream_class_get_name(stream_class),
-		bt_ctf_stream_class_get_id(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.");
@@ -183,44 +193,70 @@ 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\", "
 		"stream-class-id=%" PRId64 ", addr=%p",
-		stream, bt_ctf_stream_get_name(stream),
+		stream, bt_stream_get_name(stream),
 		stream_class,
-		bt_ctf_stream_class_get_name(stream_class),
-		bt_ctf_stream_class_get_id(stream_class), notification);
+		bt_stream_class_get_name(stream_class),
+		bt_stream_class_get_id(stream_class), notification);
 	return &notification->parent;
 error:
 	return NULL;
 }
 
-struct bt_ctf_stream *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;
-	struct bt_ctf_stream *stream = NULL;
 
-	if (!notification) {
-		BT_LOGW_STR("Invalid parameter: notification is NULL.");
-		goto end;
-	}
+	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 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 (notification->type != BT_NOTIFICATION_TYPE_STREAM_BEGIN) {
-		BT_LOGW("Invalid parameter: notification is not a stream beginning notification: "
-			"addr%p, notif-type=%s",
-			notification, bt_notification_type_string(
-				bt_notification_get_type(notification)));
-		goto end;
+	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;
+		}
 	}
 
-	stream_begin = container_of(notification,
-			struct bt_notification_stream_begin, parent);
-	stream = bt_get(stream_begin->stream);
+	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 stream;
+	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;
 }