#define BT_COMP_LOG_SELF_COMP (details_comp->self_comp)
#define BT_LOG_OUTPUT_LEVEL (details_comp->log_level)
#define BT_LOG_TAG "PLUGIN/SINK.TEXT.DETAILS"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
#include <babeltrace2/babeltrace.h>
const char * const with_metadata_param_name = "with-metadata";
static
-const char * const with_time_param_name = "with-time";
+const char * const with_data_param_name = "with-data";
static
-const char * const with_trace_class_name_param_name = "with-trace-class-name";
+const char * const with_time_param_name = "with-time";
static
const char * const with_trace_name_param_name = "with-trace-name";
if (details_tc_meta->tc_destruction_listener_id !=
UINT64_C(-1)) {
- bt_trace_class_remove_destruction_listener(
- (const void *) key,
- details_tc_meta->tc_destruction_listener_id);
+ if (bt_trace_class_remove_destruction_listener(
+ (const void *) key,
+ details_tc_meta->tc_destruction_listener_id)) {
+ bt_current_thread_clear_error();
+ }
}
}
while (g_hash_table_iter_next(&iter, &key, &value)) {
struct details_trace *details_trace = value;
- bt_trace_remove_destruction_listener(
- (const void *) key,
- details_trace->trace_destruction_listener_id);
+ if (bt_trace_remove_destruction_listener(
+ (const void *) key,
+ details_trace->trace_destruction_listener_id)) {
+ bt_current_thread_clear_error();
+ }
}
g_hash_table_destroy(details_comp->traces);
goto error;
}
+ /* With data objects? */
+ ret = configure_bool_opt(details_comp, params, with_data_param_name,
+ true, &details_comp->cfg.with_data);
+ if (ret) {
+ goto error;
+ }
+
/* Compact? */
ret = configure_bool_opt(details_comp, params, compact_param_name,
false, &details_comp->cfg.compact);
goto error;
}
- /* With trace class name? */
- ret = configure_bool_opt(details_comp, params,
- with_trace_class_name_param_name,
- true, &details_comp->cfg.with_trace_class_name);
- if (ret) {
- goto error;
- }
-
/* With trace name? */
ret = configure_bool_opt(details_comp, params,
with_trace_name_param_name,
BT_COMP_LOGI(" Compact: %d", details_comp->cfg.compact);
BT_COMP_LOGI(" With metadata: %d", details_comp->cfg.with_meta);
BT_COMP_LOGI(" With time: %d", details_comp->cfg.with_time);
- BT_COMP_LOGI(" With trace class name: %d",
- details_comp->cfg.with_trace_class_name);
BT_COMP_LOGI(" With trace name: %d", details_comp->cfg.with_trace_name);
BT_COMP_LOGI(" With stream class name: %d",
details_comp->cfg.with_stream_class_name);
}
BT_HIDDEN
-bt_component_class_init_method_status details_init(bt_self_component_sink *comp,
+bt_component_class_initialize_method_status details_init(
+ bt_self_component_sink *comp,
+ bt_self_component_sink_configuration *config,
const bt_value *params,
__attribute__((unused)) void *init_method_data)
{
- bt_component_class_init_method_status status =
- BT_COMPONENT_CLASS_INIT_METHOD_STATUS_OK;
+ bt_component_class_initialize_method_status status =
+ BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK;
bt_self_component_add_port_status add_port_status;
struct details_comp *details_comp = NULL;
in_port_name, NULL, NULL);
switch (add_port_status) {
case BT_SELF_COMPONENT_ADD_PORT_STATUS_OK:
- status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_OK;
+ status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK;
break;
case BT_SELF_COMPONENT_ADD_PORT_STATUS_ERROR:
- status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_ERROR;
+ status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_ERROR;
break;
case BT_SELF_COMPONENT_ADD_PORT_STATUS_MEMORY_ERROR:
- status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_MEMORY_ERROR;
+ status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
break;
default:
abort();
details_comp = create_details_comp(comp);
if (!details_comp) {
- status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_MEMORY_ERROR;
+ status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_MEMORY_ERROR;
goto error;
}
goto end;
error:
- if (status == BT_COMPONENT_CLASS_INIT_METHOD_STATUS_OK) {
- status = BT_COMPONENT_CLASS_INIT_METHOD_STATUS_ERROR;
+ if (status == BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK) {
+ status = BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_ERROR;
}
destroy_details_comp(details_comp);
bt_component_class_sink_graph_is_configured_method_status
details_graph_is_configured(bt_self_component_sink *comp)
{
- bt_component_class_sink_graph_is_configured_method_status status =
- BT_COMPONENT_CLASS_SINK_GRAPH_IS_CONFIGURED_METHOD_STATUS_OK;
+ bt_component_class_sink_graph_is_configured_method_status status;
+ bt_self_component_port_input_message_iterator_create_from_sink_component_status
+ msg_iter_status;
bt_self_component_port_input_message_iterator *iterator;
struct details_comp *details_comp;
bt_self_component_port_input *in_port;
goto end;
}
- iterator = bt_self_component_port_input_message_iterator_create(
- bt_self_component_sink_borrow_input_port_by_name(comp,
- in_port_name));
- if (!iterator) {
- status = BT_COMPONENT_CLASS_SINK_GRAPH_IS_CONFIGURED_METHOD_STATUS_MEMORY_ERROR;
+ msg_iter_status = bt_self_component_port_input_message_iterator_create_from_sink_component(
+ comp, bt_self_component_sink_borrow_input_port_by_name(comp,
+ in_port_name), &iterator);
+ if (msg_iter_status != BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_CREATE_FROM_SINK_COMPONENT_STATUS_OK) {
+ status = (int) msg_iter_status;
goto end;
}
BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_MOVE_REF(
details_comp->msg_iter, iterator);
+ status = BT_COMPONENT_CLASS_SINK_GRAPH_IS_CONFIGURED_METHOD_STATUS_OK;
+
end:
return status;
}