* SOFTWARE.
*/
+#define BT_COMP_LOG_SELF_COMP (muxer_comp->self_comp)
+#define BT_LOG_OUTPUT_LEVEL (muxer_comp->log_level)
#define BT_LOG_TAG "PLUGIN/FLT.UTILS.MUXER"
-#include "logging.h"
+#include "plugins/comp-logging.h"
#include "common/macros.h"
#include "compat/uuid.h"
#define ASSUME_ABSOLUTE_CLOCK_CLASSES_PARAM_NAME "assume-absolute-clock-classes"
struct muxer_comp {
- /* Weak ref */
- bt_self_component_filter *self_comp;
+ /* Weak refs */
+ bt_self_component_filter *self_comp_flt;
+ bt_self_component *self_comp;
unsigned int next_port_num;
size_t available_input_ports;
bool initializing_muxer_msg_iter;
bool assume_absolute_clock_classes;
+ bt_logging_level log_level;
};
struct muxer_upstream_msg_iter {
+ struct muxer_comp *muxer_comp;
+
/* Owned by this, NULL if ended */
bt_self_component_port_input_message_iterator *msg_iter;
};
struct muxer_msg_iter {
+ struct muxer_comp *muxer_comp;
+
/*
* Array of struct muxer_upstream_msg_iter * (owned by this).
*
void destroy_muxer_upstream_msg_iter(
struct muxer_upstream_msg_iter *muxer_upstream_msg_iter)
{
+ struct muxer_comp *muxer_comp;
+
if (!muxer_upstream_msg_iter) {
return;
}
- BT_LOGD("Destroying muxer's upstream message iterator wrapper: "
+ 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",
muxer_upstream_msg_iter,
muxer_upstream_msg_iter->msg_iter,
int ret = 0;
struct muxer_upstream_msg_iter *muxer_upstream_msg_iter =
g_new0(struct muxer_upstream_msg_iter, 1);
+ struct muxer_comp *muxer_comp = muxer_msg_iter->muxer_comp;
if (!muxer_upstream_msg_iter) {
- BT_LOGE_STR("Failed to allocate one muxer's upstream message iterator wrapper.");
+ BT_COMP_LOGE_STR("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();
if (!muxer_upstream_msg_iter->msgs) {
- BT_LOGE_STR("Failed to allocate a GQueue.");
+ BT_COMP_LOGE_STR("Failed to allocate a GQueue.");
goto error;
}
g_ptr_array_add(muxer_msg_iter->active_muxer_upstream_msg_iters,
muxer_upstream_msg_iter);
- BT_LOGD("Added muxer's upstream message iterator wrapper: "
+ BT_COMP_LOGD("Added muxer's upstream message iterator wrapper: "
"addr=%p, muxer-msg-iter-addr=%p, msg-iter-addr=%p",
muxer_upstream_msg_iter, muxer_msg_iter,
self_msg_iter);
}
static
-bt_self_component_status add_available_input_port(
+bt_self_component_add_port_status add_available_input_port(
bt_self_component_filter *self_comp)
{
struct muxer_comp *muxer_comp = bt_self_component_get_data(
bt_self_component_filter_as_self_component(self_comp));
- bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK;
+ bt_self_component_add_port_status status =
+ BT_SELF_COMPONENT_ADD_PORT_STATUS_OK;
GString *port_name = NULL;
BT_ASSERT(muxer_comp);
port_name = g_string_new("in");
if (!port_name) {
- BT_LOGE_STR("Failed to allocate a GString.");
- status = BT_SELF_COMPONENT_STATUS_NOMEM;
+ BT_COMP_LOGE_STR("Failed to allocate a GString.");
+ status = BT_SELF_COMPONENT_ADD_PORT_STATUS_MEMORY_ERROR;
goto end;
}
g_string_append_printf(port_name, "%u", muxer_comp->next_port_num);
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: "
+ if (status != BT_SELF_COMPONENT_ADD_PORT_STATUS_OK) {
+ BT_COMP_LOGE("Cannot add input port to muxer component: "
"port-name=\"%s\", comp-addr=%p, status=%s",
port_name->str, self_comp,
- bt_self_component_status_string(status));
+ bt_common_func_status_string(status));
goto end;
}
muxer_comp->available_input_ports++;
muxer_comp->next_port_num++;
- BT_LOGI("Added one input port to muxer component: "
+ BT_COMP_LOGI("Added one input port to muxer component: "
"port-name=\"%s\", comp-addr=%p",
port_name->str, self_comp);
}
static
-bt_self_component_status create_output_port(
+bt_self_component_add_port_status create_output_port(
bt_self_component_filter *self_comp)
{
return bt_self_component_filter_add_output_port(
}
static
-bt_value *get_default_params(void)
+bt_value *get_default_params(struct muxer_comp *muxer_comp)
{
bt_value *params;
int ret;
params = bt_value_map_create();
if (!params) {
- BT_LOGE_STR("Cannot create a map value object.");
+ BT_COMP_LOGE_STR("Cannot create a map value object.");
goto error;
}
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.");
+ BT_COMP_LOGE_STR("Cannot add boolean value to map value object.");
goto error;
}
int ret = 0;
bt_bool bool_val;
- default_params = get_default_params();
+ default_params = get_default_params(muxer_comp);
if (!default_params) {
- BT_LOGE("Cannot get default parameters: "
+ BT_COMP_LOGE("Cannot get default parameters: "
"muxer-comp-addr=%p", muxer_comp);
goto error;
}
ret = bt_value_map_extend(default_params, params, &real_params);
if (ret) {
- BT_LOGE("Cannot extend default parameters map value: "
+ BT_COMP_LOGE("Cannot extend default parameters map value: "
"muxer-comp-addr=%p, def-params-addr=%p, "
"params-addr=%p", muxer_comp, default_params,
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: "
+ BT_COMP_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_common_value_type_string(
bool_val = bt_value_bool_get(assume_absolute_clock_classes);
muxer_comp->assume_absolute_clock_classes = (bool) bool_val;
- BT_LOGI("Configured muxer component: muxer-comp-addr=%p, "
+ BT_COMP_LOGI("Configured muxer component: muxer-comp-addr=%p, "
"assume-absolute-clock-classes=%d",
muxer_comp, muxer_comp->assume_absolute_clock_classes);
goto end;
}
BT_HIDDEN
-bt_self_component_status muxer_init(
- bt_self_component_filter *self_comp,
+bt_component_class_init_method_status muxer_init(
+ bt_self_component_filter *self_comp_flt,
const bt_value *params, void *init_data)
{
int ret;
- bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK;
+ bt_component_class_init_method_status status =
+ BT_COMPONENT_CLASS_INIT_METHOD_STATUS_OK;
+ bt_self_component_add_port_status add_port_status;
+ bt_self_component *self_comp =
+ bt_self_component_filter_as_self_component(self_comp_flt);
struct muxer_comp *muxer_comp = g_new0(struct muxer_comp, 1);
+ bt_logging_level log_level = bt_component_get_logging_level(
+ bt_self_component_as_component(self_comp));
- BT_LOGI("Initializing muxer component: "
+ BT_COMP_LOG_CUR_LVL(BT_LOG_INFO, log_level, self_comp,
+ "Initializing muxer component: "
"comp-addr=%p, params-addr=%p", self_comp, params);
if (!muxer_comp) {
- BT_LOGE_STR("Failed to allocate one muxer component.");
+ BT_COMP_LOG_CUR_LVL(BT_LOG_ERROR, log_level, self_comp,
+ "Failed to allocate one muxer component.");
goto error;
}
+ muxer_comp->log_level = log_level;
+ muxer_comp->self_comp = self_comp;
+ muxer_comp->self_comp_flt = self_comp_flt;
ret = configure_muxer_comp(muxer_comp, params);
if (ret) {
- BT_LOGE("Cannot configure muxer component: "
+ BT_COMP_LOGE("Cannot configure muxer component: "
"muxer-comp-addr=%p, params-addr=%p",
muxer_comp, params);
goto error;
}
- muxer_comp->self_comp = self_comp;
- bt_self_component_set_data(
- bt_self_component_filter_as_self_component(self_comp),
- muxer_comp);
- status = add_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: "
+ 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: "
"muxer-comp-addr=%p, status=%s",
muxer_comp,
- bt_self_component_status_string(status));
+ bt_common_func_status_string(add_port_status));
+ if (add_port_status ==
+ BT_SELF_COMPONENT_ADD_PORT_STATUS_MEMORY_ERROR) {
+ status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_MEMORY_ERROR;
+ } else {
+ status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_ERROR;
+ }
+
goto error;
}
- status = create_output_port(self_comp);
- if (status) {
- BT_LOGE("Cannot create muxer component's output port: "
+ 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: "
"muxer-comp-addr=%p, status=%s",
muxer_comp,
- bt_self_component_status_string(status));
+ bt_common_func_status_string(add_port_status));
+ if (add_port_status ==
+ BT_SELF_COMPONENT_ADD_PORT_STATUS_MEMORY_ERROR) {
+ status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_MEMORY_ERROR;
+ } else {
+ status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_ERROR;
+ }
+
goto error;
}
- BT_LOGI("Initialized muxer component: "
+ BT_COMP_LOGI("Initialized muxer component: "
"comp-addr=%p, params-addr=%p, muxer-comp-addr=%p",
self_comp, params, muxer_comp);
error:
destroy_muxer_comp(muxer_comp);
- bt_self_component_set_data(
- bt_self_component_filter_as_self_component(self_comp),
- NULL);
+ bt_self_component_set_data(self_comp, NULL);
- if (status == BT_SELF_COMPONENT_STATUS_OK) {
- status = BT_SELF_COMPONENT_STATUS_ERROR;
+ if (status == BT_COMPONENT_CLASS_INIT_METHOD_STATUS_OK) {
+ status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_ERROR;
}
end:
struct muxer_comp *muxer_comp = bt_self_component_get_data(
bt_self_component_filter_as_self_component(self_comp));
- BT_LOGI("Finalizing muxer component: comp-addr=%p",
+ BT_COMP_LOGI("Finalizing muxer component: comp-addr=%p",
self_comp);
destroy_muxer_comp(muxer_comp);
}
static
bt_self_component_port_input_message_iterator *
-create_msg_iter_on_input_port(bt_self_component_port_input *self_port)
+create_msg_iter_on_input_port(struct muxer_comp *muxer_comp,
+ bt_self_component_port_input *self_port)
{
const bt_port *port = bt_self_component_port_as_port(
bt_self_component_port_input_as_self_component_port(
msg_iter = bt_self_component_port_input_message_iterator_create(
self_port);
if (!msg_iter) {
- BT_LOGE("Cannot create upstream message iterator on input port: "
+ BT_COMP_LOGE("Cannot create upstream message iterator on input port: "
"port-addr=%p, port-name=\"%s\"",
port, bt_port_get_name(port));
goto end;
}
- BT_LOGI("Created upstream message iterator on input port: "
+ BT_COMP_LOGI("Created upstream message iterator on input port: "
"port-addr=%p, port-name=\"%s\", msg-iter-addr=%p",
port, bt_port_get_name(port), msg_iter);
}
static
-bt_self_message_iterator_status muxer_upstream_msg_iter_next(
+bt_component_class_message_iterator_next_method_status muxer_upstream_msg_iter_next(
struct muxer_upstream_msg_iter *muxer_upstream_msg_iter,
bool *is_ended)
{
- bt_self_message_iterator_status status;
- bt_message_iterator_status input_port_iter_status;
+ struct muxer_comp *muxer_comp =
+ muxer_upstream_msg_iter->muxer_comp;
+ bt_component_class_message_iterator_next_method_status status;
+ bt_message_iterator_next_status input_port_iter_status;
bt_message_array_const msgs;
uint64_t i;
uint64_t count;
- BT_LOGD("Calling upstream message iterator's \"next\" method: "
+ BT_COMP_LOGD("Calling upstream message iterator's \"next\" method: "
"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(
muxer_upstream_msg_iter->msg_iter, &msgs, &count);
- BT_LOGD("Upstream message iterator's \"next\" method returned: "
- "status=%s", bt_message_iterator_status_string(input_port_iter_status));
+ BT_COMP_LOGD("Upstream message iterator's \"next\" method returned: "
+ "status=%s",
+ bt_common_func_status_string(input_port_iter_status));
switch (input_port_iter_status) {
- case BT_MESSAGE_ITERATOR_STATUS_OK:
+ case BT_MESSAGE_ITERATOR_NEXT_STATUS_OK:
/*
* Message iterator's current message is
* valid: it must be considered for muxing operations.
*/
- BT_LOGD_STR("Validated upstream message iterator wrapper.");
+ BT_COMP_LOGD_STR("Validated upstream message iterator wrapper.");
BT_ASSERT(count > 0);
/* Move messages to our queue */
g_queue_push_tail(muxer_upstream_msg_iter->msgs,
(void *) msgs[i]);
}
- status = BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
+ status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK;
break;
- case BT_MESSAGE_ITERATOR_STATUS_AGAIN:
+ case BT_MESSAGE_ITERATOR_NEXT_STATUS_AGAIN:
/*
* Message iterator's current message is not
* valid anymore. Return
- * BT_MESSAGE_ITERATOR_STATUS_AGAIN immediately.
+ * BT_MESSAGE_ITERATOR_NEXT_STATUS_AGAIN immediately.
*/
- status = BT_SELF_MESSAGE_ITERATOR_STATUS_AGAIN;
+ status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_AGAIN;
break;
- case BT_MESSAGE_ITERATOR_STATUS_END: /* Fall-through. */
+ case BT_MESSAGE_ITERATOR_NEXT_STATUS_END: /* Fall-through. */
/*
* Message iterator reached the end: release it. It
* won't be considered again to find the youngest
* message.
*/
*is_ended = true;
- status = BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
+ status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK;
break;
default:
/* Error or unsupported status code */
- BT_LOGE("Error or unsupported status code: "
+ BT_COMP_LOGE("Error or unsupported status code: "
"status-code=%d", input_port_iter_status);
- status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
+ status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR;
break;
}
BT_ASSERT(msg);
BT_ASSERT(ts_ns);
- BT_LOGD("Getting message's timestamp: "
+ BT_COMP_LOGD("Getting message's timestamp: "
"muxer-msg-iter-addr=%p, msg-addr=%p, "
"last-returned-ts=%" PRId64,
muxer_msg_iter, msg, last_returned_ts_ns);
break;
default:
/* All the other messages have a higher priority */
- BT_LOGD_STR("Message has no timestamp: using the last returned timestamp.");
+ BT_COMP_LOGD_STR("Message has no timestamp: using the last returned timestamp.");
*ts_ns = last_returned_ts_ns;
goto end;
}
ret = bt_clock_snapshot_get_ns_from_origin(clock_snapshot, ts_ns);
if (ret) {
- BT_LOGE("Cannot get nanoseconds from Epoch of clock snapshot: "
+ BT_COMP_LOGE("Cannot get nanoseconds from Epoch of clock snapshot: "
"clock-snapshot-addr=%p", clock_snapshot);
goto error;
}
goto end;
no_clock_snapshot:
- BT_LOGD_STR("Message's default clock snapshot is missing: "
+ BT_COMP_LOGD_STR("Message's default clock snapshot is missing: "
"using the last returned timestamp.");
*ts_ns = last_returned_ts_ns;
goto end;
end:
if (ret == 0) {
- BT_LOGD("Found message's timestamp: "
+ BT_COMP_LOGD("Found message's timestamp: "
"muxer-msg-iter-addr=%p, msg-addr=%p, "
"last-returned-ts=%" PRId64 ", ts=%" PRId64,
muxer_msg_iter, msg, last_returned_ts_ns,
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_LOGE("Expecting an absolute clock class, "
+ BT_COMP_LOGE("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_LOGE("Expecting a non-absolute clock class with no UUID, "
+ BT_COMP_LOGE("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_LOGE("Expecting a non-absolute clock class with no UUID, "
+ BT_COMP_LOGE("Expecting a non-absolute clock class with no UUID, "
"but got one with a UUID: "
"clock-class-addr=%p, clock-class-name=\"%s\", "
"uuid=\"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\"",
break;
case MUXER_MSG_ITER_CLOCK_CLASS_EXPECTATION_NOT_ABS_SPEC_UUID:
if (bt_clock_class_origin_is_unix_epoch(clock_class)) {
- BT_LOGE("Expecting a non-absolute clock class with a specific UUID, "
+ BT_COMP_LOGE("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_LOGE("Expecting a non-absolute clock class with a specific UUID, "
+ BT_COMP_LOGE("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 (memcmp(muxer_msg_iter->expected_clock_class_uuid,
cc_uuid, BABELTRACE_UUID_LEN) != 0) {
- BT_LOGE("Expecting a non-absolute clock class with a specific UUID, "
+ BT_COMP_LOGE("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=\"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\", "
}
break;
case MUXER_MSG_ITER_CLOCK_CLASS_EXPECTATION_NONE:
- BT_LOGE("Expecting no clock class, but got one: "
+ BT_COMP_LOGE("Expecting no clock class, but got one: "
"clock-class-addr=%p, clock-class-name=\"%s\"",
clock_class, cc_name);
goto error;
default:
/* Unexpected */
- BT_LOGF("Unexpected clock class expectation: "
+ BT_COMP_LOGF("Unexpected clock class expectation: "
"expectation-code=%d",
muxer_msg_iter->clock_class_expectation);
abort();
muxer_msg_iter->clock_class_expectation =
MUXER_MSG_ITER_CLOCK_CLASS_EXPECTATION_NONE;
} else {
- BT_LOGE("Expecting stream class with a default clock class: "
+ BT_COMP_LOGE("Expecting stream class with 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_self_message_iterator_status
+bt_component_class_message_iterator_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_self_message_iterator_status status =
- BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
+ bt_component_class_message_iterator_next_method_status status =
+ BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK;
BT_ASSERT(muxer_comp);
BT_ASSERT(muxer_msg_iter);
if (!cur_muxer_upstream_msg_iter->msg_iter) {
/* This upstream message iterator is ended */
- BT_LOGV("Skipping ended upstream message iterator: "
+ BT_COMP_LOGT("Skipping ended upstream message iterator: "
"muxer-upstream-msg-iter-wrap-addr=%p",
cur_muxer_upstream_msg_iter);
continue;
* validate_new_stream_clock_class() logs
* errors.
*/
- status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
+ status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR;
goto end;
}
} else if (G_UNLIKELY(bt_message_get_type(msg) ==
bt_clock_snapshot_borrow_clock_class_const(cs));
if (ret) {
/* validate_clock_class() logs errors */
- status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
+ status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR;
goto end;
}
}
if (ret) {
/* get_msg_ts_ns() logs errors */
*muxer_upstream_msg_iter = NULL;
- status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
+ status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR;
goto end;
}
}
if (!*muxer_upstream_msg_iter) {
- status = BT_SELF_MESSAGE_ITERATOR_STATUS_END;
+ status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_END;
*ts_ns = INT64_MIN;
}
}
static
-bt_self_message_iterator_status validate_muxer_upstream_msg_iter(
+bt_component_class_message_iterator_next_method_status
+validate_muxer_upstream_msg_iter(
struct muxer_upstream_msg_iter *muxer_upstream_msg_iter,
bool *is_ended)
{
- bt_self_message_iterator_status status =
- BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
+ struct muxer_comp *muxer_comp =
+ muxer_upstream_msg_iter->muxer_comp;
+ bt_component_class_message_iterator_next_method_status status =
+ BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK;
- BT_LOGD("Validating muxer's upstream message iterator wrapper: "
+ 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 ||
!muxer_upstream_msg_iter->msg_iter) {
- BT_LOGD("Already valid or not considered: "
+ BT_COMP_LOGD("Already valid or not considered: "
"queue-len=%u, upstream-msg-iter-addr=%p",
muxer_upstream_msg_iter->msgs->length,
muxer_upstream_msg_iter->msg_iter);
}
static
-bt_self_message_iterator_status validate_muxer_upstream_msg_iters(
+bt_component_class_message_iterator_next_method_status
+validate_muxer_upstream_msg_iters(
struct muxer_msg_iter *muxer_msg_iter)
{
- bt_self_message_iterator_status status =
- BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
+ struct muxer_comp *muxer_comp = muxer_msg_iter->muxer_comp;
+ bt_component_class_message_iterator_next_method_status status =
+ BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK;
size_t i;
- BT_LOGD("Validating muxer's upstream message iterator wrappers: "
+ BT_COMP_LOGD("Validating muxer's upstream message iterator wrappers: "
"muxer-msg-iter-addr=%p", muxer_msg_iter);
for (i = 0; i < muxer_msg_iter->active_muxer_upstream_msg_iters->len;
status = validate_muxer_upstream_msg_iter(
muxer_upstream_msg_iter, &is_ended);
- if (status != BT_SELF_MESSAGE_ITERATOR_STATUS_OK) {
+ if (status != BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK) {
if (status < 0) {
- BT_LOGE("Cannot validate muxer's upstream message iterator wrapper: "
+ BT_COMP_LOGE("Cannot validate muxer's upstream message iterator wrapper: "
"muxer-msg-iter-addr=%p, "
"muxer-upstream-msg-iter-wrap-addr=%p",
muxer_msg_iter,
muxer_upstream_msg_iter);
} else {
- BT_LOGD("Cannot validate muxer's upstream message iterator wrapper: "
+ BT_COMP_LOGD("Cannot validate muxer's upstream message iterator wrapper: "
"muxer-msg-iter-addr=%p, "
"muxer-upstream-msg-iter-wrap-addr=%p",
muxer_msg_iter,
* array of ended iterators if it's ended.
*/
if (G_UNLIKELY(is_ended)) {
- BT_LOGD("Muxer's upstream message iterator wrapper: ended or canceled: "
+ BT_COMP_LOGD("Muxer's upstream message iterator wrapper: ended or canceled: "
"muxer-msg-iter-addr=%p, "
"muxer-upstream-msg-iter-wrap-addr=%p",
muxer_msg_iter, muxer_upstream_msg_iter);
}
static inline
-bt_self_message_iterator_status muxer_msg_iter_do_next_one(
+bt_component_class_message_iterator_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_self_message_iterator_status status;
+ bt_component_class_message_iterator_next_method_status status;
struct muxer_upstream_msg_iter *muxer_upstream_msg_iter = NULL;
int64_t next_return_ts;
status = validate_muxer_upstream_msg_iters(muxer_msg_iter);
- if (status != BT_SELF_MESSAGE_ITERATOR_STATUS_OK) {
+ if (status != BT_COMPONENT_CLASS_MESSAGE_ITERATOR_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_SELF_MESSAGE_ITERATOR_STATUS_END) {
+ if (status < 0 || status == BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_END) {
if (status < 0) {
- BT_LOGE("Cannot find the youngest upstream message iterator wrapper: "
+ BT_COMP_LOGE("Cannot find the youngest upstream message iterator wrapper: "
"status=%s",
- bt_common_self_message_iterator_status_string(status));
+ bt_common_func_status_string(status));
} else {
- BT_LOGD("Cannot find the youngest upstream message iterator wrapper: "
+ BT_COMP_LOGD("Cannot find the youngest upstream message iterator wrapper: "
"status=%s",
- bt_common_self_message_iterator_status_string(status));
+ bt_common_func_status_string(status));
}
goto end;
}
if (next_return_ts < muxer_msg_iter->last_returned_ts_ns) {
- BT_LOGE("Youngest upstream message iterator wrapper's timestamp is less than muxer's message iterator's last returned timestamp: "
+ BT_COMP_LOGE("Youngest upstream message iterator wrapper's timestamp is less than muxer's message iterator's last returned timestamp: "
"muxer-msg-iter-addr=%p, ts=%" PRId64 ", "
"last-returned-ts=%" PRId64,
muxer_msg_iter, next_return_ts,
muxer_msg_iter->last_returned_ts_ns);
- status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
+ status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR;
goto end;
}
- BT_LOGD("Found youngest upstream message iterator wrapper: "
+ BT_COMP_LOGD("Found youngest upstream message iterator wrapper: "
"muxer-msg-iter-addr=%p, "
"muxer-upstream-msg-iter-wrap-addr=%p, "
"ts=%" PRId64,
muxer_msg_iter, muxer_upstream_msg_iter, next_return_ts);
- BT_ASSERT(status == BT_SELF_MESSAGE_ITERATOR_STATUS_OK);
+ BT_ASSERT(status == BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK);
BT_ASSERT(muxer_upstream_msg_iter);
/*
}
static
-bt_self_message_iterator_status muxer_msg_iter_do_next(
+bt_component_class_message_iterator_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_self_message_iterator_status status =
- BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
+ bt_component_class_message_iterator_next_method_status status =
+ BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK;
uint64_t i = 0;
- while (i < capacity && status == BT_SELF_MESSAGE_ITERATOR_STATUS_OK) {
+ while (i < capacity && status == BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK) {
status = muxer_msg_iter_do_next_one(muxer_comp,
muxer_msg_iter, &msgs[i]);
- if (status == BT_SELF_MESSAGE_ITERATOR_STATUS_OK) {
+ if (status == BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK) {
i++;
}
}
* message, in which case we'll return it.
*/
*count = i;
- status = BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
+ status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK;
}
return status;
static
void destroy_muxer_msg_iter(struct muxer_msg_iter *muxer_msg_iter)
{
+ struct muxer_comp *muxer_comp;
+
if (!muxer_msg_iter) {
return;
}
- BT_LOGD("Destroying muxer component's message iterator: "
+ muxer_comp = muxer_msg_iter->muxer_comp;
+ BT_COMP_LOGD("Destroying muxer component's message iterator: "
"muxer-msg-iter-addr=%p", muxer_msg_iter);
if (muxer_msg_iter->active_muxer_upstream_msg_iters) {
- BT_LOGD_STR("Destroying muxer's active upstream message iterator wrappers.");
+ BT_COMP_LOGD_STR("Destroying muxer's active upstream message iterator wrappers.");
g_ptr_array_free(
muxer_msg_iter->active_muxer_upstream_msg_iters, TRUE);
}
if (muxer_msg_iter->ended_muxer_upstream_msg_iters) {
- BT_LOGD_STR("Destroying muxer's ended upstream message iterator wrappers.");
+ BT_COMP_LOGD_STR("Destroying muxer's ended upstream message iterator wrappers.");
g_ptr_array_free(
muxer_msg_iter->ended_muxer_upstream_msg_iters, TRUE);
}
count = bt_component_filter_get_input_port_count(
bt_self_component_filter_as_component_filter(
- muxer_comp->self_comp));
+ muxer_comp->self_comp_flt));
if (count < 0) {
- BT_LOGD("No input port to initialize for muxer component's message iterator: "
+ 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);
goto end;
bt_self_component_port_input_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, i);
+ muxer_comp->self_comp_flt, i);
const bt_port *port;
BT_ASSERT(self_port);
continue;
}
- upstream_msg_iter = create_msg_iter_on_input_port(self_port);
+ upstream_msg_iter = create_msg_iter_on_input_port(muxer_comp,
+ self_port);
if (!upstream_msg_iter) {
/* create_msg_iter_on_input_port() logs errors */
BT_ASSERT(!upstream_msg_iter);
}
BT_HIDDEN
-bt_self_message_iterator_status muxer_msg_iter_init(
+bt_component_class_message_iterator_init_method_status muxer_msg_iter_init(
bt_self_message_iterator *self_msg_iter,
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_self_message_iterator_status status =
- BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
+ bt_component_class_message_iterator_init_method_status status =
+ BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_OK;
int ret;
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 message iterator: "
+ BT_COMP_LOGD("Initializing muxer component's message iterator: "
"comp-addr=%p, muxer-comp-addr=%p, msg-iter-addr=%p",
self_comp, muxer_comp, self_msg_iter);
* creates a muxer message iterator while creating
* another muxer message iterator (same component).
*/
- BT_LOGE("Recursive initialization of muxer component's message iterator: "
+ BT_COMP_LOGE("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);
goto error;
muxer_comp->initializing_muxer_msg_iter = true;
muxer_msg_iter = g_new0(struct muxer_msg_iter, 1);
if (!muxer_msg_iter) {
- BT_LOGE_STR("Failed to allocate one muxer component's message iterator.");
+ BT_COMP_LOGE_STR("Failed to allocate one muxer component's message iterator.");
goto error;
}
+ muxer_msg_iter->muxer_comp = muxer_comp;
muxer_msg_iter->last_returned_ts_ns = INT64_MIN;
muxer_msg_iter->active_muxer_upstream_msg_iters =
g_ptr_array_new_with_free_func(
(GDestroyNotify) destroy_muxer_upstream_msg_iter);
if (!muxer_msg_iter->active_muxer_upstream_msg_iters) {
- BT_LOGE_STR("Failed to allocate a GPtrArray.");
+ BT_COMP_LOGE_STR("Failed to allocate a GPtrArray.");
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_LOGE_STR("Failed to allocate a GPtrArray.");
+ BT_COMP_LOGE_STR("Failed to allocate a GPtrArray.");
goto error;
}
ret = muxer_msg_iter_init_upstream_iterators(muxer_comp,
muxer_msg_iter);
if (ret) {
- BT_LOGE("Cannot initialize connected input ports for muxer component's message iterator: "
+ BT_COMP_LOGE("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_self_message_iterator_set_data(self_msg_iter, muxer_msg_iter);
- BT_LOGD("Initialized muxer component's message iterator: "
+ BT_COMP_LOGD("Initialized muxer component's message iterator: "
"comp-addr=%p, muxer-comp-addr=%p, muxer-msg-iter-addr=%p, "
"msg-iter-addr=%p",
self_comp, muxer_comp, muxer_msg_iter, self_msg_iter);
error:
destroy_muxer_msg_iter(muxer_msg_iter);
bt_self_message_iterator_set_data(self_msg_iter, NULL);
- status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
+ status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_STATUS_ERROR;
end:
muxer_comp->initializing_muxer_msg_iter = false;
self_msg_iter);
BT_ASSERT(self_comp);
muxer_comp = bt_self_component_get_data(self_comp);
- BT_LOGD("Finalizing muxer component's message iterator: "
+ BT_COMP_LOGD("Finalizing muxer component's message iterator: "
"comp-addr=%p, muxer-comp-addr=%p, muxer-msg-iter-addr=%p, "
"msg-iter-addr=%p",
self_comp, muxer_comp, muxer_msg_iter, self_msg_iter);
}
BT_HIDDEN
-bt_self_message_iterator_status muxer_msg_iter_next(
+bt_component_class_message_iterator_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_self_message_iterator_status status;
+ bt_component_class_message_iterator_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;
BT_ASSERT(self_comp);
muxer_comp = bt_self_component_get_data(self_comp);
BT_ASSERT(muxer_comp);
- BT_LOGV("Muxer component's message iterator's \"next\" method called: "
+ BT_COMP_LOGT("Muxer component's message iterator's \"next\" method called: "
"comp-addr=%p, muxer-comp-addr=%p, muxer-msg-iter-addr=%p, "
"msg-iter-addr=%p",
self_comp, muxer_comp, muxer_msg_iter, self_msg_iter);
status = muxer_msg_iter_do_next(muxer_comp, muxer_msg_iter,
msgs, capacity, count);
if (status < 0) {
- BT_LOGE("Cannot get next message: "
+ BT_COMP_LOGE("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,
- bt_common_self_message_iterator_status_string(status));
+ bt_common_func_status_string(status));
} else {
- BT_LOGV("Returning from muxer component's message iterator's \"next\" method: "
+ BT_COMP_LOGT("Returning from muxer component's message iterator's \"next\" method: "
"status=%s",
- bt_common_self_message_iterator_status_string(status));
+ bt_common_func_status_string(status));
}
return status;
}
BT_HIDDEN
-bt_self_component_status muxer_input_port_connected(
+bt_component_class_port_connected_method_status muxer_input_port_connected(
bt_self_component_filter *self_comp,
bt_self_component_port_input *self_port,
const bt_port_output *other_port)
{
- bt_self_component_status status;
+ bt_component_class_port_connected_method_status status =
+ BT_COMPONENT_CLASS_PORT_CONNECTED_METHOD_STATUS_OK;
+ bt_self_component_add_port_status add_port_status;
+ struct muxer_comp *muxer_comp = bt_self_component_get_data(
+ bt_self_component_filter_as_self_component(self_comp));
- status = add_available_input_port(self_comp);
- if (status) {
- /*
- * Only way to report an error later since this
- * method does not return anything.
- */
- BT_LOGE("Cannot add one muxer component's input port: "
+ 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_self_component_status_string(status));
+ bt_common_func_status_string(status));
+
+ if (add_port_status ==
+ BT_SELF_COMPONENT_ADD_PORT_STATUS_MEMORY_ERROR) {
+ status = BT_COMPONENT_CLASS_PORT_CONNECTED_METHOD_STATUS_MEMORY_ERROR;
+ } else {
+ status = BT_COMPONENT_CLASS_PORT_CONNECTED_METHOD_STATUS_ERROR;
+ }
+
goto end;
}
}
BT_HIDDEN
-bt_self_message_iterator_status muxer_msg_iter_seek_beginning(
+bt_component_class_message_iterator_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_message_iterator_status status = BT_MESSAGE_ITERATOR_STATUS_OK;
+ bt_component_class_message_iterator_seek_beginning_method_status status =
+ BT_COMPONENT_CLASS_MESSAGE_ITERATOR_SEEK_BEGINNING_METHOD_STATUS_OK;
+ bt_message_iterator_seek_beginning_status seek_beg_status;
uint64_t i;
/* Seek all ended upstream iterators first */
struct muxer_upstream_msg_iter *upstream_msg_iter =
muxer_msg_iter->ended_muxer_upstream_msg_iters->pdata[i];
- status = bt_self_component_port_input_message_iterator_seek_beginning(
+ seek_beg_status = bt_self_component_port_input_message_iterator_seek_beginning(
upstream_msg_iter->msg_iter);
- if (status != BT_MESSAGE_ITERATOR_STATUS_OK) {
+ if (seek_beg_status != BT_MESSAGE_ITERATOR_SEEK_BEGINNING_STATUS_OK) {
+ status = (int) seek_beg_status;
goto end;
}
struct muxer_upstream_msg_iter *upstream_msg_iter =
muxer_msg_iter->active_muxer_upstream_msg_iters->pdata[i];
- status = bt_self_component_port_input_message_iterator_seek_beginning(
+ seek_beg_status = bt_self_component_port_input_message_iterator_seek_beginning(
upstream_msg_iter->msg_iter);
- if (status != BT_MESSAGE_ITERATOR_STATUS_OK) {
+ if (seek_beg_status != BT_MESSAGE_ITERATOR_SEEK_BEGINNING_STATUS_OK) {
+ status = (int) seek_beg_status;
goto end;
}
MUXER_MSG_ITER_CLOCK_CLASS_EXPECTATION_ANY;
end:
- return (bt_self_message_iterator_status) status;
+ return status;
}
projects / babeltrace.git / blobdiff