lib: have default clock snapshot in event message

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

diff --git a/plugins/utils/muxer/muxer.c b/plugins/utils/muxer/muxer.c
index 19c6b768f6d7079a21c6c0399e76d9e39787b56f..700789520fee6d2ea2df02a5da90a708a3106aa9 100644 (file)
--- a/plugins/utils/muxer/muxer.c
+++ b/plugins/utils/muxer/muxer.c
@@ -610,7 +610,6 @@ int get_msg_ts_ns(struct muxer_comp *muxer_comp,
 {
        const bt_clock_class *clock_class = NULL;
        const bt_clock_snapshot *clock_snapshot = NULL;
-       const bt_event *event = NULL;
        int ret = 0;
        const unsigned char *cc_uuid;
        const char *cc_name;
@@ -626,10 +625,8 @@ int get_msg_ts_ns(struct muxer_comp *muxer_comp,
 
        switch (bt_message_get_type(msg)) {
        case BT_MESSAGE_TYPE_EVENT:
-               event = bt_message_event_borrow_event_const(msg);
-               BT_ASSERT(event);
-               cs_state = bt_event_borrow_default_clock_snapshot_const(event,
-                       &clock_snapshot);
+               cs_state = bt_message_event_borrow_default_clock_snapshot_const(
+                       msg, &clock_snapshot);
                break;
 
        case BT_MESSAGE_TYPE_INACTIVITY:
@@ -1117,10 +1114,10 @@ bt_self_message_iterator_status muxer_msg_iter_do_next(
                BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
        uint64_t i = 0;
 
-       while (i < capacity && status == BT_MESSAGE_ITERATOR_STATUS_OK) {
+       while (i < capacity && status == BT_SELF_MESSAGE_ITERATOR_STATUS_OK) {
                status = muxer_msg_iter_do_next_one(muxer_comp,
                        muxer_msg_iter, &msgs[i]);
-               if (status == BT_MESSAGE_ITERATOR_STATUS_OK) {
+               if (status == BT_SELF_MESSAGE_ITERATOR_STATUS_OK) {
                        i++;
                }
        }
@@ -1462,29 +1459,3 @@ bt_self_component_status muxer_input_port_connected(
 end:
        return status;
 }
-
-BT_HIDDEN
-void muxer_input_port_disconnected(
-               bt_self_component_filter *self_component,
-               bt_self_component_port_input *self_port)
-{
-       struct muxer_comp *muxer_comp =
-               bt_self_component_get_data(
-                       bt_self_component_filter_as_self_component(
-                               self_component));
-       const bt_port *port =
-               bt_self_component_port_as_port(
-                       bt_self_component_port_input_as_self_component_port(
-                               self_port));
-
-       BT_ASSERT(port);
-       BT_ASSERT(muxer_comp);
-
-       /* One more available input port */
-       muxer_comp->available_input_ports++;
-       BT_LOGD("Leaving disconnected input port available for future connections: "
-               "comp-addr=%p, muxer-comp-addr=%p, port-addr=%p, "
-               "port-name=\"%s\", avail-input-port-count=%zu",
-               self_component, muxer_comp, port, bt_port_get_name(port),
-               muxer_comp->available_input_ports);
-}