lib: remove clock class priority map, use default clock value

[babeltrace.git] / lib / graph / notification / stream.c

diff --git a/lib/graph/notification/stream.c b/lib/graph/notification/stream.c
index af6156333141a4f5a13e125c517f721217db3a56..f82761952171bd40f968662fc5fc138a4d113ae7 100644 (file)
--- a/lib/graph/notification/stream.c
+++ b/lib/graph/notification/stream.c
@@ -27,12 +27,12 @@
 #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/graph/notification-stream-internal.h>
 #include <babeltrace/assert-internal.h>
-#include <babeltrace/assert-pre-internal.h>
 #include <inttypes.h>
 
 static
@@ -45,19 +45,19 @@ void bt_notification_stream_end_destroy(struct bt_object *obj)
                notification);
        BT_LOGD_STR("Putting stream.");
        BT_PUT(notification->stream);
+       bt_clock_value_set_finalize(&notification->cv_set);
        g_free(notification);
 }
 
 struct bt_notification *bt_notification_stream_end_create(
-               struct bt_stream *stream)
+               struct bt_graph *graph, struct bt_stream *stream)
 {
        struct bt_notification_stream_end *notification;
        struct bt_stream_class *stream_class;
+       int ret;
 
        BT_ASSERT_PRE_NON_NULL(stream, "Stream");
-       BT_ASSERT_PRE(stream->pos.fd < 0,
-               "Stream is a CTF writer stream: %!+s", stream);
-       stream_class = bt_stream_borrow_stream_class(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\", "
@@ -75,8 +75,13 @@ struct bt_notification *bt_notification_stream_end_create(
 
        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);
+       ret = bt_clock_value_set_initialize(&notification->cv_set);
+       if (ret) {
+               goto error;
+       }
+
        BT_LOGD("Created stream end notification object: "
                "stream-addr=%p, stream-name=\"%s\", "
                "stream-class-addr=%p, stream-class-name=\"%s\", "
@@ -90,7 +95,7 @@ error:
        return NULL;
 }
 
-struct bt_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;
@@ -100,7 +105,39 @@ struct bt_stream *bt_notification_stream_end_get_stream(
                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_clock_value(struct bt_notification *notif,
+               struct bt_clock_class *clock_class, uint64_t raw_value,
+               bt_bool is_default)
+{
+       struct bt_notification_stream_end *stream_end = (void *) notif;
+
+       BT_ASSERT_PRE_NON_NULL(notif, "Notification");
+       BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
+       BT_ASSERT_PRE_HOT(notif, "Notification", ": %!+n", notif);
+       BT_ASSERT_PRE_NOTIF_IS_TYPE(notif, BT_NOTIFICATION_TYPE_STREAM_END);
+       BT_ASSERT_PRE(is_default,
+               "You can only set a default clock value as of this version.");
+       return bt_clock_value_set_set_clock_value(&stream_end->cv_set,
+               clock_class, raw_value, is_default);
+}
+
+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;
+       struct bt_clock_value *clock_value = NULL;
+
+       BT_ASSERT_PRE_NON_NULL(notif, "Notification");
+       BT_ASSERT_PRE_NOTIF_IS_TYPE(notif, BT_NOTIFICATION_TYPE_STREAM_END);
+       clock_value = stream_end->cv_set.default_cv;
+       if (!clock_value) {
+               BT_LIB_LOGV("No default clock value: %![notif-]+n", notif);
+       }
+
+       return clock_value;
 }
 
 static
@@ -113,19 +150,19 @@ void bt_notification_stream_begin_destroy(struct bt_object *obj)
                notification);
        BT_LOGD_STR("Putting stream.");
        BT_PUT(notification->stream);
+       bt_clock_value_set_finalize(&notification->cv_set);
        g_free(notification);
 }
 
 struct bt_notification *bt_notification_stream_begin_create(
-               struct bt_stream *stream)
+               struct bt_graph *graph, struct bt_stream *stream)
 {
+       int ret;
        struct bt_notification_stream_begin *notification;
        struct bt_stream_class *stream_class;
 
        BT_ASSERT_PRE_NON_NULL(stream, "Stream");
-       BT_ASSERT_PRE(stream->pos.fd < 0,
-               "Stream is a CTF writer stream: %!+s", stream);
-       stream_class = bt_stream_borrow_stream_class(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\", "
@@ -143,8 +180,13 @@ struct bt_notification *bt_notification_stream_begin_create(
 
        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);
+       ret = bt_clock_value_set_initialize(&notification->cv_set);
+       if (ret) {
+               goto error;
+       }
+
        BT_LOGD("Created stream beginning notification object: "
                "stream-addr=%p, stream-name=\"%s\", "
                "stream-class-addr=%p, stream-class-name=\"%s\", "
@@ -158,7 +200,7 @@ error:
        return NULL;
 }
 
-struct bt_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;
@@ -168,5 +210,37 @@ struct bt_stream *bt_notification_stream_begin_get_stream(
                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_clock_value(struct bt_notification *notif,
+               struct bt_clock_class *clock_class, uint64_t raw_value,
+               bt_bool is_default)
+{
+       struct bt_notification_stream_begin *stream_begin = (void *) notif;
+
+       BT_ASSERT_PRE_NON_NULL(notif, "Notification");
+       BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
+       BT_ASSERT_PRE_HOT(notif, "Notification", ": %!+n", notif);
+       BT_ASSERT_PRE_NOTIF_IS_TYPE(notif, BT_NOTIFICATION_TYPE_STREAM_BEGIN);
+       BT_ASSERT_PRE(is_default,
+               "You can only set a default clock value as of this version.");
+       return bt_clock_value_set_set_clock_value(&stream_begin->cv_set,
+               clock_class, raw_value, is_default);
+}
+
+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;
+       struct bt_clock_value *clock_value = NULL;
+
+       BT_ASSERT_PRE_NON_NULL(notif, "Notification");
+       BT_ASSERT_PRE_NOTIF_IS_TYPE(notif, BT_NOTIFICATION_TYPE_STREAM_BEGIN);
+       clock_value = stream_begin->cv_set.default_cv;
+       if (!clock_value) {
+               BT_LIB_LOGV("No default clock value: %![notif-]+n", notif);
+       }
+
+       return clock_value;
 }