#include <babeltrace/babeltrace-internal.h>
#include <babeltrace/compat/uuid-internal.h>
-#include <babeltrace/ctf-ir/clock-class.h>
-#include <babeltrace/ctf-ir/event.h>
-#include <babeltrace/graph/clock-class-priority-map.h>
-#include <babeltrace/graph/component-filter.h>
-#include <babeltrace/graph/component.h>
+#include <babeltrace/babeltrace.h>
+#include <babeltrace/values-internal.h>
#include <babeltrace/graph/component-internal.h>
-#include <babeltrace/graph/notification-event.h>
-#include <babeltrace/graph/notification-inactivity.h>
-#include <babeltrace/graph/notification-iterator.h>
#include <babeltrace/graph/notification-iterator-internal.h>
-#include <babeltrace/graph/notification.h>
-#include <babeltrace/graph/port.h>
-#include <babeltrace/graph/private-component-filter.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/private-connection.h>
-#include <babeltrace/graph/private-notification-iterator.h>
-#include <babeltrace/graph/private-port.h>
-#include <babeltrace/graph/connection.h>
#include <babeltrace/graph/connection-internal.h>
-#include <babeltrace/values-internal.h>
#include <plugins-common.h>
#include <glib.h>
#include <stdbool.h>
#include <inttypes.h>
-#include <assert.h>
+#include <babeltrace/assert-internal.h>
#include <stdlib.h>
#include <string.h>
#define ASSUME_ABSOLUTE_CLOCK_CLASSES_PARAM_NAME "assume-absolute-clock-classes"
struct muxer_comp {
- /* Array of struct bt_private_notification_iterator * (weak refs) */
+ /*
+ * Array of struct
+ * bt_private_connection_private_notification_iterator *
+ * (weak refs)
+ */
GPtrArray *muxer_notif_iters;
/* Weak ref */
struct bt_private_component *priv_comp;
unsigned int next_port_num;
size_t available_input_ports;
- bool error;
bool initializing_muxer_notif_iter;
bool assume_absolute_clock_classes;
};
/* Owned by this, NULL if ended */
struct bt_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 {
*/
GList *newly_connected_priv_ports;
- /* Next thing to return by the "next" method */
- struct bt_notification_iterator_next_return next_next_return;
-
/* Last time returned in a notification */
int64_t last_returned_ts_ns;
}
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);
+ muxer_upstream_notif_iter->notifs->length);
bt_put(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);
+ }
+
+ g_queue_free(muxer_upstream_notif_iter->notifs);
+ }
+
g_free(muxer_upstream_notif_iter);
}
}
muxer_upstream_notif_iter->notif_iter = bt_get(notif_iter);
- muxer_upstream_notif_iter->is_valid = false;
+ 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: "
enum bt_component_status status = BT_COMPONENT_STATUS_OK;
GString *port_name = NULL;
- assert(muxer_comp);
+ BT_ASSERT(muxer_comp);
if (muxer_comp->available_input_ports >= 1) {
goto end;
goto error;
}
- assume_absolute_clock_classes = bt_value_map_get(real_params,
+ assume_absolute_clock_classes = bt_value_map_borrow(real_params,
ASSUME_ABSOLUTE_CLOCK_CLASSES_PARAM_NAME);
- if (!bt_value_is_bool(assume_absolute_clock_classes)) {
+ 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,
}
ret = bt_value_bool_get(assume_absolute_clock_classes, &bool_val);
- assert(ret == 0);
+ BT_ASSERT(ret == 0);
muxer_comp->assume_absolute_clock_classes = (bool) bool_val;
BT_LOGD("Configured muxer component: muxer-comp-addr=%p, "
"assume-absolute-clock-classes=%d",
end:
bt_put(default_params);
bt_put(real_params);
- bt_put(assume_absolute_clock_classes);
return ret;
}
muxer_comp->priv_comp = priv_comp;
ret = bt_private_component_set_user_data(priv_comp, muxer_comp);
- assert(ret == 0);
+ BT_ASSERT(ret == 0);
status = ensure_available_input_port(priv_comp);
if (status != BT_COMPONENT_STATUS_OK) {
BT_LOGE("Cannot ensure that at least one muxer component's input port is available: "
error:
destroy_muxer_comp(muxer_comp);
ret = bt_private_component_set_user_data(priv_comp, NULL);
- assert(ret == 0);
+ BT_ASSERT(ret == 0);
if (status == BT_COMPONENT_STATUS_OK) {
status = BT_COMPONENT_STATUS_ERROR;
struct bt_notification_iterator *create_notif_iter_on_input_port(
struct bt_private_port *priv_port, int *ret)
{
- struct bt_port *port = bt_port_from_private_port(priv_port);
+ struct bt_port *port = bt_port_borrow_from_private(priv_port);
struct bt_notification_iterator *notif_iter = NULL;
struct bt_private_connection *priv_conn = NULL;
enum bt_connection_status conn_status;
- assert(ret);
+ BT_ASSERT(ret);
*ret = 0;
- assert(port);
- assert(bt_port_is_connected(port));
+ BT_ASSERT(port);
+ BT_ASSERT(bt_port_is_connected(port));
priv_conn = bt_private_port_get_private_connection(priv_port);
- assert(priv_conn);
+ BT_ASSERT(priv_conn);
// 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);
+ priv_conn, ¬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, "
port, bt_port_get_name(port), priv_conn, notif_iter);
end:
- bt_put(port);
bt_put(priv_conn);
return notif_iter;
}
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_private_connection_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:
* 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;
status = BT_NOTIFICATION_ITERATOR_STATUS_OK;
break;
default:
/*
* 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
}
priv_port = node->data;
- port = bt_port_from_private_port(priv_port);
- assert(port);
+ port = bt_port_borrow_from_private(priv_port);
+ BT_ASSERT(port);
if (!bt_port_is_connected(port)) {
/*
goto remove_node;
}
- BT_PUT(port);
upstream_notif_iter = create_notif_iter_on_input_port(priv_port,
&ret);
if (ret) {
/* create_notif_iter_on_input_port() logs errors */
- assert(!upstream_notif_iter);
+ BT_ASSERT(!upstream_notif_iter);
goto error;
}
remove_node:
bt_put(upstream_notif_iter);
- bt_put(port);
muxer_notif_iter->newly_connected_priv_ports =
g_list_delete_link(
muxer_notif_iter->newly_connected_priv_ports,
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_ctf_clock_class *clock_class = NULL;
- struct bt_ctf_clock_value *clock_value = NULL;
- struct bt_ctf_event *event = 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;
- 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, "
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(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:
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;
- }
-
- cc_uuid = bt_ctf_clock_class_get_uuid(clock_class);
- cc_name = bt_ctf_clock_class_get_name(clock_class);
+ 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);
if (muxer_notif_iter->clock_class_expectation ==
MUXER_NOTIF_ITER_CLOCK_CLASS_EXPECTATION_ANY) {
* the iterator without a true
* `assume-absolute-clock-classes` parameter.
*/
- if (bt_ctf_clock_class_is_absolute(clock_class)) {
+ if (bt_clock_class_is_absolute(clock_class)) {
/* Expect absolute clock classes */
muxer_notif_iter->clock_class_expectation =
MUXER_NOTIF_ITER_CLOCK_CLASS_EXPECTATION_ABSOLUTE;
if (!muxer_comp->assume_absolute_clock_classes) {
switch (muxer_notif_iter->clock_class_expectation) {
case MUXER_NOTIF_ITER_CLOCK_CLASS_EXPECTATION_ABSOLUTE:
- if (!bt_ctf_clock_class_is_absolute(clock_class)) {
+ if (!bt_clock_class_is_absolute(clock_class)) {
BT_LOGE("Expecting an absolute clock class, "
"but got a non-absolute one: "
"clock-class-addr=%p, clock-class-name=\"%s\"",
}
break;
case MUXER_NOTIF_ITER_CLOCK_CLASS_EXPECTATION_NOT_ABS_NO_UUID:
- if (bt_ctf_clock_class_is_absolute(clock_class)) {
+ if (bt_clock_class_is_absolute(clock_class)) {
BT_LOGE("Expecting a non-absolute clock class with no UUID, "
"but got an absolute one: "
"clock-class-addr=%p, clock-class-name=\"%s\"",
}
break;
case MUXER_NOTIF_ITER_CLOCK_CLASS_EXPECTATION_NOT_ABS_SPEC_UUID:
- if (bt_ctf_clock_class_is_absolute(clock_class)) {
+ if (bt_clock_class_is_absolute(clock_class)) {
BT_LOGE("Expecting a non-absolute clock class with a specific UUID, "
"but got an absolute one: "
"clock-class-addr=%p, clock-class-name=\"%s\"",
}
}
- switch (bt_notification_get_type(notif)) {
- case BT_NOTIFICATION_TYPE_EVENT:
- event = bt_notification_event_get_event(notif);
- assert(event);
- clock_value = bt_ctf_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_ctf_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);
*ts_ns);
}
- bt_put(cc_prio_map);
- bt_put(event);
- bt_put(clock_class);
- bt_put(clock_value);
return ret;
}
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++) {
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;
"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;
}
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;
return status;
}
-static
-struct bt_notification_iterator_next_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_return next_return = {
- .notification = NULL,
- .status = BT_NOTIFICATION_ITERATOR_STATUS_OK,
- };
int64_t next_return_ts;
while (true) {
"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;
}
}
}
- assert(!muxer_notif_iter->newly_connected_priv_ports);
+ BT_ASSERT(!muxer_notif_iter->newly_connected_priv_ports);
/*
* At this point we know that all the existing upstream
* 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;
"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;
}
"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
* iterator's list of newly connected ports. They will be
* handled by muxer_notif_iter_handle_newly_connected_ports().
*/
- comp = bt_component_from_private_component(muxer_comp->priv_comp);
- assert(comp);
+ comp = bt_component_borrow_from_private(muxer_comp->priv_comp);
+ BT_ASSERT(comp);
count = bt_component_filter_get_input_port_count(comp);
if (count < 0) {
BT_LOGD("No input port to initialize for muxer component's notification iterator: "
muxer_comp->priv_comp, i);
struct bt_port *port;
- assert(priv_port);
- port = bt_port_from_private_port(priv_port);
- assert(port);
+ BT_ASSERT(priv_port);
+ port = bt_port_borrow_from_private(priv_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 =
g_list_append(
}
end:
- bt_put(comp);
return ret;
}
BT_HIDDEN
enum bt_notification_iterator_status muxer_notif_iter_init(
- struct bt_private_notification_iterator *priv_notif_iter,
+ struct bt_private_connection_private_notification_iterator *priv_notif_iter,
struct bt_private_port *output_priv_port)
{
struct muxer_comp *muxer_comp = NULL;
BT_NOTIFICATION_ITERATOR_STATUS_OK;
int ret;
- priv_comp = bt_private_notification_iterator_get_private_component(
+ priv_comp = bt_private_connection_private_notification_iterator_get_private_component(
priv_notif_iter);
- assert(priv_comp);
+ BT_ASSERT(priv_comp);
muxer_comp = bt_private_component_get_user_data(priv_comp);
- assert(muxer_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);
goto error;
}
- ret = bt_private_notification_iterator_set_user_data(priv_notif_iter,
+ ret = bt_private_connection_private_notification_iterator_set_user_data(priv_notif_iter,
muxer_notif_iter);
- assert(ret == 0);
+ BT_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",
}
destroy_muxer_notif_iter(muxer_notif_iter);
- ret = bt_private_notification_iterator_set_user_data(priv_notif_iter,
+ ret = bt_private_connection_private_notification_iterator_set_user_data(priv_notif_iter,
NULL);
- assert(ret == 0);
+ BT_ASSERT(ret == 0);
status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
end:
BT_HIDDEN
void muxer_notif_iter_finalize(
- struct bt_private_notification_iterator *priv_notif_iter)
+ struct bt_private_connection_private_notification_iterator *priv_notif_iter)
{
struct muxer_notif_iter *muxer_notif_iter =
- bt_private_notification_iterator_get_user_data(priv_notif_iter);
+ bt_private_connection_private_notification_iterator_get_user_data(priv_notif_iter);
struct bt_private_component *priv_comp = NULL;
struct muxer_comp *muxer_comp = NULL;
- priv_comp = bt_private_notification_iterator_get_private_component(
+ priv_comp = bt_private_connection_private_notification_iterator_get_private_component(
priv_notif_iter);
- assert(priv_comp);
+ BT_ASSERT(priv_comp);
muxer_comp = bt_private_component_get_user_data(priv_comp);
BT_LOGD("Finalizing muxer component's notification iterator: "
"comp-addr=%p, muxer-comp-addr=%p, muxer-notif-iter-addr=%p, "
}
BT_HIDDEN
-struct bt_notification_iterator_next_return muxer_notif_iter_next(
- struct bt_private_notification_iterator *priv_notif_iter)
+enum bt_notification_iterator_status muxer_notif_iter_next(
+ struct bt_private_connection_private_notification_iterator *priv_notif_iter,
+ bt_notification_array notifs, uint64_t capacity,
+ uint64_t *count)
{
- struct bt_notification_iterator_next_return next_ret;
+ enum bt_notification_iterator_status status;
struct muxer_notif_iter *muxer_notif_iter =
- bt_private_notification_iterator_get_user_data(priv_notif_iter);
+ bt_private_connection_private_notification_iterator_get_user_data(priv_notif_iter);
struct bt_private_component *priv_comp = NULL;
struct muxer_comp *muxer_comp = NULL;
- assert(muxer_notif_iter);
- priv_comp = bt_private_notification_iterator_get_private_component(
+ BT_ASSERT(muxer_notif_iter);
+ priv_comp = bt_private_connection_private_notification_iterator_get_private_component(
priv_notif_iter);
- assert(priv_comp);
+ BT_ASSERT(priv_comp);
muxer_comp = bt_private_component_get_user_data(priv_comp);
- assert(muxer_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);
- /* 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));
+ 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(
+enum bt_component_status muxer_port_connected(
struct bt_private_component *priv_comp,
struct bt_private_port *self_private_port,
struct bt_port *other_port)
{
+ enum bt_component_status status = BT_COMPONENT_STATUS_OK;
struct bt_port *self_port =
- bt_port_from_private_port(self_private_port);
+ bt_port_borrow_from_private(self_private_port);
struct muxer_comp *muxer_comp =
bt_private_component_get_user_data(priv_comp);
size_t i;
int ret;
- assert(self_port);
- assert(muxer_comp);
+ BT_ASSERT(self_port);
+ BT_ASSERT(muxer_comp);
BT_LOGD("Port connected: "
"comp-addr=%p, muxer-comp-addr=%p, "
"port-addr=%p, port-name=\"%s\", "
"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;
+ status = BT_COMPONENT_STATUS_ERROR;
goto end;
}
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;
+ status = BT_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)
{
- struct bt_port *port = bt_port_from_private_port(priv_port);
+ struct bt_port *port = bt_port_borrow_from_private(priv_port);
struct muxer_comp *muxer_comp =
bt_private_component_get_user_data(priv_comp);
- assert(port);
- assert(muxer_comp);
+ BT_ASSERT(port);
+ BT_ASSERT(muxer_comp);
BT_LOGD("Port disconnected: "
"comp-addr=%p, muxer-comp-addr=%p, port-addr=%p, "
"port-name=\"%s\"", priv_comp, muxer_comp,
priv_comp, muxer_comp, port, bt_port_get_name(port),
muxer_comp->available_input_ports);
}
-
- bt_put(port);
}
projects / babeltrace.git / blobdiff