X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fgraph%2Fnotification%2Finactivity.c;h=47d759d4d3aa33f7ef058841b8624c85d360cb70;hb=781ae9119b02435d6326a8915ff1cb7e954c3ff5;hp=118b18d6e7e4d32eeff3d32542af5988681389e7;hpb=839d52a5c5c1fdd66cee9bf7d06c0c0acdd4c2a3;p=babeltrace.git diff --git a/lib/graph/notification/inactivity.c b/lib/graph/notification/inactivity.c index 118b18d6..47d759d4 100644 --- a/lib/graph/notification/inactivity.c +++ b/lib/graph/notification/inactivity.c @@ -1,5 +1,5 @@ /* - * Copyright 2017 Philippe Proulx + * Copyright 2017-2018 Philippe Proulx * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,12 +23,14 @@ #define BT_LOG_TAG "NOTIF-INACTIVITY" #include +#include #include #include -#include -#include -#include +#include +#include #include +#include +#include #include static @@ -37,38 +39,29 @@ 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_LOGD_STR("Putting clock class priority map."); - bt_put(notification->cc_prio_map); + BT_LIB_LOGD("Destroying inactivity notification: %!+n", notification); - if (notification->clock_values) { - BT_LOGD_STR("Putting clock values."); - g_hash_table_destroy(notification->clock_values); + if (notification->default_cv) { + bt_clock_value_recycle(notification->default_cv); } g_free(notification); } struct bt_notification *bt_notification_inactivity_create( - struct bt_clock_class_priority_map *cc_prio_map) + 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; - if (cc_prio_map) { - /* Function's reference, released at the end */ - bt_get(cc_prio_map); - } else { - cc_prio_map = bt_clock_class_priority_map_create(); - if (!cc_prio_map) { - BT_LOGE_STR("Cannot create empty clock class priority map."); - goto error; - } - } - - BT_LOGD("Creating inactivity notification object: " - "cc-prio-map-addr=%p", - cc_prio_map); + 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."); @@ -76,163 +69,43 @@ struct bt_notification *bt_notification_inactivity_create( } bt_notification_init(¬ification->parent, BT_NOTIFICATION_TYPE_INACTIVITY, - bt_notification_inactivity_destroy); + bt_notification_inactivity_destroy, NULL); ret_notif = ¬ification->parent; - notification->clock_values = g_hash_table_new_full(g_direct_hash, - g_direct_equal, bt_put, bt_put); - if (!notification->clock_values) { - BT_LOGE_STR("Failed to allocate a GHashTable."); + notification->default_cv = bt_clock_value_create(default_clock_class); + if (!notification->default_cv) { goto error; } - notification->cc_prio_map = bt_get(cc_prio_map); - BT_LOGD_STR("Freezing inactivity notification's clock class priority map."); - bt_clock_class_priority_map_freeze(cc_prio_map); - BT_LOGD("Created inactivity notification object: " - "cc-prio-map-addr=%p, notif-addr=%p", - cc_prio_map, 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: - bt_put(cc_prio_map); - return ret_notif; + return (void *) ret_notif; } -extern struct bt_clock_class_priority_map * -bt_notification_inactivity_get_clock_class_priority_map( - struct bt_notification *notification) +void bt_notification_inactivity_set_default_clock_value( + struct bt_notification *notif, uint64_t value_cycles) { - struct bt_clock_class_priority_map *cc_prio_map = NULL; - struct bt_notification_inactivity *inactivity_notification; - - if (!notification) { - BT_LOGW_STR("Invalid parameter: notification is NULL."); - goto end; - } - - if (bt_notification_get_type(notification) != - BT_NOTIFICATION_TYPE_INACTIVITY) { - BT_LOGW("Invalid parameter: notification is not an inactivity notification: " - "addr%p, notif-type=%s", - notification, bt_notification_type_string( - bt_notification_get_type(notification))); - goto end; - } - - inactivity_notification = container_of(notification, - struct bt_notification_inactivity, parent); - cc_prio_map = bt_get(inactivity_notification->cc_prio_map); -end: - return cc_prio_map; + struct bt_notification_inactivity *inactivity = (void *) notif; + + BT_ASSERT_PRE_NON_NULL(notif, "Notification"); + BT_ASSERT_PRE_NOTIF_IS_TYPE(notif, BT_NOTIFICATION_TYPE_INACTIVITY); + 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); } -struct bt_clock_value *bt_notification_inactivity_get_clock_value( - struct bt_notification *notification, - struct bt_clock_class *clock_class) +const struct bt_clock_value * +bt_notification_inactivity_borrow_default_clock_value_const( + const struct bt_notification *notif) { - struct bt_clock_value *clock_value = NULL; - struct bt_notification_inactivity *inactivity_notification; + struct bt_notification_inactivity *inactivity = (void *) notif; - if (!notification) { - BT_LOGW_STR("Invalid parameter: notification is NULL."); - goto end; - } - - if (!clock_class) { - BT_LOGW_STR("Invalid parameter: clock class is NULL."); - goto end; - } - - if (bt_notification_get_type(notification) != - BT_NOTIFICATION_TYPE_INACTIVITY) { - BT_LOGW("Invalid parameter: notification is not an inactivity notification: " - "addr%p, notif-type=%s", - notification, bt_notification_type_string( - bt_notification_get_type(notification))); - goto end; - } - - inactivity_notification = container_of(notification, - struct bt_notification_inactivity, parent); - clock_value = g_hash_table_lookup(inactivity_notification->clock_values, - clock_class); - bt_get(clock_value); - -end: - return clock_value; -} - -int bt_notification_inactivity_set_clock_value( - struct bt_notification *notification, - struct bt_clock_value *clock_value) -{ - int ret = 0; - uint64_t prio; - struct bt_clock_class *clock_class = NULL; - struct bt_notification_inactivity *inactivity_notification; - - if (!notification) { - BT_LOGW_STR("Invalid parameter: notification is NULL."); - ret = -1; - goto end; - } - - if (!clock_value) { - BT_LOGW_STR("Invalid parameter: clock value is NULL."); - ret = -1; - goto end; - } - - if (notification->frozen) { - BT_LOGW_STR("Invalid parameter: notification is frozen."); - ret = -1; - goto end; - } - - if (bt_notification_get_type(notification) != - BT_NOTIFICATION_TYPE_INACTIVITY) { - BT_LOGW("Invalid parameter: notification is not an inactivity notification: " - "addr%p, notif-type=%s", - notification, bt_notification_type_string( - bt_notification_get_type(notification))); - ret = -1; - goto end; - } - - inactivity_notification = container_of(notification, - struct bt_notification_inactivity, parent); - clock_class = bt_clock_value_get_class(clock_value); - ret = bt_clock_class_priority_map_get_clock_class_priority( - inactivity_notification->cc_prio_map, clock_class, &prio); - if (ret) { - BT_LOGW("Clock value's class is not mapped to a priority within the scope of the inactivity notification: " - "notif-addr=%p, cc-prio-map-addr=%p, " - "clock-class-addr=%p, clock-class-name=\"%s\", " - "clock-value-addr=%p", - inactivity_notification, - inactivity_notification->cc_prio_map, - clock_class, bt_clock_class_get_name(clock_class), - clock_value); - ret = -1; - goto end; - } - - g_hash_table_insert(inactivity_notification->clock_values, - clock_class, bt_get(clock_value)); - clock_class = NULL; - BT_LOGV("Set inactivity notification's clock value: " - "notif-addr=%p, cc-prio-map-addr=%p, " - "clock-class-addr=%p, clock-class-name=\"%s\", " - "clock-value-addr=%p", - inactivity_notification, - inactivity_notification->cc_prio_map, - clock_class, bt_clock_class_get_name(clock_class), - clock_value); - -end: - bt_put(clock_class); - return ret; + BT_ASSERT_PRE_NON_NULL(notif, "Notification"); + BT_ASSERT_PRE_NOTIF_IS_TYPE(notif, BT_NOTIFICATION_TYPE_INACTIVITY); + return inactivity->default_cv; }