/*
- * 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>
#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/assert-internal.h>
+#include <babeltrace/object.h>
#include <inttypes.h>
static
struct bt_notification_stream_end *notification =
(struct bt_notification_stream_end *) obj;
- BT_LOGD("Destroying stream end notification: addr=%p",
+ BT_LIB_LOGD("Destroying stream end notification: %!+n",
notification);
- BT_LOGD_STR("Putting stream.");
- BT_PUT(notification->stream);
- bt_clock_value_set_finalize(¬ification->cv_set);
+ BT_LIB_LOGD("Putting stream: %!+s", notification->stream);
+ BT_OBJECT_PUT_REF_AND_RESET(notification->stream);
+
+ if (notification->default_cv) {
+ bt_clock_value_recycle(notification->default_cv);
+ notification->default_cv = NULL;
+ }
+
g_free(notification);
}
-struct bt_notification *bt_notification_stream_end_create(
- struct bt_graph *graph, struct bt_stream *stream)
+struct bt_private_notification *bt_private_notification_stream_end_create(
+ struct bt_self_notification_iterator *self_notif_iter,
+ struct bt_stream *stream)
{
struct bt_notification_stream_end *notification;
struct bt_stream_class *stream_class;
- int ret;
+ BT_ASSERT_PRE_NON_NULL(self_notif_iter, "Notification iterator");
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));
+ BT_LIB_LOGD("Creating stream end notification object: "
+ "%![stream-]+s, %![sc-]+S", stream, stream_class);
notification = g_new0(struct bt_notification_stream_end, 1);
if (!notification) {
BT_LOGE_STR("Failed to allocate one stream end notification.");
bt_notification_init(¬ification->parent,
BT_NOTIFICATION_TYPE_STREAM_END,
bt_notification_stream_end_destroy, NULL);
- notification->stream = bt_get(stream);
- ret = bt_clock_value_set_initialize(¬ification->cv_set);
- if (ret) {
- goto error;
- }
+ notification->stream = stream;
+ bt_object_get_no_null_check(notification->stream);
+ BT_LIB_LOGD("Created stream end notification object: "
+ "%![notif-]+n, %![stream-]+s, %![sc-]+S", notification,
+ stream, stream_class);
- 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 ¬ification->parent;
+ return (void *) ¬ification->parent;
error:
return NULL;
}
-struct bt_stream *bt_notification_stream_end_borrow_stream(
- struct bt_notification *notification)
+struct bt_stream *bt_private_notification_stream_end_borrow_stream(
+ struct bt_private_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);
+ stream_end = (void *) notification;
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)
+const struct bt_stream *bt_notification_stream_end_borrow_stream(
+ struct bt_notification *notification)
{
- struct bt_notification_stream_end *stream_end = (void *) notif;
+ return bt_private_notification_stream_end_borrow_stream(
+ (void *) notification);
+}
+
+void bt_private_notification_stream_end_set_default_clock_value(
+ struct bt_private_notification *priv_notif,
+ uint64_t value_cycles)
+{
+ 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_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);
+ 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);
+
+ /* TODO: have the object already created */
+ se_notif->default_cv = bt_clock_value_create(
+ se_notif->stream->class->default_clock_class);
+ BT_ASSERT(se_notif->default_cv);
+ 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);
}
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;
+ return stream_end->default_cv;
}
static
struct bt_notification_stream_begin *notification =
(struct bt_notification_stream_begin *) obj;
- BT_LOGD("Destroying stream beginning notification: addr=%p",
+ BT_LIB_LOGD("Destroying stream beginning notification: %!+n",
notification);
- BT_LOGD_STR("Putting stream.");
- BT_PUT(notification->stream);
- bt_clock_value_set_finalize(¬ification->cv_set);
+ BT_LIB_LOGD("Putting stream: %!+s", notification->stream);
+ BT_OBJECT_PUT_REF_AND_RESET(notification->stream);
+
+ if (notification->default_cv) {
+ bt_clock_value_recycle(notification->default_cv);
+ notification->default_cv = NULL;
+ }
+
g_free(notification);
}
-struct bt_notification *bt_notification_stream_begin_create(
- struct bt_graph *graph, struct bt_stream *stream)
+struct bt_private_notification *bt_private_notification_stream_begin_create(
+ struct bt_self_notification_iterator *self_notif_iter,
+ struct bt_stream *stream)
{
- int ret;
struct bt_notification_stream_begin *notification;
struct bt_stream_class *stream_class;
+ BT_ASSERT_PRE_NON_NULL(self_notif_iter, "Notification iterator");
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));
+ BT_LIB_LOGD("Creating stream beginning notification object: "
+ "%![stream-]+s, %![sc-]+S", stream, stream_class);
notification = g_new0(struct bt_notification_stream_begin, 1);
if (!notification) {
BT_LOGE_STR("Failed to allocate one stream beginning notification.");
bt_notification_init(¬ification->parent,
BT_NOTIFICATION_TYPE_STREAM_BEGIN,
bt_notification_stream_begin_destroy, NULL);
- notification->stream = bt_get(stream);
- ret = bt_clock_value_set_initialize(¬ification->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\", "
- "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 ¬ification->parent;
+ notification->stream = stream;
+ bt_object_get_no_null_check(notification->stream);
+ BT_LIB_LOGD("Created stream beginning notification object: "
+ "%![notif-]+n, %![stream-]+s, %![sc-]+S", notification,
+ stream, stream_class);
+ return (void *) ¬ification->parent;
error:
return NULL;
}
-struct bt_stream *bt_notification_stream_begin_borrow_stream(
- struct bt_notification *notification)
+struct bt_stream *bt_private_notification_stream_begin_borrow_stream(
+ struct bt_private_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);
+ stream_begin = (void *) notification;
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)
+const struct bt_stream *bt_notification_stream_begin_borrow_stream(
+ struct bt_notification *notification)
{
- struct bt_notification_stream_begin *stream_begin = (void *) notif;
+ return bt_private_notification_stream_begin_borrow_stream(
+ (void *) notification);
+}
+
+void bt_private_notification_stream_begin_set_default_clock_value(
+ struct bt_private_notification *priv_notif,
+ uint64_t value_cycles)
+{
+ 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_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);
+ 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);
+
+ /* TODO: have the object already created */
+ sb_notif->default_cv = bt_clock_value_create(
+ sb_notif->stream->class->default_clock_class);
+ BT_ASSERT(sb_notif->default_cv);
+ 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);
}
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;
+ return stream_begin->default_cv;
}
projects / babeltrace.git / blobdiff