X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fplugin%2Fplugin-so.c;h=ec69646f99fd38f3bb4c4bc20472698aa0aebe18;hb=3fadfbc0c91f82c46bd36e6e0657ea93570c9db1;hp=9208dc535bb967b60661c000d868e2b5648f6799;hpb=707b7d3548cc010d582f7faed43630aed26508fd;p=babeltrace.git diff --git a/lib/plugin/plugin-so.c b/lib/plugin/plugin-so.c index 9208dc53..ec69646f 100644 --- a/lib/plugin/plugin-so.c +++ b/lib/plugin/plugin-so.c @@ -1,6 +1,6 @@ /* + * Copyright 2017-2018 Philippe Proulx * Copyright 2016 Jérémie Galarneau - * Copyright 2017 Philippe Proulx * * Author: Jérémie Galarneau * @@ -24,22 +24,22 @@ */ #define BT_LOG_TAG "PLUGIN-SO" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -71,7 +71,7 @@ BT_PLUGIN_MODULE(); * * It allows this use-case: * - * my_plugins = bt_plugin_create_all_from_file("/path/to/my-plugin.so"); + * my_plugins = bt_plugin_find_all_from_file("/path/to/my-plugin.so"); * // instantiate components from a plugin's component classes * // put plugins and free my_plugins here * // user code of instantiated components still exists @@ -102,6 +102,21 @@ void fini_comp_class_list(void) BT_LOGD_STR("Released references from all component classes to shared library handles."); } +static inline +const char *bt_self_plugin_status_string(enum bt_self_plugin_status status) +{ + switch (status) { + case BT_SELF_PLUGIN_STATUS_OK: + return "BT_SELF_PLUGIN_STATUS_OK"; + case BT_SELF_PLUGIN_STATUS_ERROR: + return "BT_SELF_PLUGIN_STATUS_ERROR"; + case BT_SELF_PLUGIN_STATUS_NOMEM: + return "BT_SELF_PLUGIN_STATUS_NOMEM"; + default: + return "(unknown)"; + } +} + static void bt_plugin_so_shared_lib_handle_destroy(struct bt_object *obj) { @@ -117,17 +132,9 @@ void bt_plugin_so_shared_lib_handle_destroy(struct bt_object *obj) shared_lib_handle, path); if (shared_lib_handle->init_called && shared_lib_handle->exit) { - enum bt_plugin_status status; - BT_LOGD_STR("Calling user's plugin exit function."); - status = shared_lib_handle->exit(); - BT_LOGD("User function returned: %s", - bt_plugin_status_string(status)); - - if (status < 0) { - BT_LOGW("User's plugin exit function failed: " - "path=\"%s\"", path); - } + shared_lib_handle->exit(); + BT_LOGD_STR("User function returned."); } if (shared_lib_handle->module) { @@ -198,7 +205,7 @@ struct bt_plugin_so_shared_lib_handle *bt_plugin_so_shared_lib_handle_create( * DEBUG-level logging because we're only _trying_ to * open this file as a Babeltrace plugin: if it's not, * it's not an error. And because this can be tried - * during bt_plugin_create_all_from_dir(), it's not even + * during bt_plugin_find_all_from_dir(), it's not even * a warning. */ BT_LOGD("Cannot open GModule: %s: path=\"%s\"", @@ -285,37 +292,42 @@ enum bt_plugin_status bt_plugin_so_init( union { struct { - bt_private_component_class_source_init_method init; - bt_private_component_class_source_finalize_method finalize; - bt_private_component_class_source_query_method query; - bt_private_component_class_source_accept_output_port_connection_method accept_output_port_connection; - bt_private_component_class_source_output_port_connected_method output_port_connected; - bt_private_component_class_source_output_port_disconnected_method output_port_disconnected; - bt_private_component_class_source_notification_iterator_init_method notif_iter_init; - bt_private_component_class_source_notification_iterator_finalize_method notif_iter_finalize; + bt_component_class_source_init_method init; + bt_component_class_source_finalize_method finalize; + bt_component_class_source_query_method query; + bt_component_class_source_accept_output_port_connection_method accept_output_port_connection; + bt_component_class_source_output_port_connected_method output_port_connected; + bt_component_class_source_message_iterator_init_method msg_iter_init; + bt_component_class_source_message_iterator_finalize_method msg_iter_finalize; + bt_component_class_source_message_iterator_seek_ns_from_origin_method msg_iter_seek_ns_from_origin; + bt_component_class_source_message_iterator_seek_beginning_method msg_iter_seek_beginning; + bt_component_class_source_message_iterator_can_seek_ns_from_origin_method msg_iter_can_seek_ns_from_origin; + bt_component_class_source_message_iterator_can_seek_beginning_method msg_iter_can_seek_beginning; } source; struct { - bt_private_component_class_filter_init_method init; - bt_private_component_class_filter_finalize_method finalize; - bt_private_component_class_filter_query_method query; - bt_private_component_class_filter_accept_input_port_connection_method accept_input_port_connection; - bt_private_component_class_filter_accept_output_port_connection_method accept_output_port_connection; - bt_private_component_class_filter_input_port_connected_method input_port_connected; - bt_private_component_class_filter_output_port_connected_method output_port_connected; - bt_private_component_class_filter_input_port_disconnected_method input_port_disconnected; - bt_private_component_class_filter_output_port_disconnected_method output_port_disconnected; - bt_private_component_class_filter_notification_iterator_init_method notif_iter_init; - bt_private_component_class_filter_notification_iterator_finalize_method notif_iter_finalize; + bt_component_class_filter_init_method init; + bt_component_class_filter_finalize_method finalize; + bt_component_class_filter_query_method query; + bt_component_class_filter_accept_input_port_connection_method accept_input_port_connection; + bt_component_class_filter_accept_output_port_connection_method accept_output_port_connection; + bt_component_class_filter_input_port_connected_method input_port_connected; + bt_component_class_filter_output_port_connected_method output_port_connected; + bt_component_class_filter_message_iterator_init_method msg_iter_init; + bt_component_class_filter_message_iterator_finalize_method msg_iter_finalize; + bt_component_class_filter_message_iterator_seek_ns_from_origin_method msg_iter_seek_ns_from_origin; + bt_component_class_filter_message_iterator_seek_beginning_method msg_iter_seek_beginning; + bt_component_class_filter_message_iterator_can_seek_ns_from_origin_method msg_iter_can_seek_ns_from_origin; + bt_component_class_filter_message_iterator_can_seek_beginning_method msg_iter_can_seek_beginning; } filter; struct { - bt_private_component_class_sink_init_method init; - bt_private_component_class_sink_finalize_method finalize; - bt_private_component_class_sink_query_method query; - bt_private_component_class_sink_accept_input_port_connection_method accept_input_port_connection; - bt_private_component_class_sink_input_port_connected_method input_port_connected; - bt_private_component_class_sink_input_port_disconnected_method input_port_disconnected; + bt_component_class_sink_init_method init; + bt_component_class_sink_finalize_method finalize; + bt_component_class_sink_query_method query; + bt_component_class_sink_accept_input_port_connection_method accept_input_port_connection; + bt_component_class_sink_input_port_connected_method input_port_connected; + bt_component_class_sink_graph_is_configured_method graph_is_configured; } sink; } methods; }; @@ -585,57 +597,95 @@ enum bt_plugin_status bt_plugin_so_init( abort(); } break; - case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_INPUT_PORT_DISCONNECTED_METHOD: + case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_GRAPH_IS_CONFIGURED_METHOD: switch (cc_type) { + case BT_COMPONENT_CLASS_TYPE_SINK: + cc_full_descr->methods.sink.graph_is_configured = + cur_cc_descr_attr->value.sink_graph_is_configured_method; + break; + default: + abort(); + } + break; + case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_MSG_ITER_INIT_METHOD: + switch (cc_type) { + case BT_COMPONENT_CLASS_TYPE_SOURCE: + cc_full_descr->methods.source.msg_iter_init = + cur_cc_descr_attr->value.source_msg_iter_init_method; + break; case BT_COMPONENT_CLASS_TYPE_FILTER: - cc_full_descr->methods.filter.input_port_disconnected = - cur_cc_descr_attr->value.filter_input_port_disconnected_method; + cc_full_descr->methods.filter.msg_iter_init = + cur_cc_descr_attr->value.filter_msg_iter_init_method; break; - case BT_COMPONENT_CLASS_TYPE_SINK: - cc_full_descr->methods.sink.input_port_disconnected = - cur_cc_descr_attr->value.sink_input_port_disconnected_method; + default: + abort(); + } + break; + case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_MSG_ITER_FINALIZE_METHOD: + switch (cc_type) { + case BT_COMPONENT_CLASS_TYPE_SOURCE: + cc_full_descr->methods.source.msg_iter_finalize = + cur_cc_descr_attr->value.source_msg_iter_finalize_method; + break; + case BT_COMPONENT_CLASS_TYPE_FILTER: + cc_full_descr->methods.filter.msg_iter_finalize = + cur_cc_descr_attr->value.filter_msg_iter_finalize_method; + break; + default: + abort(); + } + break; + case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_MSG_ITER_SEEK_NS_FROM_ORIGIN_METHOD: + switch (cc_type) { + case BT_COMPONENT_CLASS_TYPE_SOURCE: + cc_full_descr->methods.source.msg_iter_seek_ns_from_origin = + cur_cc_descr_attr->value.source_msg_iter_seek_ns_from_origin_method; + break; + case BT_COMPONENT_CLASS_TYPE_FILTER: + cc_full_descr->methods.filter.msg_iter_seek_ns_from_origin = + cur_cc_descr_attr->value.filter_msg_iter_seek_ns_from_origin_method; break; default: abort(); } break; - case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_OUTPUT_PORT_DISCONNECTED_METHOD: + case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_MSG_ITER_SEEK_BEGINNING_METHOD: switch (cc_type) { case BT_COMPONENT_CLASS_TYPE_SOURCE: - cc_full_descr->methods.source.output_port_disconnected = - cur_cc_descr_attr->value.source_output_port_disconnected_method; + cc_full_descr->methods.source.msg_iter_seek_beginning = + cur_cc_descr_attr->value.source_msg_iter_seek_beginning_method; break; case BT_COMPONENT_CLASS_TYPE_FILTER: - cc_full_descr->methods.filter.output_port_disconnected = - cur_cc_descr_attr->value.filter_output_port_disconnected_method; + cc_full_descr->methods.filter.msg_iter_seek_beginning = + cur_cc_descr_attr->value.filter_msg_iter_seek_beginning_method; break; default: abort(); } break; - case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_NOTIF_ITER_INIT_METHOD: + case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_MSG_ITER_CAN_SEEK_NS_FROM_ORIGIN_METHOD: switch (cc_type) { case BT_COMPONENT_CLASS_TYPE_SOURCE: - cc_full_descr->methods.source.notif_iter_init = - cur_cc_descr_attr->value.source_notif_iter_init_method; + cc_full_descr->methods.source.msg_iter_can_seek_ns_from_origin = + cur_cc_descr_attr->value.source_msg_iter_can_seek_ns_from_origin_method; break; case BT_COMPONENT_CLASS_TYPE_FILTER: - cc_full_descr->methods.filter.notif_iter_init = - cur_cc_descr_attr->value.filter_notif_iter_init_method; + cc_full_descr->methods.filter.msg_iter_can_seek_ns_from_origin = + cur_cc_descr_attr->value.filter_msg_iter_can_seek_ns_from_origin_method; break; default: abort(); } break; - case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_NOTIF_ITER_FINALIZE_METHOD: + case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_MSG_ITER_CAN_SEEK_BEGINNING_METHOD: switch (cc_type) { case BT_COMPONENT_CLASS_TYPE_SOURCE: - cc_full_descr->methods.source.notif_iter_finalize = - cur_cc_descr_attr->value.source_notif_iter_finalize_method; + cc_full_descr->methods.source.msg_iter_can_seek_beginning = + cur_cc_descr_attr->value.source_msg_iter_can_seek_beginning_method; break; case BT_COMPONENT_CLASS_TYPE_FILTER: - cc_full_descr->methods.filter.notif_iter_finalize = - cur_cc_descr_attr->value.filter_notif_iter_finalize_method; + cc_full_descr->methods.filter.msg_iter_can_seek_beginning = + cur_cc_descr_attr->value.filter_msg_iter_can_seek_beginning_method; break; default: abort(); @@ -673,13 +723,16 @@ enum bt_plugin_status bt_plugin_so_init( /* Initialize plugin */ if (spec->init) { + enum bt_self_plugin_status init_status; + BT_LOGD_STR("Calling user's plugin initialization function."); - status = spec->init(plugin); + init_status = spec->init((void *) plugin); BT_LOGD("User function returned: %s", - bt_plugin_status_string(status)); + bt_self_plugin_status_string(init_status)); - if (status < 0) { + if (init_status < 0) { BT_LOGW_STR("User's plugin initialization function failed."); + status = BT_PLUGIN_STATUS_ERROR; goto end; } } @@ -691,10 +744,10 @@ enum bt_plugin_status bt_plugin_so_init( struct comp_class_full_descriptor *cc_full_descr = &g_array_index(comp_class_full_descriptors, struct comp_class_full_descriptor, i); - struct bt_private_component_class *comp_class = NULL; - struct bt_private_component_class_source *src_comp_class = NULL; - struct bt_private_component_class_filter *flt_comp_class = NULL; - struct bt_private_component_class_sink *sink_comp_class = NULL; + struct bt_component_class *comp_class = NULL; + struct bt_component_class_source *src_comp_class = NULL; + struct bt_component_class_filter *flt_comp_class = NULL; + struct bt_component_class_sink *sink_comp_class = NULL; BT_LOGD("Creating and setting properties of plugin's component class: " "plugin-path=\"%s\", plugin-name=\"%s\", " @@ -709,24 +762,24 @@ enum bt_plugin_status bt_plugin_so_init( switch (cc_full_descr->descriptor->type) { case BT_COMPONENT_CLASS_TYPE_SOURCE: - src_comp_class = bt_private_component_class_source_create( + src_comp_class = bt_component_class_source_create( cc_full_descr->descriptor->name, - cc_full_descr->descriptor->methods.source.notif_iter_next); - comp_class = bt_private_component_class_source_as_private_component_class( + cc_full_descr->descriptor->methods.source.msg_iter_next); + comp_class = bt_component_class_source_as_component_class( src_comp_class); break; case BT_COMPONENT_CLASS_TYPE_FILTER: - flt_comp_class = bt_private_component_class_filter_create( + flt_comp_class = bt_component_class_filter_create( cc_full_descr->descriptor->name, - cc_full_descr->descriptor->methods.source.notif_iter_next); - comp_class = bt_private_component_class_filter_as_private_component_class( + cc_full_descr->descriptor->methods.source.msg_iter_next); + comp_class = bt_component_class_filter_as_component_class( flt_comp_class); break; case BT_COMPONENT_CLASS_TYPE_SINK: - sink_comp_class = bt_private_component_class_sink_create( + sink_comp_class = bt_component_class_sink_create( cc_full_descr->descriptor->name, cc_full_descr->descriptor->methods.sink.consume); - comp_class = bt_private_component_class_sink_as_private_component_class( + comp_class = bt_component_class_sink_as_component_class( sink_comp_class); break; default: @@ -756,7 +809,7 @@ enum bt_plugin_status bt_plugin_so_init( } if (cc_full_descr->description) { - ret = bt_private_component_class_set_description( + ret = bt_component_class_set_description( comp_class, cc_full_descr->description); if (ret) { BT_LOGE_STR("Cannot set component class's description."); @@ -767,7 +820,7 @@ enum bt_plugin_status bt_plugin_so_init( } if (cc_full_descr->help) { - ret = bt_private_component_class_set_help(comp_class, + ret = bt_component_class_set_help(comp_class, cc_full_descr->help); if (ret) { BT_LOGE_STR("Cannot set component class's help string."); @@ -780,7 +833,7 @@ enum bt_plugin_status bt_plugin_so_init( switch (cc_full_descr->descriptor->type) { case BT_COMPONENT_CLASS_TYPE_SOURCE: if (cc_full_descr->methods.source.init) { - ret = bt_private_component_class_source_set_init_method( + ret = bt_component_class_source_set_init_method( src_comp_class, cc_full_descr->methods.source.init); if (ret) { @@ -792,7 +845,7 @@ enum bt_plugin_status bt_plugin_so_init( } if (cc_full_descr->methods.source.finalize) { - ret = bt_private_component_class_source_set_finalize_method( + ret = bt_component_class_source_set_finalize_method( src_comp_class, cc_full_descr->methods.source.finalize); if (ret) { @@ -804,7 +857,7 @@ enum bt_plugin_status bt_plugin_so_init( } if (cc_full_descr->methods.source.query) { - ret = bt_private_component_class_source_set_query_method( + ret = bt_component_class_source_set_query_method( src_comp_class, cc_full_descr->methods.source.query); if (ret) { @@ -816,7 +869,7 @@ enum bt_plugin_status bt_plugin_so_init( } if (cc_full_descr->methods.source.accept_output_port_connection) { - ret = bt_private_component_class_source_set_accept_output_port_connection_method( + ret = bt_component_class_source_set_accept_output_port_connection_method( src_comp_class, cc_full_descr->methods.source.accept_output_port_connection); if (ret) { @@ -828,7 +881,7 @@ enum bt_plugin_status bt_plugin_so_init( } if (cc_full_descr->methods.source.output_port_connected) { - ret = bt_private_component_class_source_set_output_port_connected_method( + ret = bt_component_class_source_set_output_port_connected_method( src_comp_class, cc_full_descr->methods.source.output_port_connected); if (ret) { @@ -839,36 +892,72 @@ enum bt_plugin_status bt_plugin_so_init( } } - if (cc_full_descr->methods.source.output_port_disconnected) { - ret = bt_private_component_class_source_set_output_port_disconnected_method( + if (cc_full_descr->methods.source.msg_iter_init) { + ret = bt_component_class_source_set_message_iterator_init_method( src_comp_class, - cc_full_descr->methods.source.output_port_disconnected); + cc_full_descr->methods.source.msg_iter_init); if (ret) { - BT_LOGE_STR("Cannot set source component class's \"output port disconnected\" method."); + BT_LOGE_STR("Cannot set source component class's message iterator initialization method."); status = BT_PLUGIN_STATUS_ERROR; BT_OBJECT_PUT_REF_AND_RESET(src_comp_class); goto end; } } - if (cc_full_descr->methods.source.notif_iter_init) { - ret = bt_private_component_class_source_set_notification_iterator_init_method( + if (cc_full_descr->methods.source.msg_iter_finalize) { + ret = bt_component_class_source_set_message_iterator_finalize_method( src_comp_class, - cc_full_descr->methods.source.notif_iter_init); + cc_full_descr->methods.source.msg_iter_finalize); if (ret) { - BT_LOGE_STR("Cannot set source component class's notification iterator initialization method."); + BT_LOGE_STR("Cannot set source component class's message iterator finalization method."); status = BT_PLUGIN_STATUS_ERROR; BT_OBJECT_PUT_REF_AND_RESET(src_comp_class); goto end; } } - if (cc_full_descr->methods.source.notif_iter_finalize) { - ret = bt_private_component_class_source_set_notification_iterator_finalize_method( + if (cc_full_descr->methods.source.msg_iter_seek_ns_from_origin) { + ret = bt_component_class_source_set_message_iterator_seek_ns_from_origin_method( src_comp_class, - cc_full_descr->methods.source.notif_iter_finalize); + cc_full_descr->methods.source.msg_iter_seek_ns_from_origin); if (ret) { - BT_LOGE_STR("Cannot set source component class's notification iterator finalization method."); + BT_LOGE_STR("Cannot set source component class's message iterator \"seek nanoseconds from origin\" method."); + status = BT_PLUGIN_STATUS_ERROR; + BT_OBJECT_PUT_REF_AND_RESET(src_comp_class); + goto end; + } + } + + if (cc_full_descr->methods.source.msg_iter_seek_beginning) { + ret = bt_component_class_source_set_message_iterator_seek_beginning_method( + src_comp_class, + cc_full_descr->methods.source.msg_iter_seek_beginning); + if (ret) { + BT_LOGE_STR("Cannot set source component class's message iterator \"seek beginning\" method."); + status = BT_PLUGIN_STATUS_ERROR; + BT_OBJECT_PUT_REF_AND_RESET(src_comp_class); + goto end; + } + } + + if (cc_full_descr->methods.source.msg_iter_can_seek_ns_from_origin) { + ret = bt_component_class_source_set_message_iterator_can_seek_ns_from_origin_method( + src_comp_class, + cc_full_descr->methods.source.msg_iter_can_seek_ns_from_origin); + if (ret) { + BT_LOGE_STR("Cannot set source component class's message iterator \"can seek nanoseconds from origin\" method."); + status = BT_PLUGIN_STATUS_ERROR; + BT_OBJECT_PUT_REF_AND_RESET(src_comp_class); + goto end; + } + } + + if (cc_full_descr->methods.source.msg_iter_can_seek_beginning) { + ret = bt_component_class_source_set_message_iterator_can_seek_beginning_method( + src_comp_class, + cc_full_descr->methods.source.msg_iter_can_seek_beginning); + if (ret) { + BT_LOGE_STR("Cannot set source component class's message iterator \"can seek beginning\" method."); status = BT_PLUGIN_STATUS_ERROR; BT_OBJECT_PUT_REF_AND_RESET(src_comp_class); goto end; @@ -878,7 +967,7 @@ enum bt_plugin_status bt_plugin_so_init( break; case BT_COMPONENT_CLASS_TYPE_FILTER: if (cc_full_descr->methods.filter.init) { - ret = bt_private_component_class_filter_set_init_method( + ret = bt_component_class_filter_set_init_method( flt_comp_class, cc_full_descr->methods.filter.init); if (ret) { @@ -890,7 +979,7 @@ enum bt_plugin_status bt_plugin_so_init( } if (cc_full_descr->methods.filter.finalize) { - ret = bt_private_component_class_filter_set_finalize_method( + ret = bt_component_class_filter_set_finalize_method( flt_comp_class, cc_full_descr->methods.filter.finalize); if (ret) { @@ -902,7 +991,7 @@ enum bt_plugin_status bt_plugin_so_init( } if (cc_full_descr->methods.filter.query) { - ret = bt_private_component_class_filter_set_query_method( + ret = bt_component_class_filter_set_query_method( flt_comp_class, cc_full_descr->methods.filter.query); if (ret) { @@ -914,7 +1003,7 @@ enum bt_plugin_status bt_plugin_so_init( } if (cc_full_descr->methods.filter.accept_input_port_connection) { - ret = bt_private_component_class_filter_set_accept_input_port_connection_method( + ret = bt_component_class_filter_set_accept_input_port_connection_method( flt_comp_class, cc_full_descr->methods.filter.accept_input_port_connection); if (ret) { @@ -926,7 +1015,7 @@ enum bt_plugin_status bt_plugin_so_init( } if (cc_full_descr->methods.filter.accept_output_port_connection) { - ret = bt_private_component_class_filter_set_accept_output_port_connection_method( + ret = bt_component_class_filter_set_accept_output_port_connection_method( flt_comp_class, cc_full_descr->methods.filter.accept_output_port_connection); if (ret) { @@ -938,7 +1027,7 @@ enum bt_plugin_status bt_plugin_so_init( } if (cc_full_descr->methods.filter.input_port_connected) { - ret = bt_private_component_class_filter_set_input_port_connected_method( + ret = bt_component_class_filter_set_input_port_connected_method( flt_comp_class, cc_full_descr->methods.filter.input_port_connected); if (ret) { @@ -950,7 +1039,7 @@ enum bt_plugin_status bt_plugin_so_init( } if (cc_full_descr->methods.filter.output_port_connected) { - ret = bt_private_component_class_filter_set_output_port_connected_method( + ret = bt_component_class_filter_set_output_port_connected_method( flt_comp_class, cc_full_descr->methods.filter.output_port_connected); if (ret) { @@ -961,48 +1050,72 @@ enum bt_plugin_status bt_plugin_so_init( } } - if (cc_full_descr->methods.filter.input_port_disconnected) { - ret = bt_private_component_class_filter_set_input_port_disconnected_method( + if (cc_full_descr->methods.filter.msg_iter_init) { + ret = bt_component_class_filter_set_message_iterator_init_method( + flt_comp_class, + cc_full_descr->methods.filter.msg_iter_init); + if (ret) { + BT_LOGE_STR("Cannot set filter component class's message iterator initialization method."); + status = BT_PLUGIN_STATUS_ERROR; + BT_OBJECT_PUT_REF_AND_RESET(flt_comp_class); + goto end; + } + } + + if (cc_full_descr->methods.filter.msg_iter_finalize) { + ret = bt_component_class_filter_set_message_iterator_finalize_method( + flt_comp_class, + cc_full_descr->methods.filter.msg_iter_finalize); + if (ret) { + BT_LOGE_STR("Cannot set filter component class's message iterator finalization method."); + status = BT_PLUGIN_STATUS_ERROR; + BT_OBJECT_PUT_REF_AND_RESET(flt_comp_class); + goto end; + } + } + + if (cc_full_descr->methods.filter.msg_iter_seek_ns_from_origin) { + ret = bt_component_class_filter_set_message_iterator_seek_ns_from_origin_method( flt_comp_class, - cc_full_descr->methods.filter.input_port_disconnected); + cc_full_descr->methods.filter.msg_iter_seek_ns_from_origin); if (ret) { - BT_LOGE_STR("Cannot set filter component class's \"input port disconnected\" method."); + BT_LOGE_STR("Cannot set filter component class's message iterator \"seek nanoseconds from origin\" method."); status = BT_PLUGIN_STATUS_ERROR; BT_OBJECT_PUT_REF_AND_RESET(flt_comp_class); goto end; } } - if (cc_full_descr->methods.filter.output_port_disconnected) { - ret = bt_private_component_class_filter_set_output_port_disconnected_method( + if (cc_full_descr->methods.filter.msg_iter_seek_beginning) { + ret = bt_component_class_filter_set_message_iterator_seek_beginning_method( flt_comp_class, - cc_full_descr->methods.filter.output_port_disconnected); + cc_full_descr->methods.filter.msg_iter_seek_beginning); if (ret) { - BT_LOGE_STR("Cannot set filter component class's \"output port disconnected\" method."); + BT_LOGE_STR("Cannot set filter component class's message iterator \"seek beginning\" method."); status = BT_PLUGIN_STATUS_ERROR; BT_OBJECT_PUT_REF_AND_RESET(flt_comp_class); goto end; } } - if (cc_full_descr->methods.filter.notif_iter_init) { - ret = bt_private_component_class_filter_set_notification_iterator_init_method( + if (cc_full_descr->methods.filter.msg_iter_can_seek_ns_from_origin) { + ret = bt_component_class_filter_set_message_iterator_can_seek_ns_from_origin_method( flt_comp_class, - cc_full_descr->methods.filter.notif_iter_init); + cc_full_descr->methods.filter.msg_iter_can_seek_ns_from_origin); if (ret) { - BT_LOGE_STR("Cannot set filter component class's notification iterator initialization method."); + BT_LOGE_STR("Cannot set filter component class's message iterator \"can seek nanoseconds from origin\" method."); status = BT_PLUGIN_STATUS_ERROR; BT_OBJECT_PUT_REF_AND_RESET(flt_comp_class); goto end; } } - if (cc_full_descr->methods.filter.notif_iter_finalize) { - ret = bt_private_component_class_filter_set_notification_iterator_finalize_method( + if (cc_full_descr->methods.filter.msg_iter_can_seek_beginning) { + ret = bt_component_class_filter_set_message_iterator_can_seek_beginning_method( flt_comp_class, - cc_full_descr->methods.filter.notif_iter_finalize); + cc_full_descr->methods.filter.msg_iter_can_seek_beginning); if (ret) { - BT_LOGE_STR("Cannot set filter component class's notification iterator finalization method."); + BT_LOGE_STR("Cannot set filter component class's message iterator \"can seek beginning\" method."); status = BT_PLUGIN_STATUS_ERROR; BT_OBJECT_PUT_REF_AND_RESET(flt_comp_class); goto end; @@ -1012,7 +1125,7 @@ enum bt_plugin_status bt_plugin_so_init( break; case BT_COMPONENT_CLASS_TYPE_SINK: if (cc_full_descr->methods.sink.init) { - ret = bt_private_component_class_sink_set_init_method( + ret = bt_component_class_sink_set_init_method( sink_comp_class, cc_full_descr->methods.sink.init); if (ret) { @@ -1024,7 +1137,7 @@ enum bt_plugin_status bt_plugin_so_init( } if (cc_full_descr->methods.sink.finalize) { - ret = bt_private_component_class_sink_set_finalize_method( + ret = bt_component_class_sink_set_finalize_method( sink_comp_class, cc_full_descr->methods.sink.finalize); if (ret) { @@ -1036,7 +1149,7 @@ enum bt_plugin_status bt_plugin_so_init( } if (cc_full_descr->methods.sink.query) { - ret = bt_private_component_class_sink_set_query_method( + ret = bt_component_class_sink_set_query_method( sink_comp_class, cc_full_descr->methods.sink.query); if (ret) { @@ -1048,7 +1161,7 @@ enum bt_plugin_status bt_plugin_so_init( } if (cc_full_descr->methods.sink.accept_input_port_connection) { - ret = bt_private_component_class_sink_set_accept_input_port_connection_method( + ret = bt_component_class_sink_set_accept_input_port_connection_method( sink_comp_class, cc_full_descr->methods.sink.accept_input_port_connection); if (ret) { @@ -1060,7 +1173,7 @@ enum bt_plugin_status bt_plugin_so_init( } if (cc_full_descr->methods.sink.input_port_connected) { - ret = bt_private_component_class_sink_set_input_port_connected_method( + ret = bt_component_class_sink_set_input_port_connected_method( sink_comp_class, cc_full_descr->methods.sink.input_port_connected); if (ret) { @@ -1071,12 +1184,12 @@ enum bt_plugin_status bt_plugin_so_init( } } - if (cc_full_descr->methods.sink.input_port_disconnected) { - ret = bt_private_component_class_sink_set_input_port_disconnected_method( + if (cc_full_descr->methods.sink.graph_is_configured) { + ret = bt_component_class_sink_set_graph_is_configured_method( sink_comp_class, - cc_full_descr->methods.sink.input_port_disconnected); + cc_full_descr->methods.sink.graph_is_configured); if (ret) { - BT_LOGE_STR("Cannot set sink component class's \"input port disconnected\" method."); + BT_LOGE_STR("Cannot set sink component class's \"graph is configured\" method."); status = BT_PLUGIN_STATUS_ERROR; BT_OBJECT_PUT_REF_AND_RESET(sink_comp_class); goto end; @@ -1130,7 +1243,8 @@ struct bt_plugin *bt_plugin_so_create_empty( } spec = plugin->spec_data; - spec->shared_lib_handle = bt_object_get_ref(shared_lib_handle); + spec->shared_lib_handle = shared_lib_handle; + bt_object_get_no_null_check(spec->shared_lib_handle); goto end; error: @@ -1222,7 +1336,7 @@ struct bt_plugin_set *bt_plugin_so_create_all_from_sections( * _trying_ to open this file as a compatible * Babeltrace plugin: if it's not, it's not an * error. And because this can be tried during - * bt_plugin_create_all_from_dir(), it's not + * bt_plugin_find_all_from_dir(), it's not * even a warning. */ BT_LOGD("Unknown ABI major version: abi-major=%d", @@ -1249,7 +1363,7 @@ struct bt_plugin_set *bt_plugin_so_create_all_from_sections( * _trying_ to open this file as a compatible * Babeltrace plugin: if it's not, it's not an * error. And because this can be tried during - * bt_plugin_create_all_from_dir(), it's not + * bt_plugin_find_all_from_dir(), it's not * even a warning. */ BT_LOGD_STR("Cannot initialize SO plugin object from sections."); @@ -1488,7 +1602,6 @@ void plugin_comp_class_destroy_listener(struct bt_component_class *comp_class, "comp-cls-addr=%p", comp_class); } -BT_HIDDEN void bt_plugin_so_on_add_component_class(struct bt_plugin *plugin, struct bt_component_class *comp_class) { @@ -1498,7 +1611,8 @@ void bt_plugin_so_on_add_component_class(struct bt_plugin *plugin, BT_ASSERT(plugin->type == BT_PLUGIN_TYPE_SO); bt_list_add(&comp_class->node, &component_class_list); - comp_class->so_handle = bt_object_get_ref(spec->shared_lib_handle); + comp_class->so_handle = spec->shared_lib_handle; + bt_object_get_no_null_check(comp_class->so_handle); /* Add our custom destroy listener */ bt_component_class_add_destroy_listener(comp_class,