Rename: bt_put(), bt_get() -> bt_object_put_ref(), bt_object_get_ref()

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

diff --git a/plugins/utils/muxer/muxer.c b/plugins/utils/muxer/muxer.c
index f3740a354b1ed5eac7363e1cc11d4f074572943a..956e84f5e2af31a5d279d7a762c2f33760ba69db 100644 (file)
--- a/plugins/utils/muxer/muxer.c
+++ b/plugins/utils/muxer/muxer.c
@@ -120,14 +120,14 @@ void destroy_muxer_upstream_notif_iter(
                muxer_upstream_notif_iter,
                muxer_upstream_notif_iter->notif_iter,
                muxer_upstream_notif_iter->notifs->length);
-       bt_put(muxer_upstream_notif_iter->notif_iter);
+       bt_object_put_ref(muxer_upstream_notif_iter->notif_iter);
 
        if (muxer_upstream_notif_iter->notifs) {
                struct bt_notification *notif;
 
                while ((notif = g_queue_pop_head(
                                muxer_upstream_notif_iter->notifs))) {
-                       bt_put(notif);
+                       bt_object_put_ref(notif);
                }
 
                g_queue_free(muxer_upstream_notif_iter->notifs);
@@ -150,7 +150,7 @@ struct muxer_upstream_notif_iter *muxer_notif_iter_add_upstream_notif_iter(
                goto end;
        }
 
-       muxer_upstream_notif_iter->notif_iter = bt_get(notif_iter);
+       muxer_upstream_notif_iter->notif_iter = bt_object_get_ref(notif_iter);
        muxer_upstream_notif_iter->notifs = g_queue_new();
        if (!muxer_upstream_notif_iter->notifs) {
                BT_LOGE_STR("Failed to allocate a GQueue.");
@@ -254,7 +254,7 @@ struct bt_value *get_default_params(void)
                goto error;
        }
 
-       ret = bt_value_map_insert_bool(params,
+       ret = bt_value_map_insert_bool_entry(params,
                ASSUME_ABSOLUTE_CLOCK_CLASSES_PARAM_NAME, false);
        if (ret) {
                BT_LOGE_STR("Cannot add boolean value to map value object.");
@@ -264,7 +264,7 @@ struct bt_value *get_default_params(void)
        goto end;
 
 error:
-       BT_PUT(params);
+       BT_OBJECT_PUT_REF_AND_RESET(params);
 
 end:
        return params;
@@ -295,7 +295,7 @@ int configure_muxer_comp(struct muxer_comp *muxer_comp, struct bt_value *params)
                goto error;
        }
 
-       assume_absolute_clock_classes = bt_value_map_borrow(real_params,
+       assume_absolute_clock_classes = bt_value_map_borrow_entry_value(real_params,
                ASSUME_ABSOLUTE_CLOCK_CLASSES_PARAM_NAME);
        if (assume_absolute_clock_classes &&
                        !bt_value_is_bool(assume_absolute_clock_classes)) {
@@ -319,8 +319,8 @@ error:
        ret = -1;
 
 end:
-       bt_put(default_params);
-       bt_put(real_params);
+       bt_object_put_ref(default_params);
+       bt_object_put_ref(real_params);
        return ret;
 }
 
@@ -443,7 +443,7 @@ struct bt_notification_iterator *create_notif_iter_on_input_port(
                port, bt_port_get_name(port), priv_conn, notif_iter);
 
 end:
-       bt_put(priv_conn);
+       bt_object_put_ref(priv_conn);
        return notif_iter;
 }
 
@@ -499,7 +499,7 @@ enum bt_notification_iterator_status muxer_upstream_notif_iter_next(
                 * won't be considered again to find the youngest
                 * notification.
                 */
-               BT_PUT(muxer_upstream_notif_iter->notif_iter);
+               BT_OBJECT_PUT_REF_AND_RESET(muxer_upstream_notif_iter->notif_iter);
                status = BT_NOTIFICATION_ITERATOR_STATUS_OK;
                break;
        default:
@@ -567,7 +567,7 @@ int muxer_notif_iter_handle_newly_connected_ports(
                        muxer_notif_iter_add_upstream_notif_iter(
                                muxer_notif_iter, upstream_notif_iter,
                                priv_port);
-               BT_PUT(upstream_notif_iter);
+               BT_OBJECT_PUT_REF_AND_RESET(upstream_notif_iter);
                if (!muxer_upstream_notif_iter) {
                        /*
                         * muxer_notif_iter_add_upstream_notif_iter()
@@ -577,7 +577,7 @@ int muxer_notif_iter_handle_newly_connected_ports(
                }
 
 remove_node:
-               bt_put(upstream_notif_iter);
+               bt_object_put_ref(upstream_notif_iter);
                muxer_notif_iter->newly_connected_priv_ports =
                        g_list_delete_link(
                                muxer_notif_iter->newly_connected_priv_ports,
@@ -607,6 +607,7 @@ int get_notif_ts_ns(struct muxer_comp *muxer_comp,
        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);
@@ -620,7 +621,8 @@ int get_notif_ts_ns(struct muxer_comp *muxer_comp,
        case BT_NOTIFICATION_TYPE_EVENT:
                event = bt_notification_event_borrow_event(notif);
                BT_ASSERT(event);
-               clock_value = bt_event_borrow_default_clock_value(event);
+               cv_status = bt_event_borrow_default_clock_value(event,
+                       &clock_value);
                break;
 
        case BT_NOTIFICATION_TYPE_INACTIVITY:
@@ -635,6 +637,12 @@ int get_notif_ts_ns(struct muxer_comp *muxer_comp,
                goto end;
        }
 
+       if (cv_status != BT_CLOCK_VALUE_STATUS_KNOWN) {
+               BT_LOGE_STR("Unsupported unknown clock value.");
+               ret = -1;
+               goto end;
+       }
+
        /*
         * If the clock value is missing, then we consider that this
         * notification has no time. In this case it's always the
@@ -647,7 +655,7 @@ int get_notif_ts_ns(struct muxer_comp *muxer_comp,
                goto end;
        }
 
-       clock_class = bt_clock_value_borrow_class(clock_value);
+       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);
@@ -800,7 +808,7 @@ int get_notif_ts_ns(struct muxer_comp *muxer_comp,
                }
        }
 
-       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);
@@ -1189,11 +1197,11 @@ int muxer_notif_iter_init_newly_connected_ports(struct muxer_comp *muxer_comp,
                        BT_LOGD("Skipping input port: not connected: "
                                "muxer-comp-addr=%p, port-addr=%p, port-name\"%s\"",
                                muxer_comp, port, bt_port_get_name(port));
-                       bt_put(priv_port);
+                       bt_object_put_ref(priv_port);
                        continue;
                }
 
-               bt_put(priv_port);
+               bt_object_put_ref(priv_port);
                muxer_notif_iter->newly_connected_priv_ports =
                        g_list_append(
                                muxer_notif_iter->newly_connected_priv_ports,
@@ -1310,7 +1318,7 @@ error:
 
 end:
        muxer_comp->initializing_muxer_notif_iter = false;
-       bt_put(priv_comp);
+       bt_object_put_ref(priv_comp);
        return status;
 }
 
@@ -1338,7 +1346,7 @@ void muxer_notif_iter_finalize(
                destroy_muxer_notif_iter(muxer_notif_iter);
        }
 
-       bt_put(priv_comp);
+       bt_object_put_ref(priv_comp);
 }
 
 BT_HIDDEN
@@ -1378,7 +1386,7 @@ enum bt_notification_iterator_status muxer_notif_iter_next(
                        bt_notification_iterator_status_string(status));
        }
 
-       bt_put(priv_comp);
+       bt_object_put_ref(priv_comp);
        return status;
 }