X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Futils%2Fmuxer%2Fmuxer.c;h=7c5991abb3685806638fbae0f57f26d9dacfb91a;hb=40f4ba76dd6f9508ca51b6220eaed57632281a07;hp=a99f1e278b0e75d44bc5ff3561992f387c4ad2d4;hpb=50842bdc4c21f3de2b63e29cdac730af8b6dcca6;p=babeltrace.git diff --git a/plugins/utils/muxer/muxer.c b/plugins/utils/muxer/muxer.c index a99f1e27..7c5991ab 100644 --- a/plugins/utils/muxer/muxer.c +++ b/plugins/utils/muxer/muxer.c @@ -34,7 +34,8 @@ #include #include #include -#include +#include +#include #include #include @@ -43,36 +44,26 @@ struct muxer_comp { /* * Array of struct - * bt_private_connection_private_notification_iterator * + * bt_self_notification_iterator * * (weak refs) */ GPtrArray *muxer_notif_iters; /* Weak ref */ - struct bt_private_component *priv_comp; + struct bt_self_component_filter *self_comp; + unsigned int next_port_num; size_t available_input_ports; - bool error; bool initializing_muxer_notif_iter; bool assume_absolute_clock_classes; }; struct muxer_upstream_notif_iter { /* Owned by this, NULL if ended */ - struct bt_notification_iterator *notif_iter; + struct bt_self_component_port_input_notification_iterator *notif_iter; - /* - * This flag is true if the upstream notification iterator's - * current notification must be considered for the multiplexing - * operations. If the upstream iterator returns - * BT_NOTIFICATION_ITERATOR_STATUS_AGAIN, then this object - * is considered invalid, because its current notification is - * still the previous one, but we already took it into account. - * - * The value of this flag is not important if notif_iter above - * is NULL (which means the upstream iterator is finished). - */ - bool is_valid; + /* Contains `struct bt_notification *`, owned by this */ + GQueue *notifs; }; enum muxer_notif_iter_clock_class_expectation { @@ -102,10 +93,7 @@ struct muxer_notif_iter { * muxer_upstream_notif_iters above by * muxer_notif_iter_handle_newly_connected_ports(). */ - GList *newly_connected_priv_ports; - - /* Next thing to return by the "next" method */ - struct bt_notification_iterator_next_method_return next_next_return; + GList *newly_connected_self_ports; /* Last time returned in a notification */ int64_t last_returned_ts_ns; @@ -130,19 +118,30 @@ void destroy_muxer_upstream_notif_iter( } BT_LOGD("Destroying muxer's upstream notification iterator wrapper: " - "addr=%p, notif-iter-addr=%p, is-valid=%d", + "addr=%p, notif-iter-addr=%p, queue-len=%u", muxer_upstream_notif_iter, muxer_upstream_notif_iter->notif_iter, - muxer_upstream_notif_iter->is_valid); - bt_put(muxer_upstream_notif_iter->notif_iter); + muxer_upstream_notif_iter->notifs->length); + 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_object_put_ref(notif); + } + + g_queue_free(muxer_upstream_notif_iter->notifs); + } + g_free(muxer_upstream_notif_iter); } static struct muxer_upstream_notif_iter *muxer_notif_iter_add_upstream_notif_iter( struct muxer_notif_iter *muxer_notif_iter, - struct bt_notification_iterator *notif_iter, - struct bt_private_port *priv_port) + struct bt_self_component_port_input_notification_iterator *self_notif_iter) { struct muxer_upstream_notif_iter *muxer_upstream_notif_iter = g_new0(struct muxer_upstream_notif_iter, 1); @@ -152,29 +151,35 @@ 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->is_valid = false; + muxer_upstream_notif_iter->notif_iter = self_notif_iter; + bt_object_get_ref(muxer_upstream_notif_iter->notif_iter); + muxer_upstream_notif_iter->notifs = g_queue_new(); + if (!muxer_upstream_notif_iter->notifs) { + BT_LOGE_STR("Failed to allocate a GQueue."); + goto end; + } + g_ptr_array_add(muxer_notif_iter->muxer_upstream_notif_iters, muxer_upstream_notif_iter); BT_LOGD("Added muxer's upstream notification iterator wrapper: " "addr=%p, muxer-notif-iter-addr=%p, notif-iter-addr=%p", muxer_upstream_notif_iter, muxer_notif_iter, - notif_iter); + self_notif_iter); end: return muxer_upstream_notif_iter; } static -enum bt_component_status ensure_available_input_port( - struct bt_private_component *priv_comp) +enum bt_self_component_status ensure_available_input_port( + struct bt_self_component_filter *self_comp) { - struct muxer_comp *muxer_comp = - bt_private_component_get_user_data(priv_comp); - enum bt_component_status status = BT_COMPONENT_STATUS_OK; + struct muxer_comp *muxer_comp = bt_self_component_get_data( + bt_self_component_filter_as_self_component(self_comp)); + enum bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK; GString *port_name = NULL; - assert(muxer_comp); + BT_ASSERT(muxer_comp); if (muxer_comp->available_input_ports >= 1) { goto end; @@ -183,18 +188,18 @@ enum bt_component_status ensure_available_input_port( port_name = g_string_new("in"); if (!port_name) { BT_LOGE_STR("Failed to allocate a GString."); - status = BT_COMPONENT_STATUS_NOMEM; + status = BT_SELF_COMPONENT_STATUS_NOMEM; goto end; } g_string_append_printf(port_name, "%u", muxer_comp->next_port_num); - status = bt_private_component_filter_add_input_private_port( - priv_comp, port_name->str, NULL, NULL); - if (status != BT_COMPONENT_STATUS_OK) { + status = bt_self_component_filter_add_input_port( + self_comp, port_name->str, NULL, NULL); + if (status != BT_SELF_COMPONENT_STATUS_OK) { BT_LOGE("Cannot add input port to muxer component: " "port-name=\"%s\", comp-addr=%p, status=%s", - port_name->str, priv_comp, - bt_component_status_string(status)); + port_name->str, self_comp, + bt_self_component_status_string(status)); goto end; } @@ -202,7 +207,7 @@ enum bt_component_status ensure_available_input_port( muxer_comp->next_port_num++; BT_LOGD("Added one input port to muxer component: " "port-name=\"%s\", comp-addr=%p", - port_name->str, priv_comp); + port_name->str, self_comp); end: if (port_name) { g_string_free(port_name, TRUE); @@ -212,11 +217,11 @@ end: } static -enum bt_component_status create_output_port( - struct bt_private_component *priv_comp) +enum bt_self_component_status create_output_port( + struct bt_self_component_filter *self_comp) { - return bt_private_component_filter_add_output_private_port( - priv_comp, "out", NULL, NULL); + return bt_self_component_filter_add_output_port( + self_comp, "out", NULL, NULL); } static @@ -250,7 +255,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."); @@ -260,18 +265,19 @@ struct bt_value *get_default_params(void) goto end; error: - BT_PUT(params); + BT_OBJECT_PUT_REF_AND_RESET(params); end: return params; } static -int configure_muxer_comp(struct muxer_comp *muxer_comp, struct bt_value *params) +int configure_muxer_comp(struct muxer_comp *muxer_comp, + const struct bt_value *params) { struct bt_value *default_params = NULL; struct bt_value *real_params = NULL; - struct bt_value *assume_absolute_clock_classes = NULL; + const struct bt_value *assume_absolute_clock_classes = NULL; int ret = 0; bt_bool bool_val; @@ -282,8 +288,9 @@ int configure_muxer_comp(struct muxer_comp *muxer_comp, struct bt_value *params) goto error; } - real_params = bt_value_map_extend(default_params, params); - if (!real_params) { + ret = bt_value_map_extend(&real_params, + default_params, params); + if (ret) { BT_LOGE("Cannot extend default parameters map value: " "muxer-comp-addr=%p, def-params-addr=%p, " "params-addr=%p", muxer_comp, default_params, @@ -291,19 +298,19 @@ int configure_muxer_comp(struct muxer_comp *muxer_comp, struct bt_value *params) goto error; } - assume_absolute_clock_classes = bt_value_map_get(real_params, - ASSUME_ABSOLUTE_CLOCK_CLASSES_PARAM_NAME); - if (!bt_value_is_bool(assume_absolute_clock_classes)) { + 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)) { BT_LOGE("Expecting a boolean value for the `%s` parameter: " "muxer-comp-addr=%p, value-type=%s", ASSUME_ABSOLUTE_CLOCK_CLASSES_PARAM_NAME, muxer_comp, - bt_value_type_string( + bt_common_value_type_string( bt_value_get_type(assume_absolute_clock_classes))); goto error; } - ret = bt_value_bool_get(assume_absolute_clock_classes, &bool_val); - assert(ret == 0); + bool_val = bt_value_bool_get(assume_absolute_clock_classes); muxer_comp->assume_absolute_clock_classes = (bool) bool_val; BT_LOGD("Configured muxer component: muxer-comp-addr=%p, " "assume-absolute-clock-classes=%d", @@ -314,23 +321,22 @@ error: ret = -1; end: - bt_put(default_params); - bt_put(real_params); - bt_put(assume_absolute_clock_classes); + bt_object_put_ref(default_params); + bt_object_put_ref(real_params); return ret; } BT_HIDDEN -enum bt_component_status muxer_init( - struct bt_private_component *priv_comp, +enum bt_self_component_status muxer_init( + struct bt_self_component_filter *self_comp, struct bt_value *params, void *init_data) { int ret; - enum bt_component_status status = BT_COMPONENT_STATUS_OK; + enum bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK; struct muxer_comp *muxer_comp = g_new0(struct muxer_comp, 1); BT_LOGD("Initializing muxer component: " - "comp-addr=%p, params-addr=%p", priv_comp, params); + "comp-addr=%p, params-addr=%p", self_comp, params); if (!muxer_comp) { BT_LOGE_STR("Failed to allocate one muxer component."); @@ -351,40 +357,42 @@ enum bt_component_status muxer_init( goto error; } - muxer_comp->priv_comp = priv_comp; - ret = bt_private_component_set_user_data(priv_comp, muxer_comp); - assert(ret == 0); - status = ensure_available_input_port(priv_comp); - if (status != BT_COMPONENT_STATUS_OK) { + muxer_comp->self_comp = self_comp; + bt_self_component_set_data( + bt_self_component_filter_as_self_component(self_comp), + muxer_comp); + status = ensure_available_input_port(self_comp); + if (status != BT_SELF_COMPONENT_STATUS_OK) { BT_LOGE("Cannot ensure that at least one muxer component's input port is available: " "muxer-comp-addr=%p, status=%s", muxer_comp, - bt_component_status_string(status)); + bt_self_component_status_string(status)); goto error; } - status = create_output_port(priv_comp); + status = create_output_port(self_comp); if (status) { BT_LOGE("Cannot create muxer component's output port: " "muxer-comp-addr=%p, status=%s", muxer_comp, - bt_component_status_string(status)); + bt_self_component_status_string(status)); goto error; } BT_LOGD("Initialized muxer component: " "comp-addr=%p, params-addr=%p, muxer-comp-addr=%p", - priv_comp, params, muxer_comp); + self_comp, params, muxer_comp); goto end; error: destroy_muxer_comp(muxer_comp); - ret = bt_private_component_set_user_data(priv_comp, NULL); - assert(ret == 0); + bt_self_component_set_data( + bt_self_component_filter_as_self_component(self_comp), + NULL); - if (status == BT_COMPONENT_STATUS_OK) { - status = BT_COMPONENT_STATUS_ERROR; + if (status == BT_SELF_COMPONENT_STATUS_OK) { + status = BT_SELF_COMPONENT_STATUS_ERROR; } end: @@ -392,55 +400,50 @@ end: } BT_HIDDEN -void muxer_finalize(struct bt_private_component *priv_comp) +void muxer_finalize(struct bt_self_component_filter *self_comp) { - struct muxer_comp *muxer_comp = - bt_private_component_get_user_data(priv_comp); + struct muxer_comp *muxer_comp = bt_self_component_get_data( + bt_self_component_filter_as_self_component(self_comp)); BT_LOGD("Finalizing muxer component: comp-addr=%p", - priv_comp); + self_comp); destroy_muxer_comp(muxer_comp); } static -struct bt_notification_iterator *create_notif_iter_on_input_port( - struct bt_private_port *priv_port, int *ret) +struct bt_self_component_port_input_notification_iterator * +create_notif_iter_on_input_port( + struct bt_self_component_port_input *self_port, int *ret) { - struct bt_port *port = bt_port_from_private(priv_port); - struct bt_notification_iterator *notif_iter = NULL; - struct bt_private_connection *priv_conn = NULL; - enum bt_connection_status conn_status; + struct bt_port *port = bt_self_component_port_as_port( + bt_self_component_port_input_as_self_component_port( + self_port)); + struct bt_self_component_port_input_notification_iterator *notif_iter = + NULL; - assert(ret); + BT_ASSERT(ret); *ret = 0; - assert(port); - assert(bt_port_is_connected(port)); - priv_conn = bt_private_port_get_private_connection(priv_port); - assert(priv_conn); + BT_ASSERT(port); + BT_ASSERT(bt_port_is_connected(port)); // TODO: Advance the iterator to >= the time of the latest // returned notification by the muxer notification // iterator which creates it. - conn_status = bt_private_connection_create_notification_iterator( - priv_conn, NULL, ¬if_iter); - if (conn_status != BT_CONNECTION_STATUS_OK) { - BT_LOGE("Cannot create upstream notification iterator on input port's connection: " - "port-addr=%p, port-name=\"%s\", conn-addr=%p, " - "status=%s", - port, bt_port_get_name(port), priv_conn, - bt_connection_status_string(conn_status)); + notif_iter = bt_self_component_port_input_notification_iterator_create( + self_port); + if (!notif_iter) { + BT_LOGE("Cannot create upstream notification iterator on input port: " + "port-addr=%p, port-name=\"%s\"", + port, bt_port_get_name(port)); *ret = -1; goto end; } - BT_LOGD("Created upstream notification iterator on input port's connection: " - "port-addr=%p, port-name=\"%s\", conn-addr=%p, " - "notif-iter-addr=%p", - port, bt_port_get_name(port), priv_conn, notif_iter); + BT_LOGD("Created upstream notification iterator on input port: " + "port-addr=%p, port-name=\"%s\", notif-iter-addr=%p", + port, bt_port_get_name(port), notif_iter); end: - bt_put(port); - bt_put(priv_conn); return notif_iter; } @@ -449,34 +452,45 @@ enum bt_notification_iterator_status muxer_upstream_notif_iter_next( struct muxer_upstream_notif_iter *muxer_upstream_notif_iter) { enum bt_notification_iterator_status status; + bt_notification_array notifs; + uint64_t i; + uint64_t count; BT_LOGV("Calling upstream notification iterator's \"next\" method: " "muxer-upstream-notif-iter-wrap-addr=%p, notif-iter-addr=%p", muxer_upstream_notif_iter, muxer_upstream_notif_iter->notif_iter); - status = bt_notification_iterator_next( - muxer_upstream_notif_iter->notif_iter); + status = bt_self_component_port_input_notification_iterator_next( + muxer_upstream_notif_iter->notif_iter, ¬ifs, &count); BT_LOGV("Upstream notification iterator's \"next\" method returned: " "status=%s", bt_notification_iterator_status_string(status)); switch (status) { case BT_NOTIFICATION_ITERATOR_STATUS_OK: /* - * Notification iterator's current notification is valid: - * it must be considered for muxing operations. + * Notification iterator's current notification is + * valid: it must be considered for muxing operations. */ BT_LOGV_STR("Validated upstream notification iterator wrapper."); - muxer_upstream_notif_iter->is_valid = true; + BT_ASSERT(count > 0); + + /* Move notifications to our queue */ + for (i = 0; i < count; i++) { + /* + * Push to tail in order; other side + * (muxer_notif_iter_do_next_one()) consumes + * from the head first. + */ + g_queue_push_tail(muxer_upstream_notif_iter->notifs, + notifs[i]); + } break; case BT_NOTIFICATION_ITERATOR_STATUS_AGAIN: /* * Notification iterator's current notification is not * valid anymore. Return - * BT_NOTIFICATION_ITERATOR_STATUS_AGAIN - * immediately. + * BT_NOTIFICATION_ITERATOR_STATUS_AGAIN immediately. */ - BT_LOGV_STR("Invalidated upstream notification iterator wrapper because of BT_NOTIFICATION_ITERATOR_STATUS_AGAIN."); - muxer_upstream_notif_iter->is_valid = false; break; case BT_NOTIFICATION_ITERATOR_STATUS_END: /* Fall-through. */ case BT_NOTIFICATION_ITERATOR_STATUS_CANCELED: @@ -485,9 +499,7 @@ enum bt_notification_iterator_status muxer_upstream_notif_iter_next( * won't be considered again to find the youngest * notification. */ - BT_LOGV_STR("Invalidated upstream notification iterator wrapper because of BT_NOTIFICATION_ITERATOR_STATUS_END or BT_NOTIFICATION_ITERATOR_STATUS_CANCELED."); - BT_PUT(muxer_upstream_notif_iter->notif_iter); - muxer_upstream_notif_iter->is_valid = false; + BT_OBJECT_PUT_REF_AND_RESET(muxer_upstream_notif_iter->notif_iter); status = BT_NOTIFICATION_ITERATOR_STATUS_OK; break; default: @@ -512,26 +524,29 @@ int muxer_notif_iter_handle_newly_connected_ports( /* * Here we create one upstream notification iterator for each - * newly connected port. We do not perform an initial "next" on + * newly connected port. We do NOT perform an initial "next" on * those new upstream notification iterators: they are * invalidated, to be validated later. The list of newly * connected ports to handle here is updated by * muxer_port_connected(). */ while (true) { - GList *node = muxer_notif_iter->newly_connected_priv_ports; - struct bt_private_port *priv_port; + GList *node = muxer_notif_iter->newly_connected_self_ports; + struct bt_self_component_port_input *self_port; struct bt_port *port; - struct bt_notification_iterator *upstream_notif_iter = NULL; + struct bt_self_component_port_input_notification_iterator * + upstream_notif_iter = NULL; struct muxer_upstream_notif_iter *muxer_upstream_notif_iter; if (!node) { break; } - priv_port = node->data; - port = bt_port_from_private(priv_port); - assert(port); + self_port = node->data; + port = bt_self_component_port_as_port( + bt_self_component_port_input_as_self_component_port( + (self_port))); + BT_ASSERT(port); if (!bt_port_is_connected(port)) { /* @@ -543,20 +558,18 @@ int muxer_notif_iter_handle_newly_connected_ports( goto remove_node; } - BT_PUT(port); - upstream_notif_iter = create_notif_iter_on_input_port(priv_port, - &ret); + upstream_notif_iter = create_notif_iter_on_input_port( + self_port, &ret); if (ret) { /* create_notif_iter_on_input_port() logs errors */ - assert(!upstream_notif_iter); + BT_ASSERT(!upstream_notif_iter); goto error; } muxer_upstream_notif_iter = muxer_notif_iter_add_upstream_notif_iter( - muxer_notif_iter, upstream_notif_iter, - priv_port); - BT_PUT(upstream_notif_iter); + muxer_notif_iter, upstream_notif_iter); + BT_OBJECT_PUT_REF_AND_RESET(upstream_notif_iter); if (!muxer_upstream_notif_iter) { /* * muxer_notif_iter_add_upstream_notif_iter() @@ -566,11 +579,10 @@ int muxer_notif_iter_handle_newly_connected_ports( } remove_node: - bt_put(upstream_notif_iter); - bt_put(port); - muxer_notif_iter->newly_connected_priv_ports = + bt_object_put_ref(upstream_notif_iter); + muxer_notif_iter->newly_connected_self_ports = g_list_delete_link( - muxer_notif_iter->newly_connected_priv_ports, + muxer_notif_iter->newly_connected_self_ports, node); } @@ -591,16 +603,16 @@ 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; + const struct bt_clock_class *clock_class = NULL; + const struct bt_clock_value *clock_value = NULL; + const 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; - assert(notif); - assert(ts_ns); + BT_ASSERT(notif); + BT_ASSERT(ts_ns); BT_LOGV("Getting notification's timestamp: " "muxer-notif-iter-addr=%p, notif-addr=%p, " @@ -609,14 +621,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_get_clock_class_priority_map( - notif); + event = bt_notification_event_borrow_event(notif); + BT_ASSERT(event); + cv_status = bt_event_borrow_default_clock_value_const(event, + &clock_value); break; case BT_NOTIFICATION_TYPE_INACTIVITY: - cc_prio_map = - bt_notification_inactivity_get_clock_class_priority_map( + clock_value = + bt_notification_inactivity_borrow_default_clock_value( notif); break; default: @@ -626,33 +639,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 priorty 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_get_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_const(clock_value); + BT_ASSERT(clock_class); cc_uuid = bt_clock_class_get_uuid(clock_class); cc_name = bt_clock_class_get_name(clock_class); @@ -804,31 +810,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_get_event(notif); - assert(event); - clock_value = bt_event_get_clock_value(event, - clock_class); - break; - case BT_NOTIFICATION_TYPE_INACTIVITY: - clock_value = bt_notification_inactivity_get_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); @@ -849,10 +831,6 @@ end: *ts_ns); } - bt_put(cc_prio_map); - bt_put(event); - bt_put(clock_class); - bt_put(clock_value); return ret; } @@ -887,9 +865,9 @@ muxer_notif_iter_youngest_upstream_notif_iter( enum bt_notification_iterator_status status = BT_NOTIFICATION_ITERATOR_STATUS_OK; - assert(muxer_comp); - assert(muxer_notif_iter); - assert(muxer_upstream_notif_iter); + BT_ASSERT(muxer_comp); + BT_ASSERT(muxer_notif_iter); + BT_ASSERT(muxer_upstream_notif_iter); *muxer_upstream_notif_iter = NULL; for (i = 0; i < muxer_notif_iter->muxer_upstream_notif_iters->len; i++) { @@ -906,13 +884,11 @@ muxer_notif_iter_youngest_upstream_notif_iter( continue; } - assert(cur_muxer_upstream_notif_iter->is_valid); - notif = bt_notification_iterator_get_notification( - cur_muxer_upstream_notif_iter->notif_iter); - assert(notif); + BT_ASSERT(cur_muxer_upstream_notif_iter->notifs->length > 0); + notif = g_queue_peek_head(cur_muxer_upstream_notif_iter->notifs); + BT_ASSERT(notif); ret = get_notif_ts_ns(muxer_comp, muxer_notif_iter, notif, muxer_notif_iter->last_returned_ts_ns, ¬if_ts_ns); - bt_put(notif); if (ret) { /* get_notif_ts_ns() logs errors */ *muxer_upstream_notif_iter = NULL; @@ -948,8 +924,12 @@ enum bt_notification_iterator_status validate_muxer_upstream_notif_iter( "muxer-upstream-notif-iter-wrap-addr=%p", muxer_upstream_notif_iter); - if (muxer_upstream_notif_iter->is_valid || + if (muxer_upstream_notif_iter->notifs->length > 0 || !muxer_upstream_notif_iter->notif_iter) { + BT_LOGV("Already valid or not considered: " + "queue-len=%u, upstream-notif-iter-addr=%p", + muxer_upstream_notif_iter->notifs->length, + muxer_upstream_notif_iter->notif_iter); goto end; } @@ -962,7 +942,7 @@ end: static enum bt_notification_iterator_status validate_muxer_upstream_notif_iters( - struct muxer_notif_iter *muxer_notif_iter) + struct muxer_notif_iter *muxer_notif_iter) { enum bt_notification_iterator_status status = BT_NOTIFICATION_ITERATOR_STATUS_OK; @@ -1021,16 +1001,15 @@ end: return status; } -static -struct bt_notification_iterator_next_method_return muxer_notif_iter_do_next( +static inline +enum bt_notification_iterator_status muxer_notif_iter_do_next_one( struct muxer_comp *muxer_comp, - struct muxer_notif_iter *muxer_notif_iter) + struct muxer_notif_iter *muxer_notif_iter, + struct bt_notification **notif) { + enum bt_notification_iterator_status status = + BT_NOTIFICATION_ITERATOR_STATUS_OK; struct muxer_upstream_notif_iter *muxer_upstream_notif_iter = NULL; - struct bt_notification_iterator_next_method_return next_return = { - .notification = NULL, - .status = BT_NOTIFICATION_ITERATOR_STATUS_OK, - }; int64_t next_return_ts; while (true) { @@ -1042,14 +1021,12 @@ struct bt_notification_iterator_next_method_return muxer_notif_iter_do_next( "muxer-comp-addr=%p, muxer-notif-iter-addr=%p, " "ret=%d", muxer_comp, muxer_notif_iter, ret); - next_return.status = - BT_NOTIFICATION_ITERATOR_STATUS_ERROR; + status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR; goto end; } - next_return.status = - validate_muxer_upstream_notif_iters(muxer_notif_iter); - if (next_return.status != BT_NOTIFICATION_ITERATOR_STATUS_OK) { + status = validate_muxer_upstream_notif_iters(muxer_notif_iter); + if (status != BT_NOTIFICATION_ITERATOR_STATUS_OK) { /* validate_muxer_upstream_notif_iters() logs details */ goto end; } @@ -1062,14 +1039,14 @@ struct bt_notification_iterator_next_method_return muxer_notif_iter_do_next( * connected new ports. If no ports were connected * during this operation, exit the loop. */ - if (!muxer_notif_iter->newly_connected_priv_ports) { + if (!muxer_notif_iter->newly_connected_self_ports) { BT_LOGV("Not breaking this loop: muxer's notification iterator still has newly connected input ports to handle: " "muxer-comp-addr=%p", muxer_comp); break; } } - assert(!muxer_notif_iter->newly_connected_priv_ports); + BT_ASSERT(!muxer_notif_iter->newly_connected_self_ports); /* * At this point we know that all the existing upstream @@ -1077,21 +1054,19 @@ struct bt_notification_iterator_next_method_return muxer_notif_iter_do_next( * amongst those, of which the current notification is the * youngest. */ - next_return.status = - muxer_notif_iter_youngest_upstream_notif_iter(muxer_comp, + status = muxer_notif_iter_youngest_upstream_notif_iter(muxer_comp, muxer_notif_iter, &muxer_upstream_notif_iter, &next_return_ts); - if (next_return.status < 0 || - next_return.status == BT_NOTIFICATION_ITERATOR_STATUS_END || - next_return.status == BT_NOTIFICATION_ITERATOR_STATUS_CANCELED) { - if (next_return.status < 0) { + if (status < 0 || status == BT_NOTIFICATION_ITERATOR_STATUS_END || + status == BT_NOTIFICATION_ITERATOR_STATUS_CANCELED) { + if (status < 0) { BT_LOGE("Cannot find the youngest upstream notification iterator wrapper: " "status=%s", - bt_notification_iterator_status_string(next_return.status)); + bt_notification_iterator_status_string(status)); } else { BT_LOGV("Cannot find the youngest upstream notification iterator wrapper: " "status=%s", - bt_notification_iterator_status_string(next_return.status)); + bt_notification_iterator_status_string(status)); } goto end; @@ -1103,7 +1078,7 @@ struct bt_notification_iterator_next_method_return muxer_notif_iter_do_next( "last-returned-ts=%" PRId64, muxer_notif_iter, next_return_ts, muxer_notif_iter->last_returned_ts_ns); - next_return.status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR; + status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR; goto end; } @@ -1112,22 +1087,58 @@ struct bt_notification_iterator_next_method_return muxer_notif_iter_do_next( "muxer-upstream-notif-iter-wrap-addr=%p, " "ts=%" PRId64, muxer_notif_iter, muxer_upstream_notif_iter, next_return_ts); - assert(next_return.status == BT_NOTIFICATION_ITERATOR_STATUS_OK); - assert(muxer_upstream_notif_iter); - next_return.notification = bt_notification_iterator_get_notification( - muxer_upstream_notif_iter->notif_iter); - assert(next_return.notification); + BT_ASSERT(status == BT_NOTIFICATION_ITERATOR_STATUS_OK); + BT_ASSERT(muxer_upstream_notif_iter); /* - * We invalidate the upstream notification iterator so that, the - * next time this function is called, - * validate_muxer_upstream_notif_iters() will make it valid. + * Consume from the queue's head: other side + * (muxer_upstream_notif_iter_next()) writes to the tail. */ - muxer_upstream_notif_iter->is_valid = false; + *notif = g_queue_pop_head(muxer_upstream_notif_iter->notifs); + BT_ASSERT(*notif); muxer_notif_iter->last_returned_ts_ns = next_return_ts; end: - return next_return; + return status; +} + +static +enum bt_notification_iterator_status muxer_notif_iter_do_next( + struct muxer_comp *muxer_comp, + struct muxer_notif_iter *muxer_notif_iter, + bt_notification_array notifs, uint64_t capacity, + uint64_t *count) +{ + enum bt_notification_iterator_status status = + BT_NOTIFICATION_ITERATOR_STATUS_OK; + uint64_t i = 0; + + while (i < capacity && status == BT_NOTIFICATION_ITERATOR_STATUS_OK) { + status = muxer_notif_iter_do_next_one(muxer_comp, + muxer_notif_iter, ¬ifs[i]); + if (status == BT_NOTIFICATION_ITERATOR_STATUS_OK) { + i++; + } + } + + if (i > 0) { + /* + * Even if muxer_notif_iter_do_next_one() returned + * something else than + * BT_NOTIFICATION_ITERATOR_STATUS_OK, we accumulated + * notification objects in the output notification + * array, so we need to return + * BT_NOTIFICATION_ITERATOR_STATUS_OK so that they are + * transfered to downstream. This other status occurs + * again the next time muxer_notif_iter_do_next() is + * called, possibly without any accumulated + * notification, in which case we'll return it. + */ + *count = i; + status = BT_NOTIFICATION_ITERATOR_STATUS_OK; + } + + return status; } static @@ -1146,7 +1157,7 @@ void destroy_muxer_notif_iter(struct muxer_notif_iter *muxer_notif_iter) muxer_notif_iter->muxer_upstream_notif_iters, TRUE); } - g_list_free(muxer_notif_iter->newly_connected_priv_ports); + g_list_free(muxer_notif_iter->newly_connected_self_ports); g_free(muxer_notif_iter); } @@ -1154,7 +1165,6 @@ static int muxer_notif_iter_init_newly_connected_ports(struct muxer_comp *muxer_comp, struct muxer_notif_iter *muxer_notif_iter) { - struct bt_component *comp; int64_t count; int64_t i; int ret = 0; @@ -1164,9 +1174,9 @@ int muxer_notif_iter_init_newly_connected_ports(struct muxer_comp *muxer_comp, * iterator's list of newly connected ports. They will be * handled by muxer_notif_iter_handle_newly_connected_ports(). */ - comp = bt_component_from_private(muxer_comp->priv_comp); - assert(comp); - count = bt_component_filter_get_input_port_count(comp); + count = bt_component_filter_get_input_port_count( + bt_self_component_filter_as_component_filter( + muxer_comp->self_comp)); if (count < 0) { BT_LOGD("No input port to initialize for muxer component's notification iterator: " "muxer-comp-addr=%p, muxer-notif-iter-addr=%p", @@ -1175,31 +1185,29 @@ int muxer_notif_iter_init_newly_connected_ports(struct muxer_comp *muxer_comp, } for (i = 0; i < count; i++) { - struct bt_private_port *priv_port = - bt_private_component_filter_get_input_private_port_by_index( - muxer_comp->priv_comp, i); + struct bt_self_component_port_input *self_port = + bt_self_component_filter_borrow_input_port_by_index( + muxer_comp->self_comp, i); struct bt_port *port; - assert(priv_port); - port = bt_port_from_private(priv_port); - assert(port); + BT_ASSERT(self_port); + port = bt_self_component_port_as_port( + bt_self_component_port_input_as_self_component_port( + self_port)); + BT_ASSERT(port); if (!bt_port_is_connected(port)) { 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_put(port); continue; } - bt_put(port); - bt_put(priv_port); - muxer_notif_iter->newly_connected_priv_ports = + muxer_notif_iter->newly_connected_self_ports = g_list_append( - muxer_notif_iter->newly_connected_priv_ports, - priv_port); - if (!muxer_notif_iter->newly_connected_priv_ports) { + muxer_notif_iter->newly_connected_self_ports, + self_port); + if (!muxer_notif_iter->newly_connected_self_ports) { BT_LOGE("Cannot append port to muxer's notification iterator list of newly connected input ports: " "port-addr=%p, port-name=\"%s\", " "muxer-notif-iter-addr=%p", port, @@ -1215,30 +1223,27 @@ int muxer_notif_iter_init_newly_connected_ports(struct muxer_comp *muxer_comp, } end: - bt_put(comp); return ret; } BT_HIDDEN -enum bt_notification_iterator_status muxer_notif_iter_init( - struct bt_private_connection_private_notification_iterator *priv_notif_iter, - struct bt_private_port *output_priv_port) +enum bt_self_notification_iterator_status muxer_notif_iter_init( + struct bt_self_notification_iterator *self_notif_iter, + struct bt_self_component_filter *self_comp, + struct bt_self_component_port_output *port) { struct muxer_comp *muxer_comp = NULL; struct muxer_notif_iter *muxer_notif_iter = NULL; - struct bt_private_component *priv_comp = NULL; - enum bt_notification_iterator_status status = + enum bt_self_notification_iterator_status status = BT_NOTIFICATION_ITERATOR_STATUS_OK; int ret; - priv_comp = bt_private_connection_private_notification_iterator_get_private_component( - priv_notif_iter); - assert(priv_comp); - muxer_comp = bt_private_component_get_user_data(priv_comp); - assert(muxer_comp); + muxer_comp = bt_self_component_get_data( + bt_self_component_filter_as_self_component(self_comp)); + BT_ASSERT(muxer_comp); BT_LOGD("Initializing muxer component's notification iterator: " "comp-addr=%p, muxer-comp-addr=%p, notif-iter-addr=%p", - priv_comp, muxer_comp, priv_notif_iter); + self_comp, muxer_comp, self_notif_iter); if (muxer_comp->initializing_muxer_notif_iter) { /* @@ -1248,7 +1253,7 @@ enum bt_notification_iterator_status muxer_notif_iter_init( */ BT_LOGE("Recursive initialization of muxer component's notification iterator: " "comp-addr=%p, muxer-comp-addr=%p, notif-iter-addr=%p", - priv_comp, muxer_comp, priv_notif_iter); + self_comp, muxer_comp, self_notif_iter); goto error; } @@ -1283,18 +1288,17 @@ enum bt_notification_iterator_status muxer_notif_iter_init( BT_LOGE("Cannot initialize newly connected input ports for muxer component's notification iterator: " "comp-addr=%p, muxer-comp-addr=%p, " "muxer-notif-iter-addr=%p, notif-iter-addr=%p, ret=%d", - priv_comp, muxer_comp, muxer_notif_iter, - priv_notif_iter, ret); + self_comp, muxer_comp, muxer_notif_iter, + self_notif_iter, ret); goto error; } - ret = bt_private_connection_private_notification_iterator_set_user_data(priv_notif_iter, + bt_self_notification_iterator_set_data(self_notif_iter, muxer_notif_iter); - assert(ret == 0); BT_LOGD("Initialized muxer component's notification iterator: " "comp-addr=%p, muxer-comp-addr=%p, muxer-notif-iter-addr=%p, " "notif-iter-addr=%p", - priv_comp, muxer_comp, muxer_notif_iter, priv_notif_iter); + self_comp, muxer_comp, muxer_notif_iter, self_notif_iter); goto end; error: @@ -1305,121 +1309,106 @@ error: } destroy_muxer_notif_iter(muxer_notif_iter); - ret = bt_private_connection_private_notification_iterator_set_user_data(priv_notif_iter, + bt_self_notification_iterator_set_data(self_notif_iter, NULL); - assert(ret == 0); status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR; end: muxer_comp->initializing_muxer_notif_iter = false; - bt_put(priv_comp); return status; } BT_HIDDEN void muxer_notif_iter_finalize( - struct bt_private_connection_private_notification_iterator *priv_notif_iter) + struct bt_self_notification_iterator *self_notif_iter) { struct muxer_notif_iter *muxer_notif_iter = - bt_private_connection_private_notification_iterator_get_user_data(priv_notif_iter); - struct bt_private_component *priv_comp = NULL; + bt_self_notification_iterator_get_data(self_notif_iter); + struct bt_self_component *self_comp = NULL; struct muxer_comp *muxer_comp = NULL; - priv_comp = bt_private_connection_private_notification_iterator_get_private_component( - priv_notif_iter); - assert(priv_comp); - muxer_comp = bt_private_component_get_user_data(priv_comp); + self_comp = bt_self_notification_iterator_borrow_component( + self_notif_iter); + BT_ASSERT(self_comp); + muxer_comp = bt_self_component_get_data(self_comp); BT_LOGD("Finalizing muxer component's notification iterator: " "comp-addr=%p, muxer-comp-addr=%p, muxer-notif-iter-addr=%p, " "notif-iter-addr=%p", - priv_comp, muxer_comp, muxer_notif_iter, priv_notif_iter); + self_comp, muxer_comp, muxer_notif_iter, self_notif_iter); if (muxer_comp) { (void) g_ptr_array_remove_fast(muxer_comp->muxer_notif_iters, muxer_notif_iter); destroy_muxer_notif_iter(muxer_notif_iter); } - - bt_put(priv_comp); } BT_HIDDEN -struct bt_notification_iterator_next_method_return muxer_notif_iter_next( - struct bt_private_connection_private_notification_iterator *priv_notif_iter) +enum bt_notification_iterator_status muxer_notif_iter_next( + struct bt_self_notification_iterator *self_notif_iter, + bt_notification_array notifs, uint64_t capacity, + uint64_t *count) { - struct bt_notification_iterator_next_method_return next_ret; + enum bt_notification_iterator_status status; struct muxer_notif_iter *muxer_notif_iter = - bt_private_connection_private_notification_iterator_get_user_data(priv_notif_iter); - struct bt_private_component *priv_comp = NULL; + bt_self_notification_iterator_get_data(self_notif_iter); + struct bt_self_component *self_comp = NULL; struct muxer_comp *muxer_comp = NULL; - assert(muxer_notif_iter); - priv_comp = bt_private_connection_private_notification_iterator_get_private_component( - priv_notif_iter); - assert(priv_comp); - muxer_comp = bt_private_component_get_user_data(priv_comp); - assert(muxer_comp); - + BT_ASSERT(muxer_notif_iter); + self_comp = bt_self_notification_iterator_borrow_component( + self_notif_iter); + BT_ASSERT(self_comp); + muxer_comp = bt_self_component_get_data(self_comp); + BT_ASSERT(muxer_comp); BT_LOGV("Muxer component's notification iterator's \"next\" method called: " "comp-addr=%p, muxer-comp-addr=%p, muxer-notif-iter-addr=%p, " "notif-iter-addr=%p", - priv_comp, muxer_comp, muxer_notif_iter, priv_notif_iter); + self_comp, muxer_comp, muxer_notif_iter, self_notif_iter); - /* Are we in an error state set elsewhere? */ - if (unlikely(muxer_comp->error)) { - BT_LOGE("Muxer component is already in an error state: returning BT_NOTIFICATION_ITERATOR_STATUS_ERROR: " - "comp-addr=%p, muxer-comp-addr=%p, muxer-notif-iter-addr=%p, " - "notif-iter-addr=%p", - priv_comp, muxer_comp, muxer_notif_iter, priv_notif_iter); - next_ret.notification = NULL; - next_ret.status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR; - goto end; - } - - next_ret = muxer_notif_iter_do_next(muxer_comp, muxer_notif_iter); - if (next_ret.status < 0) { + status = muxer_notif_iter_do_next(muxer_comp, muxer_notif_iter, + notifs, capacity, count); + if (status < 0) { BT_LOGE("Cannot get next notification: " "comp-addr=%p, muxer-comp-addr=%p, muxer-notif-iter-addr=%p, " "notif-iter-addr=%p, status=%s", - priv_comp, muxer_comp, muxer_notif_iter, priv_notif_iter, - bt_notification_iterator_status_string(next_ret.status)); + self_comp, muxer_comp, muxer_notif_iter, self_notif_iter, + bt_notification_iterator_status_string(status)); } else { BT_LOGV("Returning from muxer component's notification iterator's \"next\" method: " - "status=%s, notif-addr=%p", - bt_notification_iterator_status_string(next_ret.status), - next_ret.notification); + "status=%s", + bt_notification_iterator_status_string(status)); } -end: - bt_put(priv_comp); - return next_ret; + return status; } BT_HIDDEN -void muxer_port_connected( - struct bt_private_component *priv_comp, - struct bt_private_port *self_private_port, - struct bt_port *other_port) +enum bt_self_component_status muxer_input_port_connected( + struct bt_self_component_filter *self_comp, + struct bt_self_component_port_input *self_port, + struct bt_port_output *other_port) { - struct bt_port *self_port = - bt_port_from_private(self_private_port); + enum bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK; + struct bt_port *port = bt_self_component_port_as_port( + bt_self_component_port_input_as_self_component_port( + self_port)); struct muxer_comp *muxer_comp = - bt_private_component_get_user_data(priv_comp); + bt_self_component_get_data( + bt_self_component_filter_as_self_component( + self_comp)); size_t i; int ret; - assert(self_port); - assert(muxer_comp); + BT_ASSERT(port); + BT_ASSERT(muxer_comp); BT_LOGD("Port connected: " "comp-addr=%p, muxer-comp-addr=%p, " "port-addr=%p, port-name=\"%s\", " "other-port-addr=%p, other-port-name=\"%s\"", - priv_comp, muxer_comp, self_port, bt_port_get_name(self_port), - other_port, bt_port_get_name(other_port)); - - if (bt_port_get_type(self_port) == BT_PORT_TYPE_OUTPUT) { - goto end; - } + self_comp, muxer_comp, self_port, bt_port_get_name(port), + other_port, + bt_port_get_name(bt_port_output_as_port(other_port))); for (i = 0; i < muxer_comp->muxer_notif_iters->len; i++) { struct muxer_notif_iter *muxer_notif_iter = @@ -1432,28 +1421,28 @@ void muxer_port_connected( * muxer_notif_iter_handle_newly_connected_ports() * removes the nodes from the beginning. */ - muxer_notif_iter->newly_connected_priv_ports = + muxer_notif_iter->newly_connected_self_ports = g_list_append( - muxer_notif_iter->newly_connected_priv_ports, - self_private_port); - if (!muxer_notif_iter->newly_connected_priv_ports) { + muxer_notif_iter->newly_connected_self_ports, + self_port); + if (!muxer_notif_iter->newly_connected_self_ports) { BT_LOGE("Cannot append port to muxer's notification iterator list of newly connected input ports: " "port-addr=%p, port-name=\"%s\", " "muxer-notif-iter-addr=%p", self_port, - bt_port_get_name(self_port), muxer_notif_iter); - muxer_comp->error = true; + bt_port_get_name(port), muxer_notif_iter); + status = BT_SELF_COMPONENT_STATUS_ERROR; goto end; } BT_LOGD("Appended port to muxer's notification iterator list of newly connected input ports: " "port-addr=%p, port-name=\"%s\", " "muxer-notif-iter-addr=%p", self_port, - bt_port_get_name(self_port), muxer_notif_iter); + bt_port_get_name(port), muxer_notif_iter); } /* One less available input port */ muxer_comp->available_input_ports--; - ret = ensure_available_input_port(priv_comp); + ret = ensure_available_input_port(self_comp); if (ret) { /* * Only way to report an error later since this @@ -1461,50 +1450,37 @@ void muxer_port_connected( */ BT_LOGE("Cannot ensure that at least one muxer component's input port is available: " "muxer-comp-addr=%p, status=%s", - muxer_comp, bt_component_status_string(ret)); - muxer_comp->error = true; + muxer_comp, bt_self_component_status_string(ret)); + status = BT_SELF_COMPONENT_STATUS_ERROR; goto end; } end: - bt_put(self_port); + return status; } BT_HIDDEN -void muxer_port_disconnected(struct bt_private_component *priv_comp, - struct bt_private_port *priv_port) +void muxer_input_port_disconnected( + struct bt_self_component_filter *self_component, + struct bt_self_component_port_input *self_port) { - struct bt_port *port = bt_port_from_private(priv_port); struct muxer_comp *muxer_comp = - bt_private_component_get_user_data(priv_comp); - - assert(port); - assert(muxer_comp); - BT_LOGD("Port disconnected: " + bt_self_component_get_data( + bt_self_component_filter_as_self_component( + self_component)); + struct 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\"", priv_comp, muxer_comp, - port, bt_port_get_name(port)); - - /* - * There's nothing special to do when a port is disconnected - * because this component deals with upstream notification - * iterators which were already created thanks to connected - * ports. The fact that the port is disconnected does not cancel - * the upstream notification iterators created using its - * connection: they still exist, even if the connection is dead. - * The only way to remove an upstream notification iterator is - * for its "next" operation to return - * BT_NOTIFICATION_ITERATOR_STATUS_END. - */ - if (bt_port_get_type(port) == BT_PORT_TYPE_INPUT) { - /* 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", - priv_comp, muxer_comp, port, bt_port_get_name(port), - muxer_comp->available_input_ports); - } - - bt_put(port); + "port-name=\"%s\", avail-input-port-count=%zu", + self_component, muxer_comp, port, bt_port_get_name(port), + muxer_comp->available_input_ports); }