Make API CTF-agnostic

[babeltrace.git] / plugins / utils / muxer / muxer.c

diff --git a/plugins/utils/muxer/muxer.c b/plugins/utils/muxer/muxer.c
index 2e52f3d70925b4377582be7d3299b7cfeee2136a..c75b5d9bbfd801b47dfea8366d923913a92f56f2 100644 (file)
--- a/plugins/utils/muxer/muxer.c
+++ b/plugins/utils/muxer/muxer.c
@@ -601,13 +601,13 @@ int get_notif_ts_ns(struct muxer_comp *muxer_comp,
                struct bt_notification *notif, int64_t last_returned_ts_ns,
                int64_t *ts_ns)
 {
-       struct bt_clock_class_priority_map *cc_prio_map = NULL;
        struct bt_clock_class *clock_class = NULL;
        struct bt_clock_value *clock_value = NULL;
        struct bt_event *event = NULL;
        int ret = 0;
        const unsigned char *cc_uuid;
        const char *cc_name;
+       enum bt_clock_value_status cv_status = BT_CLOCK_VALUE_STATUS_KNOWN;
 
        BT_ASSERT(notif);
        BT_ASSERT(ts_ns);
@@ -619,14 +619,15 @@ int get_notif_ts_ns(struct muxer_comp *muxer_comp,
 
        switch (bt_notification_get_type(notif)) {
        case BT_NOTIFICATION_TYPE_EVENT:
-               cc_prio_map =
-                       bt_notification_event_borrow_clock_class_priority_map(
-                               notif);
+               event = bt_notification_event_borrow_event(notif);
+               BT_ASSERT(event);
+               cv_status = bt_event_borrow_default_clock_value(event,
+                       &clock_value);
                break;
 
        case BT_NOTIFICATION_TYPE_INACTIVITY:
-               cc_prio_map =
-                       bt_notification_inactivity_borrow_clock_class_priority_map(
+               clock_value =
+                       bt_notification_inactivity_borrow_default_clock_value(
                                notif);
                break;
        default:
@@ -636,33 +637,26 @@ int get_notif_ts_ns(struct muxer_comp *muxer_comp,
                goto end;
        }
 
-       if (!cc_prio_map) {
-               BT_LOGE("Cannot get notification's clock class priority map: "
-                       "notif-addr=%p", notif);
-               goto error;
+       if (cv_status != BT_CLOCK_VALUE_STATUS_KNOWN) {
+               BT_LOGE_STR("Unsupported unknown clock value.");
+               ret = -1;
+               goto end;
        }
 
        /*
-        * If the clock class priority map is empty, then we consider
-        * that this notification has no time. In this case it's always
-        * the youngest.
+        * If the clock value is missing, then we consider that this
+        * notification has no time. In this case it's always the
+        * youngest.
         */
-       if (bt_clock_class_priority_map_get_clock_class_count(cc_prio_map) == 0) {
-               BT_LOGV_STR("Notification's clock class priority map contains 0 clock classes: "
+       if (!clock_value) {
+               BT_LOGV_STR("Notification's default clock value is missing: "
                        "using the last returned timestamp.");
                *ts_ns = last_returned_ts_ns;
                goto end;
        }
 
-       clock_class =
-               bt_clock_class_priority_map_borrow_highest_priority_clock_class(
-                       cc_prio_map);
-       if (!clock_class) {
-               BT_LOGE("Cannot get the clock class with the highest priority from clock class priority map: "
-                       "cc-prio-map-addr=%p", cc_prio_map);
-               goto error;
-       }
-
+       clock_class = bt_clock_value_borrow_clock_class(clock_value);
+       BT_ASSERT(clock_class);
        cc_uuid = bt_clock_class_get_uuid(clock_class);
        cc_name = bt_clock_class_get_name(clock_class);
 
@@ -814,31 +808,7 @@ int get_notif_ts_ns(struct muxer_comp *muxer_comp,
                }
        }
 
-       switch (bt_notification_get_type(notif)) {
-       case BT_NOTIFICATION_TYPE_EVENT:
-               event = bt_notification_event_borrow_event(notif);
-               BT_ASSERT(event);
-               clock_value = bt_event_borrow_clock_value(event,
-                       clock_class);
-               break;
-       case BT_NOTIFICATION_TYPE_INACTIVITY:
-               clock_value = bt_notification_inactivity_borrow_clock_value(
-                       notif, clock_class);
-               break;
-       default:
-               BT_LOGF("Unexpected notification type at this point: "
-                       "type=%d", bt_notification_get_type(notif));
-               abort();
-       }
-
-       if (!clock_value) {
-               BT_LOGE("Cannot get notification's clock value for clock class: "
-                       "clock-class-addr=%p, clock-class-name=\"%s\"",
-                       clock_class, cc_name);
-               goto error;
-       }
-
-       ret = bt_clock_value_get_value_ns_from_epoch(clock_value, ts_ns);
+       ret = bt_clock_value_get_ns_from_origin(clock_value, ts_ns);
        if (ret) {
                BT_LOGE("Cannot get nanoseconds from Epoch of clock value: "
                        "clock-value-addr=%p", clock_value);