lib: remove clock class priority map, use default clock value
[babeltrace.git] / lib / graph / notification / inactivity.c
index 27b6916f689f798bc8f765d320b4163bf58748da..fab8f25695a6acb2aa4ce6e7d7775079e44cb73d 100644 (file)
  * SOFTWARE.
  */
 
+#define BT_LOG_TAG "NOTIF-INACTIVITY"
+#include <babeltrace/lib-logging-internal.h>
+
 #include <babeltrace/object-internal.h>
 #include <babeltrace/compiler-internal.h>
 #include <babeltrace/ctf-ir/clock-class.h>
-#include <babeltrace/graph/clock-class-priority-map.h>
-#include <babeltrace/graph/clock-class-priority-map-internal.h>
+#include <babeltrace/ctf-ir/clock-value-internal.h>
 #include <babeltrace/graph/notification-internal.h>
 #include <babeltrace/graph/notification-inactivity-internal.h>
+#include <babeltrace/assert-pre-internal.h>
 
 static
 void bt_notification_inactivity_destroy(struct bt_object *obj)
@@ -34,41 +37,35 @@ void bt_notification_inactivity_destroy(struct bt_object *obj)
        struct bt_notification_inactivity *notification =
                        (struct bt_notification_inactivity *) obj;
 
-       bt_put(notification->cc_prio_map);
-
-       if (notification->clock_values) {
-               g_hash_table_destroy(notification->clock_values);
-       }
-
+       BT_LOGD("Destroying inactivity notification: addr=%p", notification);
+       bt_clock_value_set_finalize(&notification->cv_set);
        g_free(notification);
 }
 
 struct bt_notification *bt_notification_inactivity_create(
-               struct bt_clock_class_priority_map *cc_prio_map)
+               struct bt_graph *graph)
 {
        struct bt_notification_inactivity *notification;
        struct bt_notification *ret_notif = NULL;
+       int ret;
 
-       if (!cc_prio_map) {
-               goto error;
-       }
-
+       BT_LOGD_STR("Creating inactivity notification object.");
        notification = g_new0(struct bt_notification_inactivity, 1);
        if (!notification) {
+               BT_LOGE_STR("Failed to allocate one inactivity notification.");
                goto error;
        }
        bt_notification_init(&notification->parent,
-                       BT_NOTIFICATION_TYPE_INACTIVITY,
-                       bt_notification_inactivity_destroy);
+               BT_NOTIFICATION_TYPE_INACTIVITY,
+               bt_notification_inactivity_destroy, NULL);
        ret_notif = &notification->parent;
-       notification->clock_values = g_hash_table_new_full(g_direct_hash,
-                       g_direct_equal, bt_put, bt_put);
-       if (!notification->clock_values) {
+       ret = bt_clock_value_set_initialize(&notification->cv_set);
+       if (ret) {
                goto error;
        }
 
-       notification->cc_prio_map = bt_get(cc_prio_map);
-       bt_clock_class_priority_map_freeze(cc_prio_map);
+       BT_LOGD("Created inactivity notification object: addr=%p",
+               ret_notif);
        goto end;
 
 error:
@@ -78,88 +75,34 @@ end:
        return ret_notif;
 }
 
-extern struct bt_clock_class_priority_map *
-bt_notification_inactivity_get_clock_class_priority_map(
-               struct bt_notification *notification)
+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)
 {
-       struct bt_clock_class_priority_map *cc_prio_map = NULL;
-       struct bt_notification_inactivity *inactivity_notification;
-
-       if (bt_notification_get_type(notification) !=
-                       BT_NOTIFICATION_TYPE_INACTIVITY) {
-               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_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);
 }
 
-struct bt_ctf_clock_value *bt_notification_inactivity_get_clock_value(
-               struct bt_notification *notification,
-               struct bt_ctf_clock_class *clock_class)
+struct bt_clock_value *bt_notification_inactivity_borrow_default_clock_value(
+               struct bt_notification *notif)
 {
-       struct bt_ctf_clock_value *clock_value = NULL;
-       struct bt_notification_inactivity *inactivity_notification;
-
-       if (!notification || !clock_class) {
-               goto end;
-       }
-
-       if (bt_notification_get_type(notification) !=
-                       BT_NOTIFICATION_TYPE_INACTIVITY) {
-               goto end;
+       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);
        }
 
-       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_ctf_clock_value *clock_value)
-{
-       int ret = 0;
-       uint64_t prio;
-       struct bt_ctf_clock_class *clock_class = NULL;
-       struct bt_notification_inactivity *inactivity_notification;
-
-       if (!notification || !clock_value || notification->frozen) {
-               ret = -1;
-               goto end;
-       }
-
-       if (bt_notification_get_type(notification) !=
-                       BT_NOTIFICATION_TYPE_INACTIVITY) {
-               goto end;
-       }
-
-       inactivity_notification = container_of(notification,
-                       struct bt_notification_inactivity, parent);
-       clock_class = bt_ctf_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) {
-               /*
-                * Clock value's class is not mapped to a priority
-                * within the scope of this notification.
-                */
-               goto end;
-       }
-
-       g_hash_table_insert(inactivity_notification->clock_values,
-               clock_class, bt_get(clock_value));
-       clock_class = NULL;
-
-end:
-       bt_put(clock_class);
-       return ret;
-}
This page took 0.026739 seconds and 4 git commands to generate.