#include <stdlib.h>
#include <string.h>
+#include "muxer.h"
+
#define ASSUME_ABSOLUTE_CLOCK_CLASSES_PARAM_NAME "assume-absolute-clock-classes"
struct muxer_comp {
BT_HIDDEN
bt_self_component_status muxer_init(
bt_self_component_filter *self_comp,
- bt_value *params, void *init_data)
+ const bt_value *params, void *init_data)
+
+
{
int ret;
bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK;
}
static
-bt_message_iterator_status muxer_upstream_msg_iter_next(
+bt_self_message_iterator_status muxer_upstream_msg_iter_next(
struct muxer_upstream_msg_iter *muxer_upstream_msg_iter)
{
- bt_message_iterator_status status;
+ bt_self_message_iterator_status status;
+ bt_message_iterator_status input_port_iter_status;
bt_message_array_const msgs;
uint64_t i;
uint64_t count;
"muxer-upstream-msg-iter-wrap-addr=%p, msg-iter-addr=%p",
muxer_upstream_msg_iter,
muxer_upstream_msg_iter->msg_iter);
- status = bt_self_component_port_input_message_iterator_next(
+ input_port_iter_status = bt_self_component_port_input_message_iterator_next(
muxer_upstream_msg_iter->msg_iter, &msgs, &count);
BT_LOGV("Upstream message iterator's \"next\" method returned: "
- "status=%s", bt_message_iterator_status_string(status));
+ "status=%s", bt_message_iterator_status_string(input_port_iter_status));
- switch (status) {
+ switch (input_port_iter_status) {
case BT_MESSAGE_ITERATOR_STATUS_OK:
/*
* Message iterator's current message is
g_queue_push_tail(muxer_upstream_msg_iter->msgs,
(void *) msgs[i]);
}
+ status = BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
break;
case BT_MESSAGE_ITERATOR_STATUS_AGAIN:
/*
* valid anymore. Return
* BT_MESSAGE_ITERATOR_STATUS_AGAIN immediately.
*/
+ status = BT_SELF_MESSAGE_ITERATOR_STATUS_AGAIN;
break;
case BT_MESSAGE_ITERATOR_STATUS_END: /* Fall-through. */
/*
* message.
*/
BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_PUT_REF_AND_RESET(muxer_upstream_msg_iter->msg_iter);
- status = BT_MESSAGE_ITERATOR_STATUS_OK;
+ status = BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
break;
default:
/* Error or unsupported status code */
BT_LOGE("Error or unsupported status code: "
- "status-code=%d", status);
- status = BT_MESSAGE_ITERATOR_STATUS_ERROR;
+ "status-code=%d", input_port_iter_status);
+ status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
break;
}
* the youngest, and sets *ts_ns to its time.
*/
static
-bt_message_iterator_status
+bt_self_message_iterator_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_message_iterator_status status =
- BT_MESSAGE_ITERATOR_STATUS_OK;
+ bt_self_message_iterator_status status =
+ BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
BT_ASSERT(muxer_comp);
BT_ASSERT(muxer_msg_iter);
if (ret) {
/* get_msg_ts_ns() logs errors */
*muxer_upstream_msg_iter = NULL;
- status = BT_MESSAGE_ITERATOR_STATUS_ERROR;
+ status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
goto end;
}
}
if (!*muxer_upstream_msg_iter) {
- status = BT_MESSAGE_ITERATOR_STATUS_END;
+ status = BT_SELF_MESSAGE_ITERATOR_STATUS_END;
*ts_ns = INT64_MIN;
}
}
static
-bt_message_iterator_status validate_muxer_upstream_msg_iter(
+bt_self_message_iterator_status validate_muxer_upstream_msg_iter(
struct muxer_upstream_msg_iter *muxer_upstream_msg_iter)
{
- bt_message_iterator_status status =
- BT_MESSAGE_ITERATOR_STATUS_OK;
+ bt_self_message_iterator_status status =
+ BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
BT_LOGV("Validating muxer's upstream message iterator wrapper: "
"muxer-upstream-msg-iter-wrap-addr=%p",
}
static
-bt_message_iterator_status validate_muxer_upstream_msg_iters(
+bt_self_message_iterator_status validate_muxer_upstream_msg_iters(
struct muxer_msg_iter *muxer_msg_iter)
{
- bt_message_iterator_status status =
- BT_MESSAGE_ITERATOR_STATUS_OK;
+ bt_self_message_iterator_status status =
+ BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
size_t i;
BT_LOGV("Validating muxer's upstream message iterator wrappers: "
status = validate_muxer_upstream_msg_iter(
muxer_upstream_msg_iter);
- if (status != BT_MESSAGE_ITERATOR_STATUS_OK) {
+ if (status != BT_SELF_MESSAGE_ITERATOR_STATUS_OK) {
if (status < 0) {
BT_LOGE("Cannot validate muxer's upstream message iterator wrapper: "
"muxer-msg-iter-addr=%p, "
}
static inline
-bt_message_iterator_status muxer_msg_iter_do_next_one(
+bt_self_message_iterator_status muxer_msg_iter_do_next_one(
struct muxer_comp *muxer_comp,
struct muxer_msg_iter *muxer_msg_iter,
const bt_message **msg)
{
- bt_message_iterator_status status =
- BT_MESSAGE_ITERATOR_STATUS_OK;
+ bt_self_message_iterator_status status =
+ BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
struct muxer_upstream_msg_iter *muxer_upstream_msg_iter = NULL;
int64_t next_return_ts;
"muxer-comp-addr=%p, muxer-msg-iter-addr=%p, "
"ret=%d",
muxer_comp, muxer_msg_iter, ret);
- status = BT_MESSAGE_ITERATOR_STATUS_ERROR;
+ status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
goto end;
}
status = validate_muxer_upstream_msg_iters(muxer_msg_iter);
- if (status != BT_MESSAGE_ITERATOR_STATUS_OK) {
+ if (status != BT_SELF_MESSAGE_ITERATOR_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_MESSAGE_ITERATOR_STATUS_END) {
+ if (status < 0 || status == BT_SELF_MESSAGE_ITERATOR_STATUS_END) {
if (status < 0) {
BT_LOGE("Cannot find the youngest upstream message iterator wrapper: "
"status=%s",
- bt_message_iterator_status_string(status));
+ bt_self_message_iterator_status_string(status));
} else {
BT_LOGV("Cannot find the youngest upstream message iterator wrapper: "
"status=%s",
- bt_message_iterator_status_string(status));
+ bt_self_message_iterator_status_string(status));
}
goto end;
"last-returned-ts=%" PRId64,
muxer_msg_iter, next_return_ts,
muxer_msg_iter->last_returned_ts_ns);
- status = BT_MESSAGE_ITERATOR_STATUS_ERROR;
+ status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
goto end;
}
"muxer-upstream-msg-iter-wrap-addr=%p, "
"ts=%" PRId64,
muxer_msg_iter, muxer_upstream_msg_iter, next_return_ts);
- BT_ASSERT(status == BT_MESSAGE_ITERATOR_STATUS_OK);
+ BT_ASSERT(status == BT_SELF_MESSAGE_ITERATOR_STATUS_OK);
BT_ASSERT(muxer_upstream_msg_iter);
/*
}
static
-bt_message_iterator_status muxer_msg_iter_do_next(
+bt_self_message_iterator_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_message_iterator_status status =
- BT_MESSAGE_ITERATOR_STATUS_OK;
+ bt_self_message_iterator_status status =
+ BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
uint64_t i = 0;
while (i < capacity && status == BT_MESSAGE_ITERATOR_STATUS_OK) {
* message, in which case we'll return it.
*/
*count = i;
- status = BT_MESSAGE_ITERATOR_STATUS_OK;
+ status = BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
}
return status;
struct muxer_comp *muxer_comp = NULL;
struct muxer_msg_iter *muxer_msg_iter = NULL;
bt_self_message_iterator_status status =
- BT_MESSAGE_ITERATOR_STATUS_OK;
+ BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
int ret;
muxer_comp = bt_self_component_get_data(
destroy_muxer_msg_iter(muxer_msg_iter);
bt_self_message_iterator_set_data(self_msg_iter,
NULL);
- status = BT_MESSAGE_ITERATOR_STATUS_ERROR;
+ status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
end:
muxer_comp->initializing_muxer_msg_iter = false;
}
BT_HIDDEN
-bt_message_iterator_status muxer_msg_iter_next(
+bt_self_message_iterator_status muxer_msg_iter_next(
bt_self_message_iterator *self_msg_iter,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count)
{
- bt_message_iterator_status status;
+ bt_self_message_iterator_status status;
struct muxer_msg_iter *muxer_msg_iter =
bt_self_message_iterator_get_data(self_msg_iter);
bt_self_component *self_comp = NULL;
"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,
- bt_message_iterator_status_string(status));
+ bt_self_message_iterator_status_string(status));
} else {
BT_LOGV("Returning from muxer component's message iterator's \"next\" method: "
"status=%s",
- bt_message_iterator_status_string(status));
+ bt_self_message_iterator_status_string(status));
}
return status;