X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=lib%2Fgraph%2Fnotification%2Finactivity.c;h=b6708d3b6ad5f4c74bbe11196449d05d636678cd;hb=5c5632787fc9cafa602c89a28966bcfd01ec0204;hp=118b18d6e7e4d32eeff3d32542af5988681389e7;hpb=50842bdc4c21f3de2b63e29cdac730af8b6dcca6;p=babeltrace.git diff --git a/lib/graph/notification/inactivity.c b/lib/graph/notification/inactivity.c index 118b18d6..b6708d3b 100644 --- a/lib/graph/notification/inactivity.c +++ b/lib/graph/notification/inactivity.c @@ -26,10 +26,12 @@ #include #include #include +#include #include #include #include #include +#include static void bt_notification_inactivity_destroy(struct bt_object *obj) @@ -50,10 +52,12 @@ void bt_notification_inactivity_destroy(struct bt_object *obj) } struct bt_notification *bt_notification_inactivity_create( + struct bt_graph *graph, struct bt_clock_class_priority_map *cc_prio_map) { struct bt_notification_inactivity *notification; struct bt_notification *ret_notif = NULL; + uint64_t i; if (cc_prio_map) { /* Function's reference, released at the end */ @@ -76,15 +80,31 @@ 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); + g_direct_equal, NULL, (GDestroyNotify) bt_clock_value_recycle); if (!notification->clock_values) { BT_LOGE_STR("Failed to allocate a GHashTable."); goto error; } + for (i = 0; i < cc_prio_map->entries->len; i++) { + struct bt_clock_value *clock_value; + struct bt_clock_class *clock_class = + cc_prio_map->entries->pdata[i]; + + clock_value = bt_clock_value_create(clock_class); + if (!clock_value) { + BT_LIB_LOGE("Cannot create clock value from clock class: " + "%![cc-]+K", clock_class); + goto error; + } + + g_hash_table_insert(notification->clock_values, + clock_class, clock_value); + } + 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); @@ -102,137 +122,31 @@ end: } extern struct bt_clock_class_priority_map * -bt_notification_inactivity_get_clock_class_priority_map( +bt_notification_inactivity_borrow_clock_class_priority_map( struct bt_notification *notification) { - 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; - } - + BT_ASSERT_PRE_NON_NULL(notification, "Notification"); + BT_ASSERT_PRE_NOTIF_IS_TYPE(notification, + BT_NOTIFICATION_TYPE_INACTIVITY); 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; + return inactivity_notification->cc_prio_map; } -struct bt_clock_value *bt_notification_inactivity_get_clock_value( +struct bt_clock_value *bt_notification_inactivity_borrow_clock_value( struct bt_notification *notification, struct bt_clock_class *clock_class) { - struct bt_clock_value *clock_value = NULL; struct bt_notification_inactivity *inactivity_notification; - 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; - } - + BT_ASSERT_PRE_NON_NULL(notification, "Notification"); + BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class"); + BT_ASSERT_PRE_NOTIF_IS_TYPE(notification, + BT_NOTIFICATION_TYPE_INACTIVITY); 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; + return g_hash_table_lookup( + inactivity_notification->clock_values, clock_class); }