/*
- * Copyright 2017 Philippe Proulx <pproulx@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * SPDX-License-Identifier: MIT
*
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Copyright 2017 Philippe Proulx <pproulx@efficios.com>
*/
#define BT_COMP_LOG_SELF_COMP (muxer_comp->self_comp)
struct muxer_comp *muxer_comp;
/* Owned by this, NULL if ended */
- bt_self_component_port_input_message_iterator *msg_iter;
+ bt_message_iterator *msg_iter;
/* Contains `const bt_message *`, owned by this */
- GQueue *msgs;
+ GPtrArray *msgs;
+
+ /* Index of the next message in `msgs` to return */
+ guint next_msg;
};
enum muxer_msg_iter_clock_class_expectation {
* messages ready to return, we save the error here and return it on
* the next _next call.
*/
- bt_component_class_message_iterator_next_method_status next_saved_status;
+ bt_message_iterator_class_next_method_status next_saved_status;
const struct bt_error *next_saved_error;
};
static
void empty_message_queue(struct muxer_upstream_msg_iter *upstream_msg_iter)
{
- const bt_message *msg;
-
- while ((msg = g_queue_pop_head(upstream_msg_iter->msgs))) {
- bt_message_put_ref(msg);
- }
+ g_ptr_array_set_size(upstream_msg_iter->msgs, 0);
}
static
muxer_comp = muxer_upstream_msg_iter->muxer_comp;
BT_COMP_LOGD("Destroying muxer's upstream message iterator wrapper: "
- "addr=%p, msg-iter-addr=%p, queue-len=%u",
+ "addr=%p, msg-iter-addr=%p, queue-len=%u, next-msg=%u",
muxer_upstream_msg_iter,
muxer_upstream_msg_iter->msg_iter,
- muxer_upstream_msg_iter->msgs->length);
- bt_self_component_port_input_message_iterator_put_ref(
+ muxer_upstream_msg_iter->msgs->len,
+ muxer_upstream_msg_iter->next_msg);
+
+ bt_message_iterator_put_ref(
muxer_upstream_msg_iter->msg_iter);
if (muxer_upstream_msg_iter->msgs) {
- empty_message_queue(muxer_upstream_msg_iter);
- g_queue_free(muxer_upstream_msg_iter->msgs);
+ g_ptr_array_free(muxer_upstream_msg_iter->msgs, TRUE);
}
g_free(muxer_upstream_msg_iter);
static
int muxer_msg_iter_add_upstream_msg_iter(struct muxer_msg_iter *muxer_msg_iter,
- bt_self_component_port_input_message_iterator *self_msg_iter)
+ bt_message_iterator *self_msg_iter)
{
int ret = 0;
struct muxer_upstream_msg_iter *muxer_upstream_msg_iter =
struct muxer_comp *muxer_comp = muxer_msg_iter->muxer_comp;
if (!muxer_upstream_msg_iter) {
- BT_COMP_LOGE_STR("Failed to allocate one muxer's upstream message iterator wrapper.");
+ BT_COMP_LOGE_APPEND_CAUSE(muxer_comp->self_comp,
+ "Failed to allocate one muxer's upstream message iterator wrapper.");
goto error;
}
muxer_upstream_msg_iter->muxer_comp = muxer_comp;
muxer_upstream_msg_iter->msg_iter = self_msg_iter;
- bt_self_component_port_input_message_iterator_get_ref(muxer_upstream_msg_iter->msg_iter);
- muxer_upstream_msg_iter->msgs = g_queue_new();
+ bt_message_iterator_get_ref(muxer_upstream_msg_iter->msg_iter);
+ muxer_upstream_msg_iter->msgs =
+ g_ptr_array_new_with_free_func((GDestroyNotify) bt_message_put_ref);
if (!muxer_upstream_msg_iter->msgs) {
- BT_COMP_LOGE_STR("Failed to allocate a GQueue.");
+ BT_COMP_LOGE_APPEND_CAUSE(muxer_comp->self_comp,
+ "Failed to allocate a GPtrArray.");
goto error;
}
goto end;
error:
- g_free(muxer_upstream_msg_iter);
+ destroy_muxer_upstream_msg_iter(muxer_upstream_msg_iter);
ret = -1;
end:
BT_ASSERT(muxer_comp);
port_name = g_string_new("in");
if (!port_name) {
- BT_COMP_LOGE_STR("Failed to allocate a GString.");
+ BT_COMP_LOGE_APPEND_CAUSE(muxer_comp->self_comp, "Failed to allocate a GString.");
status = BT_SELF_COMPONENT_ADD_PORT_STATUS_MEMORY_ERROR;
goto end;
}
status = bt_self_component_filter_add_input_port(
self_comp, port_name->str, NULL, NULL);
if (status != BT_SELF_COMPONENT_ADD_PORT_STATUS_OK) {
- BT_COMP_LOGE("Cannot add input port to muxer component: "
+ BT_COMP_LOGE_APPEND_CAUSE(muxer_comp->self_comp,
+ "Cannot add input port to muxer component: "
"port-name=\"%s\", comp-addr=%p, status=%s",
port_name->str, self_comp,
bt_common_func_status_string(status));
"comp-addr=%p, params-addr=%p", self_comp, params);
if (!muxer_comp) {
+ /*
+ * Don't use BT_COMP_LOGE_APPEND_CAUSE, as `muxer_comp` is not
+ * initialized.
+ */
BT_COMP_LOG_CUR_LVL(BT_LOG_ERROR, log_level, self_comp,
"Failed to allocate one muxer component.");
- status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
+ BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_COMPONENT(self_comp,
+ "Failed to allocate one muxer component.");
+ status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
goto error;
}
bt_self_component_set_data(self_comp, muxer_comp);
add_port_status = add_available_input_port(self_comp_flt);
if (add_port_status != BT_SELF_COMPONENT_ADD_PORT_STATUS_OK) {
- BT_COMP_LOGE("Cannot ensure that at least one muxer component's input port is available: "
+ BT_COMP_LOGE_APPEND_CAUSE(self_comp,
+ "Cannot ensure that at least one muxer component's input port is available: "
"muxer-comp-addr=%p, status=%s",
- muxer_comp,
- bt_common_func_status_string(add_port_status));
+ muxer_comp, bt_common_func_status_string(add_port_status));
status = (int) add_port_status;
goto error;
}
add_port_status = create_output_port(self_comp_flt);
if (add_port_status != BT_SELF_COMPONENT_ADD_PORT_STATUS_OK) {
- BT_COMP_LOGE("Cannot create muxer component's output port: "
+ BT_COMP_LOGE_APPEND_CAUSE(self_comp,
+ "Cannot create muxer component's output port: "
"muxer-comp-addr=%p, status=%s",
- muxer_comp,
- bt_common_func_status_string(add_port_status));
+ muxer_comp, bt_common_func_status_string(add_port_status));
status = (int) add_port_status;
goto error;
}
}
static
-bt_self_component_port_input_message_iterator_create_from_message_iterator_status
+bt_message_iterator_create_from_message_iterator_status
create_msg_iter_on_input_port(struct muxer_comp *muxer_comp,
struct muxer_msg_iter *muxer_msg_iter,
bt_self_component_port_input *self_port,
- bt_self_component_port_input_message_iterator **msg_iter)
+ bt_message_iterator **msg_iter)
{
const bt_port *port = bt_self_component_port_as_port(
bt_self_component_port_input_as_self_component_port(
self_port));
- bt_self_component_port_input_message_iterator_create_from_message_iterator_status
+ bt_message_iterator_create_from_message_iterator_status
status;
BT_ASSERT(port);
// TODO: Advance the iterator to >= the time of the latest
// returned message by the muxer message
// iterator which creates it.
- status = bt_self_component_port_input_message_iterator_create_from_message_iterator(
+ status = bt_message_iterator_create_from_message_iterator(
muxer_msg_iter->self_msg_iter, self_port, msg_iter);
- if (status != BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_CREATE_FROM_MESSAGE_ITERATOR_STATUS_OK) {
- BT_COMP_LOGE("Cannot create upstream message iterator on input port: "
+ if (status != BT_MESSAGE_ITERATOR_CREATE_FROM_MESSAGE_ITERATOR_STATUS_OK) {
+ BT_COMP_LOGE_APPEND_CAUSE(muxer_comp->self_comp,
+ "Cannot create upstream message iterator on input port: "
"port-addr=%p, port-name=\"%s\"",
port, bt_port_get_name(port));
goto end;
}
static
-bt_component_class_message_iterator_next_method_status muxer_upstream_msg_iter_next(
+bt_message_iterator_class_next_method_status muxer_upstream_msg_iter_next(
struct muxer_upstream_msg_iter *muxer_upstream_msg_iter,
bool *is_ended)
{
struct muxer_comp *muxer_comp = muxer_upstream_msg_iter->muxer_comp;
- bt_component_class_message_iterator_next_method_status status;
+ bt_message_iterator_class_next_method_status status;
bt_message_iterator_next_status input_port_iter_status;
bt_message_array_const msgs;
uint64_t i;
"muxer-upstream-msg-iter-wrap-addr=%p, msg-iter-addr=%p",
muxer_upstream_msg_iter,
muxer_upstream_msg_iter->msg_iter);
- input_port_iter_status = bt_self_component_port_input_message_iterator_next(
+ input_port_iter_status = bt_message_iterator_next(
muxer_upstream_msg_iter->msg_iter, &msgs, &count);
BT_COMP_LOGD("Upstream message iterator's \"next\" method returned: "
"status=%s",
BT_COMP_LOGD_STR("Validated upstream message iterator wrapper.");
BT_ASSERT_DBG(count > 0);
+ g_ptr_array_set_size(muxer_upstream_msg_iter->msgs, count);
+ muxer_upstream_msg_iter->next_msg = 0;
+
/* Move messages to our queue */
for (i = 0; i < count; i++) {
/*
* (muxer_msg_iter_do_next_one()) consumes
* from the head first.
*/
- g_queue_push_tail(muxer_upstream_msg_iter->msgs,
- (void *) msgs[i]);
+ g_ptr_array_index(muxer_upstream_msg_iter->msgs, i)
+ = (gpointer *) msgs[i];
}
- status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK;
+ status = BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK;
break;
case BT_MESSAGE_ITERATOR_NEXT_STATUS_AGAIN:
/*
* valid anymore. Return
* BT_MESSAGE_ITERATOR_NEXT_STATUS_AGAIN immediately.
*/
- status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_AGAIN;
+ status = BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_AGAIN;
break;
case BT_MESSAGE_ITERATOR_NEXT_STATUS_END: /* Fall-through. */
/*
* message.
*/
*is_ended = true;
- status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK;
+ status = BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK;
break;
case BT_MESSAGE_ITERATOR_NEXT_STATUS_ERROR:
case BT_MESSAGE_ITERATOR_NEXT_STATUS_MEMORY_ERROR:
BT_COMP_LOGE_APPEND_CAUSE(muxer_comp->self_comp,
"Unsupported status code: status=%s",
bt_common_func_status_string(input_port_iter_status));
- status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR;
+ status = BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_ERROR;
break;
}
break;
case BT_MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY:
- clock_snapshot = bt_message_message_iterator_inactivity_borrow_default_clock_snapshot_const(
+ clock_snapshot = bt_message_message_iterator_inactivity_borrow_clock_snapshot_const(
msg);
break;
default:
ret = bt_clock_snapshot_get_ns_from_origin(clock_snapshot, ts_ns);
if (ret) {
- BT_COMP_LOGE("Cannot get nanoseconds from Epoch of clock snapshot: "
+ BT_COMP_LOGE_APPEND_CAUSE(muxer_comp->self_comp,
+ "Cannot get nanoseconds from Epoch of clock snapshot: "
"clock-snapshot-addr=%p", clock_snapshot);
goto error;
}
switch (muxer_msg_iter->clock_class_expectation) {
case MUXER_MSG_ITER_CLOCK_CLASS_EXPECTATION_ABSOLUTE:
if (!bt_clock_class_origin_is_unix_epoch(clock_class)) {
- BT_COMP_LOGE("Expecting an absolute clock class, "
+ BT_COMP_LOGE_APPEND_CAUSE(muxer_comp->self_comp,
+ "Expecting an absolute clock class, "
"but got a non-absolute one: "
"clock-class-addr=%p, clock-class-name=\"%s\"",
clock_class, cc_name);
break;
case MUXER_MSG_ITER_CLOCK_CLASS_EXPECTATION_NOT_ABS_NO_UUID:
if (bt_clock_class_origin_is_unix_epoch(clock_class)) {
- BT_COMP_LOGE("Expecting a non-absolute clock class with no UUID, "
+ BT_COMP_LOGE_APPEND_CAUSE(muxer_comp->self_comp,
+ "Expecting a non-absolute clock class with no UUID, "
"but got an absolute one: "
"clock-class-addr=%p, clock-class-name=\"%s\"",
clock_class, cc_name);
}
if (cc_uuid) {
- BT_COMP_LOGE("Expecting a non-absolute clock class with no UUID, "
+ BT_COMP_LOGE_APPEND_CAUSE(muxer_comp->self_comp,
+ "Expecting a non-absolute clock class with no UUID, "
"but got one with a UUID: "
"clock-class-addr=%p, clock-class-name=\"%s\", "
"uuid=\"" BT_UUID_FMT "\"",
break;
case MUXER_MSG_ITER_CLOCK_CLASS_EXPECTATION_NOT_ABS_SPEC_UUID:
if (bt_clock_class_origin_is_unix_epoch(clock_class)) {
- BT_COMP_LOGE("Expecting a non-absolute clock class with a specific UUID, "
+ BT_COMP_LOGE_APPEND_CAUSE(muxer_comp->self_comp,
+ "Expecting a non-absolute clock class with a specific UUID, "
"but got an absolute one: "
"clock-class-addr=%p, clock-class-name=\"%s\"",
clock_class, cc_name);
}
if (!cc_uuid) {
- BT_COMP_LOGE("Expecting a non-absolute clock class with a specific UUID, "
+ BT_COMP_LOGE_APPEND_CAUSE(muxer_comp->self_comp,
+ "Expecting a non-absolute clock class with a specific UUID, "
"but got one with no UUID: "
"clock-class-addr=%p, clock-class-name=\"%s\"",
clock_class, cc_name);
}
if (bt_uuid_compare(muxer_msg_iter->expected_clock_class_uuid, cc_uuid) != 0) {
- BT_COMP_LOGE("Expecting a non-absolute clock class with a specific UUID, "
+ BT_COMP_LOGE_APPEND_CAUSE(muxer_comp->self_comp,
+ "Expecting a non-absolute clock class with a specific UUID, "
"but got one with different UUID: "
"clock-class-addr=%p, clock-class-name=\"%s\", "
"expected-uuid=\"" BT_UUID_FMT "\", "
}
break;
case MUXER_MSG_ITER_CLOCK_CLASS_EXPECTATION_NONE:
- BT_COMP_LOGE("Expecting no clock class, but got one: "
+ BT_COMP_LOGE_APPEND_CAUSE(muxer_comp->self_comp,
+ "Expecting no clock class, but got one: "
"clock-class-addr=%p, clock-class-name=\"%s\"",
clock_class, cc_name);
goto error;
MUXER_MSG_ITER_CLOCK_CLASS_EXPECTATION_NONE;
} else if (muxer_msg_iter->clock_class_expectation !=
MUXER_MSG_ITER_CLOCK_CLASS_EXPECTATION_NONE) {
- BT_COMP_LOGE("Expecting stream class without a default clock class: "
+ BT_COMP_LOGE_APPEND_CAUSE(muxer_comp->self_comp,
+ "Expecting stream class without a default clock class: "
"stream-class-addr=%p, stream-class-name=\"%s\", "
"stream-class-id=%" PRIu64,
stream_class, bt_stream_class_get_name(stream_class),
* the youngest, and sets *ts_ns to its time.
*/
static
-bt_component_class_message_iterator_next_method_status
+bt_message_iterator_class_next_method_status
muxer_msg_iter_youngest_upstream_msg_iter(
struct muxer_comp *muxer_comp,
struct muxer_msg_iter *muxer_msg_iter,
size_t i;
int ret;
int64_t youngest_ts_ns = INT64_MAX;
- bt_component_class_message_iterator_next_method_status status =
- BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK;
+ bt_message_iterator_class_next_method_status status =
+ BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK;
BT_ASSERT_DBG(muxer_comp);
BT_ASSERT_DBG(muxer_msg_iter);
continue;
}
- BT_ASSERT_DBG(cur_muxer_upstream_msg_iter->msgs->length > 0);
- msg = g_queue_peek_head(cur_muxer_upstream_msg_iter->msgs);
+ BT_ASSERT_DBG(cur_muxer_upstream_msg_iter->next_msg <
+ cur_muxer_upstream_msg_iter->msgs->len);
+ msg = g_ptr_array_index(cur_muxer_upstream_msg_iter->msgs,
+ cur_muxer_upstream_msg_iter->next_msg);
BT_ASSERT_DBG(msg);
if (G_UNLIKELY(bt_message_get_type(msg) ==
* validate_new_stream_clock_class() logs
* errors.
*/
- status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR;
+ status = BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_ERROR;
goto end;
}
} else if (G_UNLIKELY(bt_message_get_type(msg) ==
BT_MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY)) {
const bt_clock_snapshot *cs;
- cs = bt_message_message_iterator_inactivity_borrow_default_clock_snapshot_const(
+ cs = bt_message_message_iterator_inactivity_borrow_clock_snapshot_const(
msg);
ret = validate_clock_class(muxer_msg_iter, muxer_comp,
bt_clock_snapshot_borrow_clock_class_const(cs));
if (ret) {
/* validate_clock_class() logs errors */
- status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR;
+ status = BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_ERROR;
goto end;
}
}
if (ret) {
/* get_msg_ts_ns() logs errors */
*muxer_upstream_msg_iter = NULL;
- status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR;
+ status = BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_ERROR;
goto end;
}
* current candidate message. We must break the tie
* in a predictable manner.
*/
- const bt_message *selected_msg = g_queue_peek_head(
- (*muxer_upstream_msg_iter)->msgs);
+ BT_ASSERT_DBG((*muxer_upstream_msg_iter)->next_msg <
+ (*muxer_upstream_msg_iter)->msgs->len);
+ const bt_message *selected_msg =
+ g_ptr_array_index((*muxer_upstream_msg_iter)->msgs,
+ (*muxer_upstream_msg_iter)->next_msg);
BT_COMP_LOGD_STR("Two of the next message candidates have the same timestamps, pick one deterministically.");
/*
}
if (!*muxer_upstream_msg_iter) {
- status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_END;
+ status = BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_END;
*ts_ns = INT64_MIN;
}
}
static
-bt_component_class_message_iterator_next_method_status
+bt_message_iterator_class_next_method_status
validate_muxer_upstream_msg_iter(
struct muxer_upstream_msg_iter *muxer_upstream_msg_iter,
bool *is_ended)
{
struct muxer_comp *muxer_comp = muxer_upstream_msg_iter->muxer_comp;
- bt_component_class_message_iterator_next_method_status status;
+ bt_message_iterator_class_next_method_status status;
BT_COMP_LOGD("Validating muxer's upstream message iterator wrapper: "
"muxer-upstream-msg-iter-wrap-addr=%p",
muxer_upstream_msg_iter);
- if (muxer_upstream_msg_iter->msgs->length > 0 ||
+ if (muxer_upstream_msg_iter->next_msg < muxer_upstream_msg_iter->msgs->len ||
!muxer_upstream_msg_iter->msg_iter) {
BT_COMP_LOGD("Already valid or not considered: "
- "queue-len=%u, upstream-msg-iter-addr=%p",
- muxer_upstream_msg_iter->msgs->length,
+ "queue-len=%u, next-msg=%u, upstream-msg-iter-addr=%p",
+ muxer_upstream_msg_iter->msgs->len,
+ muxer_upstream_msg_iter->next_msg,
muxer_upstream_msg_iter->msg_iter);
- status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK;
+ status = BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK;
goto end;
}
}
static
-bt_component_class_message_iterator_next_method_status
+bt_message_iterator_class_next_method_status
validate_muxer_upstream_msg_iters(
struct muxer_msg_iter *muxer_msg_iter)
{
struct muxer_comp *muxer_comp = muxer_msg_iter->muxer_comp;
- bt_component_class_message_iterator_next_method_status status;
+ bt_message_iterator_class_next_method_status status;
size_t i;
BT_COMP_LOGD("Validating muxer's upstream message iterator wrappers: "
status = validate_muxer_upstream_msg_iter(
muxer_upstream_msg_iter, &is_ended);
- if (status != BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK) {
+ if (status != BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK) {
if (status < 0) {
BT_COMP_LOGE_APPEND_CAUSE(muxer_comp->self_comp,
"Cannot validate muxer's upstream message iterator wrapper: "
}
}
- status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK;
+ status = BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK;
end:
return status;
}
static inline
-bt_component_class_message_iterator_next_method_status muxer_msg_iter_do_next_one(
+bt_message_iterator_class_next_method_status muxer_msg_iter_do_next_one(
struct muxer_comp *muxer_comp,
struct muxer_msg_iter *muxer_msg_iter,
const bt_message **msg)
{
- bt_component_class_message_iterator_next_method_status status;
+ bt_message_iterator_class_next_method_status status;
struct muxer_upstream_msg_iter *muxer_upstream_msg_iter = NULL;
- int64_t next_return_ts;
+ /* Initialize to avoid -Wmaybe-uninitialized warning with gcc 4.8. */
+ int64_t next_return_ts = 0;
status = validate_muxer_upstream_msg_iters(muxer_msg_iter);
- if (status != BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK) {
+ if (status != BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK) {
/* validate_muxer_upstream_msg_iters() logs details */
goto end;
}
status = muxer_msg_iter_youngest_upstream_msg_iter(muxer_comp,
muxer_msg_iter, &muxer_upstream_msg_iter,
&next_return_ts);
- if (status < 0 || status == BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_END) {
+ if (status < 0 || status == BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_END) {
if (status < 0) {
BT_COMP_LOGE_APPEND_CAUSE(muxer_comp->self_comp,
"Cannot find the youngest upstream message iterator wrapper: "
"last-returned-ts=%" PRId64,
muxer_msg_iter, next_return_ts,
muxer_msg_iter->last_returned_ts_ns);
- status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR;
+ status = BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_ERROR;
goto end;
}
"ts=%" PRId64,
muxer_msg_iter, muxer_upstream_msg_iter, next_return_ts);
BT_ASSERT_DBG(status ==
- BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK);
+ BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK);
BT_ASSERT_DBG(muxer_upstream_msg_iter);
/*
* Consume from the queue's head: other side
* (muxer_upstream_msg_iter_next()) writes to the tail.
*/
- *msg = g_queue_pop_head(muxer_upstream_msg_iter->msgs);
+ *msg = g_ptr_array_index(muxer_upstream_msg_iter->msgs,
+ muxer_upstream_msg_iter->next_msg);
+ g_ptr_array_index(muxer_upstream_msg_iter->msgs,
+ muxer_upstream_msg_iter->next_msg) = NULL;
+ ++muxer_upstream_msg_iter->next_msg;
BT_ASSERT_DBG(*msg);
muxer_msg_iter->last_returned_ts_ns = next_return_ts;
}
static
-bt_component_class_message_iterator_next_method_status muxer_msg_iter_do_next(
+bt_message_iterator_class_next_method_status muxer_msg_iter_do_next(
struct muxer_comp *muxer_comp,
struct muxer_msg_iter *muxer_msg_iter,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count)
{
- bt_component_class_message_iterator_next_method_status status;
+ bt_message_iterator_class_next_method_status status;
uint64_t i = 0;
if (G_UNLIKELY(muxer_msg_iter->next_saved_error)) {
do {
status = muxer_msg_iter_do_next_one(muxer_comp,
muxer_msg_iter, &msgs[i]);
- if (status == BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK) {
+ if (status == BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK) {
i++;
}
- } while (i < capacity && status == BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK);
+ } while (i < capacity && status == BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK);
if (i > 0) {
/*
}
*count = i;
- status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK;
+ status = BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_OK;
}
end:
}
static
-bt_component_class_message_iterator_initialize_method_status
+bt_message_iterator_class_initialize_method_status
muxer_msg_iter_init_upstream_iterators(struct muxer_comp *muxer_comp,
struct muxer_msg_iter *muxer_msg_iter,
struct bt_self_message_iterator_configuration *config)
{
int64_t count;
int64_t i;
- bt_component_class_message_iterator_initialize_method_status status;
+ bt_message_iterator_class_initialize_method_status status;
bool can_seek_forward = true;
count = bt_component_filter_get_input_port_count(
BT_COMP_LOGD("No input port to initialize for muxer component's message iterator: "
"muxer-comp-addr=%p, muxer-msg-iter-addr=%p",
muxer_comp, muxer_msg_iter);
- status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INITIALIZE_METHOD_STATUS_OK;
+ status = BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_OK;
goto end;
}
for (i = 0; i < count; i++) {
- bt_self_component_port_input_message_iterator *upstream_msg_iter;
+ bt_message_iterator *upstream_msg_iter;
bt_self_component_port_input *self_port =
bt_self_component_filter_borrow_input_port_by_index(
muxer_comp->self_comp_flt, i);
const bt_port *port;
- bt_self_component_port_input_message_iterator_create_from_message_iterator_status
+ bt_message_iterator_create_from_message_iterator_status
msg_iter_status;
int int_status;
msg_iter_status = create_msg_iter_on_input_port(muxer_comp,
muxer_msg_iter, self_port, &upstream_msg_iter);
- if (msg_iter_status != BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_CREATE_FROM_MESSAGE_ITERATOR_STATUS_OK) {
+ if (msg_iter_status != BT_MESSAGE_ITERATOR_CREATE_FROM_MESSAGE_ITERATOR_STATUS_OK) {
/* create_msg_iter_on_input_port() logs errors */
status = (int) msg_iter_status;
goto end;
int_status = muxer_msg_iter_add_upstream_msg_iter(muxer_msg_iter,
upstream_msg_iter);
- bt_self_component_port_input_message_iterator_put_ref(
+ bt_message_iterator_put_ref(
upstream_msg_iter);
if (int_status) {
- status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INITIALIZE_METHOD_STATUS_ERROR;
+ status = BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_ERROR;
/* muxer_msg_iter_add_upstream_msg_iter() logs errors */
goto end;
}
can_seek_forward = can_seek_forward &&
- bt_self_component_port_input_message_iterator_can_seek_forward(
+ bt_message_iterator_can_seek_forward(
upstream_msg_iter);
}
bt_self_message_iterator_configuration_set_can_seek_forward(
config, can_seek_forward);
- status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INITIALIZE_METHOD_STATUS_OK;
+ status = BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_OK;
end:
return status;
}
BT_HIDDEN
-bt_component_class_message_iterator_initialize_method_status muxer_msg_iter_init(
+bt_message_iterator_class_initialize_method_status muxer_msg_iter_init(
bt_self_message_iterator *self_msg_iter,
bt_self_message_iterator_configuration *config,
- bt_self_component_filter *self_comp,
bt_self_component_port_output *port)
{
struct muxer_comp *muxer_comp = NULL;
struct muxer_msg_iter *muxer_msg_iter = NULL;
- bt_component_class_message_iterator_initialize_method_status status;
+ bt_message_iterator_class_initialize_method_status status;
+ bt_self_component *self_comp =
+ bt_self_message_iterator_borrow_component(self_msg_iter);
- muxer_comp = bt_self_component_get_data(
- bt_self_component_filter_as_self_component(self_comp));
+ muxer_comp = bt_self_component_get_data(self_comp);
BT_ASSERT(muxer_comp);
BT_COMP_LOGD("Initializing muxer component's message iterator: "
"comp-addr=%p, muxer-comp-addr=%p, msg-iter-addr=%p",
* creates a muxer message iterator while creating
* another muxer message iterator (same component).
*/
- BT_COMP_LOGE("Recursive initialization of muxer component's message iterator: "
+ BT_COMP_LOGE_APPEND_CAUSE(muxer_comp->self_comp,
+ "Recursive initialization of muxer component's message iterator: "
"comp-addr=%p, muxer-comp-addr=%p, msg-iter-addr=%p",
self_comp, muxer_comp, self_msg_iter);
- status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INITIALIZE_METHOD_STATUS_ERROR;
+ status = BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_ERROR;
goto error;
}
muxer_comp->initializing_muxer_msg_iter = true;
muxer_msg_iter = g_new0(struct muxer_msg_iter, 1);
if (!muxer_msg_iter) {
- BT_COMP_LOGE_STR("Failed to allocate one muxer component's message iterator.");
- status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
+ BT_COMP_LOGE_APPEND_CAUSE(muxer_comp->self_comp,
+ "Failed to allocate one muxer component's message iterator.");
+ status = BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
goto error;
}
g_ptr_array_new_with_free_func(
(GDestroyNotify) destroy_muxer_upstream_msg_iter);
if (!muxer_msg_iter->active_muxer_upstream_msg_iters) {
- BT_COMP_LOGE_STR("Failed to allocate a GPtrArray.");
- status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
+ BT_COMP_LOGE_APPEND_CAUSE(muxer_comp->self_comp, "Failed to allocate a GPtrArray.");
+ status = BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
goto error;
}
g_ptr_array_new_with_free_func(
(GDestroyNotify) destroy_muxer_upstream_msg_iter);
if (!muxer_msg_iter->ended_muxer_upstream_msg_iters) {
- BT_COMP_LOGE_STR("Failed to allocate a GPtrArray.");
- status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
+ BT_COMP_LOGE_APPEND_CAUSE(muxer_comp->self_comp, "Failed to allocate a GPtrArray.");
+ status = BT_MESSAGE_ITERATOR_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
goto error;
}
status = muxer_msg_iter_init_upstream_iterators(muxer_comp,
muxer_msg_iter, config);
if (status) {
- BT_COMP_LOGE("Cannot initialize connected input ports for muxer component's message iterator: "
+ BT_COMP_LOGE_APPEND_CAUSE(muxer_comp->self_comp,
+ "Cannot initialize connected input ports for muxer component's message iterator: "
"comp-addr=%p, muxer-comp-addr=%p, "
"muxer-msg-iter-addr=%p, msg-iter-addr=%p, ret=%d",
self_comp, muxer_comp, muxer_msg_iter,
}
BT_HIDDEN
-bt_component_class_message_iterator_next_method_status muxer_msg_iter_next(
+bt_message_iterator_class_next_method_status muxer_msg_iter_next(
bt_self_message_iterator *self_msg_iter,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count)
{
- bt_component_class_message_iterator_next_method_status status;
+ bt_message_iterator_class_next_method_status status;
struct muxer_msg_iter *muxer_msg_iter =
bt_self_message_iterator_get_data(self_msg_iter);
bt_self_component *self_comp = NULL;
status = muxer_msg_iter_do_next(muxer_comp, muxer_msg_iter,
msgs, capacity, count);
if (status < 0) {
- BT_COMP_LOGE("Cannot get next message: "
+ BT_COMP_LOGE_APPEND_CAUSE(self_comp,
+ "Cannot get next message: "
"comp-addr=%p, muxer-comp-addr=%p, muxer-msg-iter-addr=%p, "
"msg-iter-addr=%p, status=%s",
self_comp, muxer_comp, muxer_msg_iter, self_msg_iter,
add_port_status = add_available_input_port(self_comp);
if (add_port_status) {
- BT_COMP_LOGE("Cannot add one muxer component's input port: "
- "status=%s",
- bt_common_func_status_string(status));
+ BT_COMP_LOGE_APPEND_CAUSE(muxer_comp->self_comp,
+ "Cannot add one muxer component's input port: status=%s",
+ bt_common_func_status_string(add_port_status));
if (add_port_status ==
BT_SELF_COMPONENT_ADD_PORT_STATUS_MEMORY_ERROR) {
}
static inline
-bt_component_class_message_iterator_can_seek_beginning_method_status
+bt_message_iterator_class_can_seek_beginning_method_status
muxer_upstream_msg_iters_can_all_seek_beginning(
+ struct muxer_comp *muxer_comp,
GPtrArray *muxer_upstream_msg_iters, bt_bool *can_seek)
{
- bt_component_class_message_iterator_can_seek_beginning_method_status status =
- BT_COMPONENT_CLASS_MESSAGE_ITERATOR_CAN_SEEK_BEGINNING_METHOD_STATUS_OK;
+ bt_message_iterator_class_can_seek_beginning_method_status status =
+ BT_MESSAGE_ITERATOR_CLASS_CAN_SEEK_BEGINNING_METHOD_STATUS_OK;
uint64_t i;
for (i = 0; i < muxer_upstream_msg_iters->len; i++) {
struct muxer_upstream_msg_iter *upstream_msg_iter =
muxer_upstream_msg_iters->pdata[i];
- status = (int) bt_self_component_port_input_message_iterator_can_seek_beginning(
+ status = (int) bt_message_iterator_can_seek_beginning(
upstream_msg_iter->msg_iter, can_seek);
- if (status != BT_COMPONENT_CLASS_MESSAGE_ITERATOR_CAN_SEEK_BEGINNING_METHOD_STATUS_OK) {
+ if (status != BT_MESSAGE_ITERATOR_CLASS_CAN_SEEK_BEGINNING_METHOD_STATUS_OK) {
+ BT_COMP_LOGE_APPEND_CAUSE(muxer_comp->self_comp,
+ "Failed to determine whether upstream message iterator can seek beginning: "
+ "msg-iter-addr=%p", upstream_msg_iter->msg_iter);
goto end;
}
}
BT_HIDDEN
-bt_component_class_message_iterator_can_seek_beginning_method_status
+bt_message_iterator_class_can_seek_beginning_method_status
muxer_msg_iter_can_seek_beginning(
bt_self_message_iterator *self_msg_iter, bt_bool *can_seek)
{
struct muxer_msg_iter *muxer_msg_iter =
bt_self_message_iterator_get_data(self_msg_iter);
- bt_component_class_message_iterator_can_seek_beginning_method_status status;
+ bt_message_iterator_class_can_seek_beginning_method_status status;
status = muxer_upstream_msg_iters_can_all_seek_beginning(
+ muxer_msg_iter->muxer_comp,
muxer_msg_iter->active_muxer_upstream_msg_iters, can_seek);
- if (status != BT_COMPONENT_CLASS_MESSAGE_ITERATOR_CAN_SEEK_BEGINNING_METHOD_STATUS_OK) {
+ if (status != BT_MESSAGE_ITERATOR_CLASS_CAN_SEEK_BEGINNING_METHOD_STATUS_OK) {
goto end;
}
}
status = muxer_upstream_msg_iters_can_all_seek_beginning(
+ muxer_msg_iter->muxer_comp,
muxer_msg_iter->ended_muxer_upstream_msg_iters, can_seek);
end:
}
BT_HIDDEN
-bt_component_class_message_iterator_seek_beginning_method_status muxer_msg_iter_seek_beginning(
+bt_message_iterator_class_seek_beginning_method_status muxer_msg_iter_seek_beginning(
bt_self_message_iterator *self_msg_iter)
{
struct muxer_msg_iter *muxer_msg_iter =
bt_self_message_iterator_get_data(self_msg_iter);
- bt_component_class_message_iterator_seek_beginning_method_status status =
- BT_COMPONENT_CLASS_MESSAGE_ITERATOR_SEEK_BEGINNING_METHOD_STATUS_OK;
+ bt_message_iterator_class_seek_beginning_method_status status =
+ BT_MESSAGE_ITERATOR_CLASS_SEEK_BEGINNING_METHOD_STATUS_OK;
bt_message_iterator_seek_beginning_status seek_beg_status;
uint64_t i;
struct muxer_upstream_msg_iter *upstream_msg_iter =
muxer_msg_iter->ended_muxer_upstream_msg_iters->pdata[i];
- seek_beg_status = bt_self_component_port_input_message_iterator_seek_beginning(
+ seek_beg_status = bt_message_iterator_seek_beginning(
upstream_msg_iter->msg_iter);
if (seek_beg_status != BT_MESSAGE_ITERATOR_SEEK_BEGINNING_STATUS_OK) {
status = (int) seek_beg_status;
struct muxer_upstream_msg_iter *upstream_msg_iter =
muxer_msg_iter->active_muxer_upstream_msg_iters->pdata[i];
- seek_beg_status = bt_self_component_port_input_message_iterator_seek_beginning(
+ seek_beg_status = bt_message_iterator_seek_beginning(
upstream_msg_iter->msg_iter);
if (seek_beg_status != BT_MESSAGE_ITERATOR_SEEK_BEGINNING_STATUS_OK) {
status = (int) seek_beg_status;
projects / babeltrace.git / blobdiff