X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fgraph%2Fnotification%2Fstream.c;h=11af10b8e36c5b476c4684820596898b44173485;hb=398454ed067b95215c7affbe265fd36edab931ee;hp=84ee483a900361dd00cd1f552b091308ce8e1855;hpb=3dca22768a95bef664012559aa9ac977091de6ac;p=babeltrace.git diff --git a/lib/graph/notification/stream.c b/lib/graph/notification/stream.c index 84ee483a..11af10b8 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 * * Author: Jérémie Galarneau @@ -27,12 +25,15 @@ #define BT_LOG_TAG "NOTIF-STREAM" #include +#include #include -#include -#include +#include +#include +#include +#include #include #include -#include +#include #include static @@ -41,30 +42,33 @@ 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", + BT_LIB_LOGD("Destroying stream end notification: %!+n", notification); - BT_LOGD_STR("Putting stream."); - BT_PUT(notification->stream); + 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_stream *stream) +struct bt_private_notification *bt_private_notification_stream_end_create( + struct bt_self_notification_iterator *self_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; + 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."); @@ -73,22 +77,19 @@ struct bt_notification *bt_notification_stream_end_create( bt_notification_init(¬ification->parent, BT_NOTIFICATION_TYPE_STREAM_END, - bt_notification_stream_end_destroy); - 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 ¬ification->parent; + bt_notification_stream_end_destroy, NULL); + 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); + + return (void *) ¬ification->parent; 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; @@ -98,7 +99,47 @@ 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; +} + +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); +} + +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_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); + + /* 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; + + 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 @@ -107,30 +148,33 @@ 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", + BT_LIB_LOGD("Destroying stream beginning notification: %!+n", notification); - BT_LOGD_STR("Putting stream."); - BT_PUT(notification->stream); + 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_stream *stream) +struct bt_private_notification *bt_private_notification_stream_begin_create( + struct bt_self_notification_iterator *self_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; + 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."); @@ -139,22 +183,18 @@ struct bt_notification *bt_notification_stream_begin_create( bt_notification_init(¬ification->parent, BT_NOTIFICATION_TYPE_STREAM_BEGIN, - bt_notification_stream_begin_destroy); - 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 ¬ification->parent; + bt_notification_stream_begin_destroy, NULL); + 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_get_stream( +struct bt_stream *bt_notification_stream_begin_borrow_stream( struct bt_notification *notification) { struct bt_notification_stream_begin *stream_begin; @@ -164,5 +204,45 @@ 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; +} + +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); +} + +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_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); + + /* 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; + + BT_ASSERT_PRE_NON_NULL(notif, "Notification"); + BT_ASSERT_PRE_NOTIF_IS_TYPE(notif, BT_NOTIFICATION_TYPE_STREAM_BEGIN); + return stream_begin->default_cv; }