#include <babeltrace/object-internal.h>
#include <babeltrace/compiler-internal.h>
-#include <babeltrace/ctf-ir/clock-class.h>
-#include <babeltrace/ctf-ir/clock-value-internal.h>
+#include <babeltrace/trace-ir/clock-class.h>
+#include <babeltrace/trace-ir/clock-value-internal.h>
#include <babeltrace/graph/notification-internal.h>
+#include <babeltrace/graph/private-notification-inactivity.h>
#include <babeltrace/graph/notification-inactivity-internal.h>
-#include <babeltrace/graph/private-connection-private-notification-iterator.h>
#include <babeltrace/assert-pre-internal.h>
+#include <babeltrace/object.h>
static
void bt_notification_inactivity_destroy(struct bt_object *obj)
struct bt_notification_inactivity *notification =
(struct bt_notification_inactivity *) obj;
- BT_LOGD("Destroying inactivity notification: addr=%p", notification);
- bt_clock_value_set_finalize(¬ification->cv_set);
+ BT_LIB_LOGD("Destroying inactivity notification: %!+n", notification);
+
+ if (notification->default_cv) {
+ bt_clock_value_recycle(notification->default_cv);
+ }
+
g_free(notification);
}
-struct bt_notification *bt_notification_inactivity_create(
- struct bt_private_connection_private_notification_iterator *notif_iter)
+struct bt_private_notification *bt_private_notification_inactivity_create(
+ struct bt_self_notification_iterator *self_notif_iter,
+ struct bt_clock_class *default_clock_class)
{
+ struct bt_self_component_port_input_notification_iterator *notif_iter =
+ (void *) self_notif_iter;
struct bt_notification_inactivity *notification;
struct bt_notification *ret_notif = NULL;
- int ret;
- BT_LOGD_STR("Creating inactivity notification object.");
+ BT_ASSERT_PRE_NON_NULL(notif_iter, "Notification iterator");
+ BT_ASSERT_PRE_NON_NULL(default_clock_class, "Default clock class");
+ BT_LIB_LOGD("Creating inactivity notification object: "
+ "%![iter-]+i, %![default-cc-]+K", notif_iter,
+ default_clock_class);
notification = g_new0(struct bt_notification_inactivity, 1);
if (!notification) {
BT_LOGE_STR("Failed to allocate one inactivity notification.");
BT_NOTIFICATION_TYPE_INACTIVITY,
bt_notification_inactivity_destroy, NULL);
ret_notif = ¬ification->parent;
- ret = bt_clock_value_set_initialize(¬ification->cv_set);
- if (ret) {
+ notification->default_cv = bt_clock_value_create(default_clock_class);
+ if (!notification->default_cv) {
goto error;
}
- BT_LOGD("Created inactivity notification object: addr=%p",
- ret_notif);
+ BT_LIB_LOGD("Created inactivity notification object: %!+n", ret_notif);
goto end;
error:
- BT_PUT(ret_notif);
+ BT_OBJECT_PUT_REF_AND_RESET(ret_notif);
end:
- return ret_notif;
+ return (void *) ret_notif;
}
-int bt_notification_inactivity_set_clock_value(struct bt_notification *notif,
- struct bt_clock_class *clock_class, uint64_t raw_value,
- bt_bool is_default)
+int bt_private_notification_inactivity_set_default_clock_value(
+ struct bt_private_notification *priv_notif,
+ uint64_t value_cycles)
{
+ struct bt_notification *notif = (void *) priv_notif;
struct bt_notification_inactivity *inactivity = (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_INACTIVITY);
- 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(&inactivity->cv_set,
- clock_class, raw_value, is_default);
+ BT_ASSERT_PRE_HOT(notif, "Notification", ": %!+n", notif);
+ bt_clock_value_set_value_inline(inactivity->default_cv, value_cycles);
+ BT_LIB_LOGV("Set inactivity notification's default clock value: "
+ "%![notif-]+n, value=%" PRIu64, notif, value_cycles);
+ return 0;
}
struct bt_clock_value *bt_notification_inactivity_borrow_default_clock_value(
struct bt_notification *notif)
{
struct bt_notification_inactivity *inactivity = (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_INACTIVITY);
- clock_value = inactivity->cv_set.default_cv;
- if (!clock_value) {
- BT_LIB_LOGV("No default clock value: %![notif-]+n", notif);
- }
-
- return clock_value;
+ return inactivity->default_cv;
}