X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=plugins%2Flttng-utils%2Fplugin.c;h=6654e76d68d6c129a03ed429058e7f49763b5b29;hb=d6e69534ef08a2dd8bff9eb5af1eab63736b3d31;hp=fbbdc6645bb1796e3abd878626c10599c8d61dbc;hpb=65300d60e4b4f167e5fc8f584677757ce09a3844;p=babeltrace.git diff --git a/plugins/lttng-utils/plugin.c b/plugins/lttng-utils/plugin.c index fbbdc664..6654e76d 100644 --- a/plugins/lttng-utils/plugin.c +++ b/plugins/lttng-utils/plugin.c @@ -54,9 +54,9 @@ void destroy_debug_info_data(struct debug_info_component *debug_info) } static -void destroy_debug_info_component(struct bt_private_component *component) +void destroy_debug_info_component(bt_self_component *component) { - void *data = bt_private_component_get_user_data(component); + void *data = bt_self_component_get_user_data(component); destroy_debug_info_data(data); } @@ -78,16 +78,16 @@ end: static void unref_trace(struct debug_info_trace *di_trace) { - bt_object_put_ref(di_trace->writer_trace); + bt_trace_put_ref(di_trace->writer_trace); g_free(di_trace); } static -void debug_info_iterator_destroy(struct bt_private_connection_private_notification_iterator *it) +void debug_info_iterator_destroy(bt_self_message_iterator *it) { struct debug_info_iterator *it_data; - it_data = bt_private_connection_private_notification_iterator_get_user_data(it); + it_data = bt_self_message_iterator_get_user_data(it); BT_ASSERT(it_data); if (it_data->input_iterator_group) { @@ -98,25 +98,25 @@ void debug_info_iterator_destroy(struct bt_private_connection_private_notificati empty_trace_map, it_data); g_hash_table_destroy(it_data->trace_map); - bt_object_put_ref(it_data->current_notification); + bt_message_put_ref(it_data->current_message); bt_object_put_ref(it_data->input_iterator); g_free(it_data); } static -struct bt_notification *handle_notification(FILE *err, +const bt_message *handle_message(FILE *err, struct debug_info_iterator *debug_it, - struct bt_notification *notification) + const bt_message *message) { - struct bt_notification *new_notification = NULL; + const bt_message *new_message = NULL; - switch (bt_notification_get_type(notification)) { - case BT_NOTIFICATION_TYPE_PACKET_BEGIN: + switch (bt_message_get_type(message)) { + case BT_MESSAGE_TYPE_PACKET_BEGINNING: { - struct bt_packet *packet = - bt_notification_packet_begin_get_packet(notification); - struct bt_packet *writer_packet; + const bt_packet *packet = + bt_message_packet_beginning_get_packet(message); + const bt_packet *writer_packet; if (!packet) { goto end; @@ -124,18 +124,18 @@ struct bt_notification *handle_notification(FILE *err, writer_packet = debug_info_new_packet(debug_it, packet); BT_ASSERT(writer_packet); - new_notification = bt_notification_packet_begin_create( + new_message = bt_message_packet_beginning_create( writer_packet); - BT_ASSERT(new_notification); - bt_object_put_ref(packet); - bt_object_put_ref(writer_packet); + BT_ASSERT(new_message); + bt_packet_put_ref(packet); + bt_packet_put_ref(writer_packet); break; } - case BT_NOTIFICATION_TYPE_PACKET_END: + case BT_MESSAGE_TYPE_PACKET_END: { - struct bt_packet *packet = - bt_notification_packet_end_get_packet(notification); - struct bt_packet *writer_packet; + const bt_packet *packet = + bt_message_packet_end_get_packet(message); + const bt_packet *writer_packet; if (!packet) { goto end; @@ -143,40 +143,40 @@ struct bt_notification *handle_notification(FILE *err, writer_packet = debug_info_close_packet(debug_it, packet); BT_ASSERT(writer_packet); - new_notification = bt_notification_packet_end_create( + new_message = bt_message_packet_end_create( writer_packet); - BT_ASSERT(new_notification); - bt_object_put_ref(packet); - bt_object_put_ref(writer_packet); + BT_ASSERT(new_message); + bt_packet_put_ref(packet); + bt_packet_put_ref(writer_packet); break; } - case BT_NOTIFICATION_TYPE_EVENT: + case BT_MESSAGE_TYPE_EVENT: { - struct bt_event *event = bt_notification_event_get_event( - notification); - struct bt_event *writer_event; - struct bt_clock_class_priority_map *cc_prio_map = - bt_notification_event_get_clock_class_priority_map( - notification); + const bt_event *event = bt_message_event_get_event( + message); + const bt_event *writer_event; + bt_clock_class_priority_map *cc_prio_map = + bt_message_event_get_clock_class_priority_map( + message); if (!event) { goto end; } writer_event = debug_info_output_event(debug_it, event); BT_ASSERT(writer_event); - new_notification = bt_notification_event_create(writer_event, + new_message = bt_message_event_create(writer_event, cc_prio_map); bt_object_put_ref(cc_prio_map); - BT_ASSERT(new_notification); + BT_ASSERT(new_message); bt_object_put_ref(event); bt_object_put_ref(writer_event); break; } - case BT_NOTIFICATION_TYPE_STREAM_BEGIN: + case BT_MESSAGE_TYPE_STREAM_BEGINNING: { - struct bt_stream *stream = - bt_notification_stream_begin_get_stream(notification); - struct bt_stream *writer_stream; + const bt_stream *stream = + bt_message_stream_beginning_get_stream(message); + const bt_stream *writer_stream; if (!stream) { goto end; @@ -184,18 +184,18 @@ struct bt_notification *handle_notification(FILE *err, writer_stream = debug_info_stream_begin(debug_it, stream); BT_ASSERT(writer_stream); - new_notification = bt_notification_stream_begin_create( + new_message = bt_message_stream_beginning_create( writer_stream); - BT_ASSERT(new_notification); - bt_object_put_ref(stream); - bt_object_put_ref(writer_stream); + BT_ASSERT(new_message); + bt_stream_put_ref(stream); + bt_stream_put_ref(writer_stream); break; } - case BT_NOTIFICATION_TYPE_STREAM_END: + case BT_MESSAGE_TYPE_STREAM_END: { - struct bt_stream *stream = - bt_notification_stream_end_get_stream(notification); - struct bt_stream *writer_stream; + const bt_stream *stream = + bt_message_stream_end_get_stream(message); + const bt_stream *writer_stream; if (!stream) { goto end; @@ -203,62 +203,62 @@ struct bt_notification *handle_notification(FILE *err, writer_stream = debug_info_stream_end(debug_it, stream); BT_ASSERT(writer_stream); - new_notification = bt_notification_stream_end_create( + new_message = bt_message_stream_end_create( writer_stream); - BT_ASSERT(new_notification); - bt_object_put_ref(stream); - bt_object_put_ref(writer_stream); + BT_ASSERT(new_message); + bt_stream_put_ref(stream); + bt_stream_put_ref(writer_stream); break; } default: - new_notification = bt_object_get_ref(notification); + new_message = bt_message_get_ref(message); break; } end: - return new_notification; + return new_message; } static -struct bt_notification_iterator_next_method_return debug_info_iterator_next( - struct bt_private_connection_private_notification_iterator *iterator) +bt_message_iterator_next_method_return debug_info_iterator_next( + bt_self_message_iterator *iterator) { struct debug_info_iterator *debug_it = NULL; - struct bt_private_component *component = NULL; + bt_self_component *component = NULL; struct debug_info_component *debug_info = NULL; - struct bt_notification_iterator *source_it = NULL; - struct bt_notification *notification; - struct bt_notification_iterator_next_method_return ret = { - .status = BT_NOTIFICATION_ITERATOR_STATUS_OK, - .notification = NULL, + bt_message_iterator *source_it = NULL; + const bt_message *message; + bt_message_iterator_next_method_return ret = { + .status = BT_MESSAGE_ITERATOR_STATUS_OK, + .message = NULL, }; - debug_it = bt_private_connection_private_notification_iterator_get_user_data(iterator); + debug_it = bt_self_message_iterator_get_user_data(iterator); BT_ASSERT(debug_it); - component = bt_private_connection_private_notification_iterator_get_private_component(iterator); + component = bt_self_message_iterator_get_private_component(iterator); BT_ASSERT(component); - debug_info = bt_private_component_get_user_data(component); + debug_info = bt_self_component_get_user_data(component); BT_ASSERT(debug_info); source_it = debug_it->input_iterator; - ret.status = bt_notification_iterator_next(source_it); - if (ret.status != BT_NOTIFICATION_ITERATOR_STATUS_OK) { + ret.status = bt_message_iterator_next(source_it); + if (ret.status != BT_MESSAGE_ITERATOR_STATUS_OK) { goto end; } - notification = bt_notification_iterator_get_notification( + message = bt_message_iterator_get_message( source_it); - if (!notification) { - ret.status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR; + if (!message) { + ret.status = BT_MESSAGE_ITERATOR_STATUS_ERROR; goto end; } - ret.notification = handle_notification(debug_info->err, debug_it, - notification); - BT_ASSERT(ret.notification); - bt_object_put_ref(notification); + ret.message = handle_message(debug_info->err, debug_it, + message); + BT_ASSERT(ret.message); + bt_message_put_ref(message); end: bt_object_put_ref(component); @@ -266,53 +266,53 @@ end: } static -enum bt_notification_iterator_status debug_info_iterator_init( - struct bt_private_connection_private_notification_iterator *iterator, +enum bt_message_iterator_status debug_info_iterator_init( + bt_self_message_iterator *iterator, struct bt_private_port *port) { - enum bt_notification_iterator_status ret = - BT_NOTIFICATION_ITERATOR_STATUS_OK; - enum bt_notification_iterator_status it_ret; + enum bt_message_iterator_status ret = + BT_MESSAGE_ITERATOR_STATUS_OK; + enum bt_message_iterator_status it_ret; enum bt_connection_status conn_status; struct bt_private_connection *connection = NULL; - struct bt_private_component *component = - bt_private_connection_private_notification_iterator_get_private_component(iterator); + bt_self_component *component = + bt_self_message_iterator_get_private_component(iterator); struct debug_info_iterator *it_data = g_new0(struct debug_info_iterator, 1); struct bt_private_port *input_port; if (!it_data) { - ret = BT_NOTIFICATION_ITERATOR_STATUS_NOMEM; + ret = BT_MESSAGE_ITERATOR_STATUS_NOMEM; goto end; } - input_port = bt_private_component_filter_get_input_private_port_by_name( + input_port = bt_self_component_filter_get_input_port_by_name( component, "in"); if (!input_port) { - ret = BT_NOTIFICATION_ITERATOR_STATUS_ERROR; + ret = BT_MESSAGE_ITERATOR_STATUS_ERROR; goto end; } - connection = bt_private_port_get_private_connection(input_port); + connection = bt_private_port_get_connection(input_port); bt_object_put_ref(input_port); if (!connection) { - ret = BT_NOTIFICATION_ITERATOR_STATUS_ERROR; + ret = BT_MESSAGE_ITERATOR_STATUS_ERROR; goto end; } - conn_status = bt_private_connection_create_notification_iterator( + conn_status = bt_private_connection_create_message_iterator( connection, &it_data->input_iterator); if (conn_status != BT_CONNECTION_STATUS_OK) { - ret = BT_NOTIFICATION_ITERATOR_STATUS_ERROR; + ret = BT_MESSAGE_ITERATOR_STATUS_ERROR; goto end; } it_data->debug_info_component = (struct debug_info_component *) - bt_private_component_get_user_data(component); + bt_self_component_get_user_data(component); it_data->err = it_data->debug_info_component->err; it_data->trace_map = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, (GDestroyNotify) unref_trace); - it_ret = bt_private_connection_private_notification_iterator_set_user_data(iterator, it_data); + it_ret = bt_self_message_iterator_set_user_data(iterator, it_data); if (it_ret) { goto end; } @@ -326,9 +326,9 @@ end: static enum bt_component_status init_from_params( struct debug_info_component *debug_info_component, - struct bt_value *params) + bt_value *params) { - struct bt_value *value = NULL; + bt_value *value = NULL; enum bt_component_status ret = BT_COMPONENT_STATUS_OK; BT_ASSERT(params); @@ -338,14 +338,9 @@ enum bt_component_status init_from_params( enum bt_value_status value_ret; const char *tmp; - value_ret = bt_value_string_get(value, &tmp); - if (value_ret) { - ret = BT_COMPONENT_STATUS_INVALID; - BT_LOGE_STR("Failed to retrieve debug-info-field-name value. " - "Expecting a string."); - } + tmp = bt_value_string_get(value); strcpy(debug_info_component->arg_debug_info_field_name, tmp); - bt_object_put_ref(value); + bt_value_put_ref(value); } else { debug_info_component->arg_debug_info_field_name = malloc(strlen("debug_info") + 1); @@ -365,15 +360,9 @@ enum bt_component_status init_from_params( if (value) { enum bt_value_status value_ret; - value_ret = bt_value_string_get(value, - &debug_info_component->arg_debug_dir); - if (value_ret) { - ret = BT_COMPONENT_STATUS_INVALID; - BT_LOGE_STR("Failed to retrieve debug-info-dir value. " - "Expecting a string."); - } + debug_info_component->arg_debug_dir = bt_value_string_get(value); } - bt_object_put_ref(value); + bt_value_put_ref(value); if (ret != BT_COMPONENT_STATUS_OK) { goto end; } @@ -382,15 +371,9 @@ enum bt_component_status init_from_params( if (value) { enum bt_value_status value_ret; - value_ret = bt_value_string_get(value, - &debug_info_component->arg_target_prefix); - if (value_ret) { - ret = BT_COMPONENT_STATUS_INVALID; - BT_LOGE_STR("Failed to retrieve target-prefix value. " - "Expecting a string."); - } + debug_info_component->arg_target_prefix = bt_value_string_get(value); } - bt_object_put_ref(value); + bt_value_put_ref(value); if (ret != BT_COMPONENT_STATUS_OK) { goto end; } @@ -400,17 +383,11 @@ enum bt_component_status init_from_params( enum bt_value_status value_ret; bt_bool bool_val; - value_ret = bt_value_bool_get(value, - &bool_val); - if (value_ret) { - ret = BT_COMPONENT_STATUS_INVALID; - BT_LOGE_STR("Failed to retrieve full-path value. " - "Expecting a boolean."); - } + bool_val = bt_value_bool_get(value); debug_info_component->arg_full_path = bool_val; } - bt_object_put_ref(value); + bt_value_put_ref(value); if (ret != BT_COMPONENT_STATUS_OK) { goto end; } @@ -420,7 +397,7 @@ end: } enum bt_component_status debug_info_component_init( - struct bt_private_component *component, struct bt_value *params, + bt_self_component *component, bt_value *params, UNUSED_VAR void *init_method_data) { enum bt_component_status ret; @@ -431,18 +408,18 @@ enum bt_component_status debug_info_component_init( goto end; } - ret = bt_private_component_set_user_data(component, debug_info); + ret = bt_self_component_set_user_data(component, debug_info); if (ret != BT_COMPONENT_STATUS_OK) { goto error; } - ret = bt_private_component_filter_add_input_private_port( + ret = bt_self_component_filter_add_input_port( component, "in", NULL, NULL); if (ret != BT_COMPONENT_STATUS_OK) { goto end; } - ret = bt_private_component_filter_add_output_private_port( + ret = bt_self_component_filter_add_output_port( component, "out", NULL, NULL); if (ret != BT_COMPONENT_STATUS_OK) { goto end; @@ -474,7 +451,7 @@ BT_PLUGIN_FILTER_COMPONENT_CLASS_INIT_METHOD_WITH_ID(lttng_utils, debug_info, debug_info_component_init); BT_PLUGIN_FILTER_COMPONENT_CLASS_FINALIZE_METHOD_WITH_ID(lttng_utils, debug_info, destroy_debug_info_component); -BT_PLUGIN_FILTER_COMPONENT_CLASS_NOTIFICATION_ITERATOR_INIT_METHOD_WITH_ID( +BT_PLUGIN_FILTER_COMPONENT_CLASS_MESSAGE_ITERATOR_INIT_METHOD_WITH_ID( lttng_utils, debug_info, debug_info_iterator_init); -BT_PLUGIN_FILTER_COMPONENT_CLASS_NOTIFICATION_ITERATOR_FINALIZE_METHOD_WITH_ID( +BT_PLUGIN_FILTER_COMPONENT_CLASS_MESSAGE_ITERATOR_FINALIZE_METHOD_WITH_ID( lttng_utils, debug_info, debug_info_iterator_destroy);