X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fplugin%2Fplugin-so.c;h=be4fc428b2147ee78d7ad55a398187a384240c0a;hb=9ba4e1ecd47455f95b20e2e9421e18b034669bc3;hp=42b1df6ce4c8de1bb157d6f002364867d8e61725;hpb=9736d991ea189f29b908e9cf18103c1452c59e05;p=babeltrace.git diff --git a/src/lib/plugin/plugin-so.c b/src/lib/plugin/plugin-so.c index 42b1df6c..be4fc428 100644 --- a/src/lib/plugin/plugin-so.c +++ b/src/lib/plugin/plugin-so.c @@ -32,18 +32,18 @@ #include #include "lib/graph/component-class.h" #include -#include -#include -#include #include #include "common/list.h" #include +#include #include #include #include #include "plugin.h" #include "plugin-so.h" +#include "lib/func-status.h" +#include "common/common.h" #define NATIVE_PLUGIN_SUFFIX "." G_MODULE_SUFFIX #define NATIVE_PLUGIN_SUFFIX_LEN sizeof(NATIVE_PLUGIN_SUFFIX) @@ -102,21 +102,6 @@ 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) { @@ -138,28 +123,33 @@ void bt_plugin_so_shared_lib_handle_destroy(struct bt_object *obj) } if (shared_lib_handle->module) { -#ifndef BT_DEBUG_MODE +#ifdef BT_DEBUG_MODE /* * Valgrind shows incomplete stack traces when * dynamically loaded libraries are closed before it - * finishes. Use the BABELTRACE_NO_DLCLOSE in a debug + * finishes. Use the LIBBABELTRACE2_NO_DLCLOSE in a debug * build to avoid this. */ - const char *var = getenv("BABELTRACE_NO_DLCLOSE"); + const char *var = getenv("LIBBABELTRACE2_NO_DLCLOSE"); if (!var || strcmp(var, "1") != 0) { #endif BT_LOGI("Closing GModule: path=\"%s\"", path); if (!g_module_close(shared_lib_handle->module)) { + /* + * Just log here: we're in a destructor, + * so we cannot append an error cause + * (there's no returned status). + */ BT_LOGE("Cannot close GModule: %s: path=\"%s\"", g_module_error(), path); } shared_lib_handle->module = NULL; -#ifndef BT_DEBUG_MODE +#ifdef BT_DEBUG_MODE } else { - BT_LOGI("Not closing GModule because `BABELTRACE_NO_DLCLOSE=1`: " + BT_LOGI("Not closing GModule because `LIBBABELTRACE2_NO_DLCLOSE=1`: " "path=\"%s\"", path); } #endif @@ -174,18 +164,18 @@ void bt_plugin_so_shared_lib_handle_destroy(struct bt_object *obj) } static -enum bt_plugin_status bt_plugin_so_shared_lib_handle_create( +int bt_plugin_so_shared_lib_handle_create( const char *path, struct bt_plugin_so_shared_lib_handle **shared_lib_handle) { - enum bt_plugin_status status = BT_PLUGIN_STATUS_OK; + int status = BT_FUNC_STATUS_OK; BT_ASSERT(shared_lib_handle); - BT_LOGI("Creating shared library handle: path=\"%s\"", path); + BT_LOGI("Creating shared library handle: path=\"%s\"", path ? path : "(null)"); *shared_lib_handle = g_new0(struct bt_plugin_so_shared_lib_handle, 1); if (!*shared_lib_handle) { - BT_LOGE_STR("Failed to allocate one shared library handle."); - status = BT_PLUGIN_STATUS_NOMEM; + BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one shared library handle."); + status = BT_FUNC_STATUS_MEMORY_ERROR; goto end; } @@ -198,8 +188,8 @@ enum bt_plugin_status bt_plugin_so_shared_lib_handle_create( (*shared_lib_handle)->path = g_string_new(path); if (!(*shared_lib_handle)->path) { - BT_LOGE_STR("Failed to allocate a GString."); - status = BT_PLUGIN_STATUS_NOMEM; + BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GString."); + status = BT_FUNC_STATUS_MEMORY_ERROR; goto end; } @@ -215,17 +205,17 @@ enum bt_plugin_status bt_plugin_so_shared_lib_handle_create( BT_LOGI("Cannot open GModule: %s: path=\"%s\"", g_module_error(), path); BT_OBJECT_PUT_REF_AND_RESET(*shared_lib_handle); - status = BT_PLUGIN_STATUS_NOT_FOUND; + status = BT_FUNC_STATUS_NOT_FOUND; goto end; } goto end; end: - BT_ASSERT(*shared_lib_handle || status != BT_PLUGIN_STATUS_OK); + BT_ASSERT(*shared_lib_handle || status != BT_FUNC_STATUS_OK); if (*shared_lib_handle) { BT_LOGI("Created shared library handle: path=\"%s\", addr=%p", - path, *shared_lib_handle); + path ? path : "(null)", *shared_lib_handle); } return status; @@ -275,7 +265,7 @@ void bt_plugin_so_destroy_spec_data(struct bt_plugin *plugin) * 6. Freeze the plugin object. */ static -enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, +int bt_plugin_so_init(struct bt_plugin *plugin, bool fail_on_load_error, const struct __bt_plugin_descriptor *descriptor, struct __bt_plugin_descriptor_attribute const * const *attrs_begin, @@ -296,34 +286,37 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, union { struct { - bt_component_class_source_init_method init; + bt_component_class_source_get_supported_mip_versions_method get_supported_mip_versions; + bt_component_class_source_initialize_method init; bt_component_class_source_finalize_method finalize; bt_component_class_source_query_method query; 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; + bt_message_iterator_class_initialize_method msg_iter_initialize; + bt_message_iterator_class_finalize_method msg_iter_finalize; + bt_message_iterator_class_seek_ns_from_origin_method msg_iter_seek_ns_from_origin; + bt_message_iterator_class_seek_beginning_method msg_iter_seek_beginning; + bt_message_iterator_class_can_seek_ns_from_origin_method msg_iter_can_seek_ns_from_origin; + bt_message_iterator_class_can_seek_beginning_method msg_iter_can_seek_beginning; } source; struct { - bt_component_class_filter_init_method init; + bt_component_class_filter_get_supported_mip_versions_method get_supported_mip_versions; + bt_component_class_filter_initialize_method init; bt_component_class_filter_finalize_method finalize; bt_component_class_filter_query_method query; 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; + bt_message_iterator_class_initialize_method msg_iter_initialize; + bt_message_iterator_class_finalize_method msg_iter_finalize; + bt_message_iterator_class_seek_ns_from_origin_method msg_iter_seek_ns_from_origin; + bt_message_iterator_class_seek_beginning_method msg_iter_seek_beginning; + bt_message_iterator_class_can_seek_ns_from_origin_method msg_iter_can_seek_ns_from_origin; + bt_message_iterator_class_can_seek_beginning_method msg_iter_can_seek_beginning; } filter; struct { - bt_component_class_sink_init_method init; + bt_component_class_sink_get_supported_mip_versions_method get_supported_mip_versions; + bt_component_class_sink_initialize_method init; bt_component_class_sink_finalize_method finalize; bt_component_class_sink_query_method query; bt_component_class_sink_input_port_connected_method input_port_connected; @@ -332,7 +325,7 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, } methods; }; - enum bt_plugin_status status = BT_PLUGIN_STATUS_OK; + int status = BT_FUNC_STATUS_OK; struct __bt_plugin_descriptor_attribute const * const *cur_attr_ptr; struct __bt_plugin_component_class_descriptor const * const *cur_cc_descr_ptr; struct __bt_plugin_component_class_descriptor_attribute const * const *cur_cc_descr_attr_ptr; @@ -340,6 +333,7 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, GArray *comp_class_full_descriptors; size_t i; int ret; + struct bt_message_iterator_class *msg_iter_class = NULL; BT_LOGI("Initializing plugin object from descriptors found in sections: " "plugin-addr=%p, plugin-path=\"%s\", " @@ -355,8 +349,8 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, comp_class_full_descriptors = g_array_new(FALSE, TRUE, sizeof(struct comp_class_full_descriptor)); if (!comp_class_full_descriptors) { - BT_LOGE_STR("Failed to allocate a GArray."); - status = BT_PLUGIN_STATUS_NOMEM; + BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GArray."); + status = BT_FUNC_STATUS_MEMORY_ERROR; goto end; } @@ -372,7 +366,7 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, const struct __bt_plugin_descriptor_attribute *cur_attr = *cur_attr_ptr; - if (cur_attr == NULL) { + if (!cur_attr) { continue; } @@ -404,22 +398,28 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, cur_attr->value.version.extra); break; default: - BT_LOG_WRITE(fail_on_load_error ? - BT_LOG_WARN : BT_LOG_INFO, BT_LOG_TAG, - "%s plugin descriptor attribute: " - "plugin-path=\"%s\", plugin-name=\"%s\", " - "attr-type-name=\"%s\", attr-type-id=%d", - fail_on_load_error ? "Unknown" : - "Ignoring unknown", - spec->shared_lib_handle->path ? - spec->shared_lib_handle->path->str : - NULL, - descriptor->name, cur_attr->type_name, - cur_attr->type); - if (fail_on_load_error) { - status = BT_PLUGIN_STATUS_LOADING_ERROR; + BT_LIB_LOGW_APPEND_CAUSE( + "Unknown plugin descriptor attribute: " + "plugin-path=\"%s\", plugin-name=\"%s\", " + "attr-type-name=\"%s\", attr-type-id=%d", + spec->shared_lib_handle->path ? + spec->shared_lib_handle->path->str : + NULL, + descriptor->name, cur_attr->type_name, + cur_attr->type); + status = BT_FUNC_STATUS_ERROR; goto end; + } else { + BT_LIB_LOGW( + "Ignoring unknown plugin descriptor attribute: " + "plugin-path=\"%s\", plugin-name=\"%s\", " + "attr-type-name=\"%s\", attr-type-id=%d", + spec->shared_lib_handle->path ? + spec->shared_lib_handle->path->str : + NULL, + descriptor->name, cur_attr->type_name, + cur_attr->type); } break; @@ -436,7 +436,7 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, *cur_cc_descr_ptr; struct comp_class_full_descriptor full_descriptor = {0}; - if (cur_cc_descr == NULL) { + if (!cur_cc_descr) { continue; } @@ -459,7 +459,7 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, *cur_cc_descr_attr_ptr; enum bt_component_class_type cc_type; - if (cur_cc_descr_attr == NULL) { + if (!cur_cc_descr_attr) { continue; } @@ -490,22 +490,40 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, cc_full_descr->help = cur_cc_descr_attr->value.help; break; - case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_INIT_METHOD: + case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_GET_SUPPORTED_MIP_VERSIONS_METHOD: + switch (cc_type) { + case BT_COMPONENT_CLASS_TYPE_SOURCE: + cc_full_descr->methods.source.get_supported_mip_versions = + cur_cc_descr_attr->value.source_get_supported_mip_versions_method; + break; + case BT_COMPONENT_CLASS_TYPE_FILTER: + cc_full_descr->methods.filter.get_supported_mip_versions = + cur_cc_descr_attr->value.filter_get_supported_mip_versions_method; + break; + case BT_COMPONENT_CLASS_TYPE_SINK: + cc_full_descr->methods.sink.get_supported_mip_versions = + cur_cc_descr_attr->value.sink_get_supported_mip_versions_method; + break; + default: + bt_common_abort(); + } + break; + case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_INITIALIZE_METHOD: switch (cc_type) { case BT_COMPONENT_CLASS_TYPE_SOURCE: cc_full_descr->methods.source.init = - cur_cc_descr_attr->value.source_init_method; + cur_cc_descr_attr->value.source_initialize_method; break; case BT_COMPONENT_CLASS_TYPE_FILTER: cc_full_descr->methods.filter.init = - cur_cc_descr_attr->value.filter_init_method; + cur_cc_descr_attr->value.filter_initialize_method; break; case BT_COMPONENT_CLASS_TYPE_SINK: cc_full_descr->methods.sink.init = - cur_cc_descr_attr->value.sink_init_method; + cur_cc_descr_attr->value.sink_initialize_method; break; default: - abort(); + bt_common_abort(); } break; case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_FINALIZE_METHOD: @@ -523,7 +541,7 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, cur_cc_descr_attr->value.sink_finalize_method; break; default: - abort(); + bt_common_abort(); } break; case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_QUERY_METHOD: @@ -541,7 +559,7 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, cur_cc_descr_attr->value.sink_query_method; break; default: - abort(); + bt_common_abort(); } break; case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_INPUT_PORT_CONNECTED_METHOD: @@ -555,7 +573,7 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, cur_cc_descr_attr->value.sink_input_port_connected_method; break; default: - abort(); + bt_common_abort(); } break; case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_OUTPUT_PORT_CONNECTED_METHOD: @@ -569,7 +587,7 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, cur_cc_descr_attr->value.filter_output_port_connected_method; break; default: - abort(); + bt_common_abort(); } break; case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_GRAPH_IS_CONFIGURED_METHOD: @@ -579,118 +597,132 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, cur_cc_descr_attr->value.sink_graph_is_configured_method; break; default: - abort(); + bt_common_abort(); } break; - case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_MSG_ITER_INIT_METHOD: + case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_MSG_ITER_INITIALIZE_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; + cc_full_descr->methods.source.msg_iter_initialize = + cur_cc_descr_attr->value.msg_iter_initialize_method; break; case BT_COMPONENT_CLASS_TYPE_FILTER: - cc_full_descr->methods.filter.msg_iter_init = - cur_cc_descr_attr->value.filter_msg_iter_init_method; + cc_full_descr->methods.filter.msg_iter_initialize = + cur_cc_descr_attr->value.msg_iter_initialize_method; break; default: - abort(); + bt_common_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; + cur_cc_descr_attr->value.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; + cur_cc_descr_attr->value.msg_iter_finalize_method; break; default: - abort(); + bt_common_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; + cur_cc_descr_attr->value.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; + cur_cc_descr_attr->value.msg_iter_seek_ns_from_origin_method; break; default: - abort(); + bt_common_abort(); } break; 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.msg_iter_seek_beginning = - cur_cc_descr_attr->value.source_msg_iter_seek_beginning_method; + cur_cc_descr_attr->value.msg_iter_seek_beginning_method; break; case BT_COMPONENT_CLASS_TYPE_FILTER: cc_full_descr->methods.filter.msg_iter_seek_beginning = - cur_cc_descr_attr->value.filter_msg_iter_seek_beginning_method; + cur_cc_descr_attr->value.msg_iter_seek_beginning_method; break; default: - abort(); + bt_common_abort(); } break; 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.msg_iter_can_seek_ns_from_origin = - cur_cc_descr_attr->value.source_msg_iter_can_seek_ns_from_origin_method; + cur_cc_descr_attr->value.msg_iter_can_seek_ns_from_origin_method; break; case BT_COMPONENT_CLASS_TYPE_FILTER: 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; + cur_cc_descr_attr->value.msg_iter_can_seek_ns_from_origin_method; break; default: - abort(); + bt_common_abort(); } break; 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.msg_iter_can_seek_beginning = - cur_cc_descr_attr->value.source_msg_iter_can_seek_beginning_method; + cur_cc_descr_attr->value.msg_iter_can_seek_beginning_method; break; case BT_COMPONENT_CLASS_TYPE_FILTER: cc_full_descr->methods.filter.msg_iter_can_seek_beginning = - cur_cc_descr_attr->value.filter_msg_iter_can_seek_beginning_method; + cur_cc_descr_attr->value.msg_iter_can_seek_beginning_method; break; default: - abort(); + bt_common_abort(); } break; default: - BT_LOG_WRITE(fail_on_load_error ? - BT_LOG_WARN : BT_LOG_INFO, BT_LOG_TAG, - "%s component class descriptor attribute: " - "plugin-path=\"%s\", " - "plugin-name=\"%s\", " - "comp-class-name=\"%s\", " - "comp-class-type=%s, " - "attr-type-name=\"%s\", " - "attr-type-id=%d", - fail_on_load_error ? "Unknown" : - "Ignoring unknown", - spec->shared_lib_handle->path ? - spec->shared_lib_handle->path->str : - NULL, - descriptor->name, - cur_cc_descr_attr->comp_class_descriptor->name, - bt_component_class_type_string( - cur_cc_descr_attr->comp_class_descriptor->type), - cur_cc_descr_attr->type_name, - cur_cc_descr_attr->type); - if (fail_on_load_error) { - status = BT_PLUGIN_STATUS_LOADING_ERROR; + BT_LIB_LOGW_APPEND_CAUSE( + "Unknown component class descriptor attribute: " + "plugin-path=\"%s\", " + "plugin-name=\"%s\", " + "comp-class-name=\"%s\", " + "comp-class-type=%s, " + "attr-type-name=\"%s\", " + "attr-type-id=%d", + spec->shared_lib_handle->path ? + spec->shared_lib_handle->path->str : + NULL, + descriptor->name, + cur_cc_descr_attr->comp_class_descriptor->name, + bt_component_class_type_string( + cur_cc_descr_attr->comp_class_descriptor->type), + cur_cc_descr_attr->type_name, + cur_cc_descr_attr->type); + status = BT_FUNC_STATUS_ERROR; goto end; + } else { + BT_LIB_LOGW( + "Ignoring unknown component class descriptor attribute: " + "plugin-path=\"%s\", " + "plugin-name=\"%s\", " + "comp-class-name=\"%s\", " + "comp-class-type=%s, " + "attr-type-name=\"%s\", " + "attr-type-id=%d", + spec->shared_lib_handle->path ? + spec->shared_lib_handle->path->str : + NULL, + descriptor->name, + cur_cc_descr_attr->comp_class_descriptor->name, + bt_component_class_type_string( + cur_cc_descr_attr->comp_class_descriptor->type), + cur_cc_descr_attr->type_name, + cur_cc_descr_attr->type); } break; @@ -700,24 +732,30 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, /* Initialize plugin */ if (spec->init) { - enum bt_self_plugin_status init_status; + enum bt_plugin_initialize_func_status init_status; BT_LOGD_STR("Calling user's plugin initialization function."); init_status = spec->init((void *) plugin); BT_LOGD("User function returned: status=%s", - bt_self_plugin_status_string(init_status)); + bt_common_func_status_string(init_status)); if (init_status < 0) { - BT_LOG_WRITE(fail_on_load_error ? - BT_LOG_WARN : BT_LOG_INFO, BT_LOG_TAG, - "User's plugin initialization function failed: " - "status=%s", - bt_self_plugin_status_string(init_status)); - if (fail_on_load_error) { - status = (int) init_status; + BT_LIB_LOGW_APPEND_CAUSE( + "User's plugin initialization function failed: " + "status=%s", + bt_common_func_status_string(init_status)); + status = init_status; goto end; + } else { + BT_LIB_LOGW( + "User's plugin initialization function failed: " + "status=%s", + bt_common_func_status_string(init_status)); + status = BT_FUNC_STATUS_NOT_FOUND; } + + goto end; } } @@ -744,22 +782,111 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, bt_component_class_type_string( cc_full_descr->descriptor->type)); + if (cc_full_descr->descriptor->type == BT_COMPONENT_CLASS_TYPE_SOURCE || + cc_full_descr->descriptor->type == BT_COMPONENT_CLASS_TYPE_FILTER) { + bt_message_iterator_class_next_method next_method; + bt_message_iterator_class_initialize_method init_method; + bt_message_iterator_class_finalize_method fini_method; + bt_message_iterator_class_seek_ns_from_origin_method seek_ns_from_origin_method; + bt_message_iterator_class_seek_beginning_method seek_beginning_method; + bt_message_iterator_class_can_seek_ns_from_origin_method can_seek_ns_from_origin_method; + bt_message_iterator_class_can_seek_beginning_method can_seek_beginning_method; + + if (cc_full_descr->descriptor->type == BT_COMPONENT_CLASS_TYPE_SOURCE) { + next_method = cc_full_descr->descriptor->methods.source.msg_iter_next; + init_method = cc_full_descr->methods.source.msg_iter_initialize; + fini_method = cc_full_descr->methods.source.msg_iter_finalize; + seek_ns_from_origin_method = cc_full_descr->methods.source.msg_iter_seek_ns_from_origin; + can_seek_ns_from_origin_method = cc_full_descr->methods.source.msg_iter_can_seek_ns_from_origin; + seek_beginning_method = cc_full_descr->methods.source.msg_iter_seek_beginning; + can_seek_beginning_method = cc_full_descr->methods.source.msg_iter_can_seek_beginning; + } else { + next_method = cc_full_descr->descriptor->methods.filter.msg_iter_next; + init_method = cc_full_descr->methods.filter.msg_iter_initialize; + fini_method = cc_full_descr->methods.filter.msg_iter_finalize; + seek_ns_from_origin_method = cc_full_descr->methods.filter.msg_iter_seek_ns_from_origin; + can_seek_ns_from_origin_method = cc_full_descr->methods.filter.msg_iter_can_seek_ns_from_origin; + seek_beginning_method = cc_full_descr->methods.filter.msg_iter_seek_beginning; + can_seek_beginning_method = cc_full_descr->methods.filter.msg_iter_can_seek_beginning; + } + + msg_iter_class = bt_message_iterator_class_create(next_method); + if (!msg_iter_class) { + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot create message iterator class."); + status = BT_FUNC_STATUS_MEMORY_ERROR; + goto end; + } + + if (init_method) { + ret = bt_message_iterator_class_set_initialize_method( + msg_iter_class, init_method); + if (ret) { + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot set message iterator initialization method."); + status = BT_FUNC_STATUS_MEMORY_ERROR; + goto end; + } + } + + if (fini_method) { + ret = bt_message_iterator_class_set_finalize_method( + msg_iter_class, fini_method); + if (ret) { + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot set message iterator finalization method."); + status = BT_FUNC_STATUS_MEMORY_ERROR; + goto end; + } + } + + if (seek_ns_from_origin_method) { + ret = bt_message_iterator_class_set_seek_ns_from_origin_methods( + msg_iter_class, + seek_ns_from_origin_method, + can_seek_ns_from_origin_method); + if (ret) { + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot set message iterator \"seek nanoseconds from origin\" methods."); + status = BT_FUNC_STATUS_MEMORY_ERROR; + goto end; + } + } + + if (seek_beginning_method) { + ret = bt_message_iterator_class_set_seek_beginning_methods( + msg_iter_class, + seek_beginning_method, + can_seek_beginning_method); + if (ret) { + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot set message iterator \"seek beginning\" methods."); + status = BT_FUNC_STATUS_MEMORY_ERROR; + goto end; + } + } + } + switch (cc_full_descr->descriptor->type) { case BT_COMPONENT_CLASS_TYPE_SOURCE: + BT_ASSERT(msg_iter_class); + src_comp_class = bt_component_class_source_create( - cc_full_descr->descriptor->name, - cc_full_descr->descriptor->methods.source.msg_iter_next); + cc_full_descr->descriptor->name, msg_iter_class); comp_class = bt_component_class_source_as_component_class( src_comp_class); break; case BT_COMPONENT_CLASS_TYPE_FILTER: + BT_ASSERT(msg_iter_class); + flt_comp_class = bt_component_class_filter_create( - cc_full_descr->descriptor->name, - cc_full_descr->descriptor->methods.source.msg_iter_next); + cc_full_descr->descriptor->name, msg_iter_class); comp_class = bt_component_class_filter_as_component_class( flt_comp_class); break; case BT_COMPONENT_CLASS_TYPE_SINK: + BT_ASSERT(!msg_iter_class); + sink_comp_class = bt_component_class_sink_create( cc_full_descr->descriptor->name, cc_full_descr->descriptor->methods.sink.consume); @@ -767,40 +894,57 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, sink_comp_class); break; default: - BT_LOG_WRITE(fail_on_load_error ? - BT_LOG_WARN : BT_LOG_INFO, BT_LOG_TAG, - "%s component class type: " - "plugin-path=\"%s\", plugin-name=\"%s\", " - "comp-class-name=\"%s\", comp-class-type=%d", - fail_on_load_error ? "Unknown" : - "Ignoring unknown", - spec->shared_lib_handle->path->str ? - spec->shared_lib_handle->path->str : - NULL, - descriptor->name, - cc_full_descr->descriptor->name, - cc_full_descr->descriptor->type); - if (fail_on_load_error) { - status = BT_PLUGIN_STATUS_LOADING_ERROR; + BT_LIB_LOGW_APPEND_CAUSE( + "Unknown component class type: " + "plugin-path=\"%s\", plugin-name=\"%s\", " + "comp-class-name=\"%s\", comp-class-type=%d", + spec->shared_lib_handle->path->str ? + spec->shared_lib_handle->path->str : + NULL, + descriptor->name, + cc_full_descr->descriptor->name, + cc_full_descr->descriptor->type); + status = BT_FUNC_STATUS_ERROR; goto end; + } else { + BT_LIB_LOGW( + "Ignoring unknown component class type: " + "plugin-path=\"%s\", plugin-name=\"%s\", " + "comp-class-name=\"%s\", comp-class-type=%d", + spec->shared_lib_handle->path->str ? + spec->shared_lib_handle->path->str : + NULL, + descriptor->name, + cc_full_descr->descriptor->name, + cc_full_descr->descriptor->type); + continue; } - - continue; } if (!comp_class) { - BT_LOGE_STR("Cannot create component class."); - status = BT_PLUGIN_STATUS_NOMEM; + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot create component class."); + status = BT_FUNC_STATUS_MEMORY_ERROR; goto end; } + /* + * The component class has taken a reference on the message + * iterator class, so we can drop ours. The message iterator + * class will get destroyed at the same time as the component + * class. + */ + bt_message_iterator_class_put_ref(msg_iter_class); + msg_iter_class = NULL; + if (cc_full_descr->description) { ret = bt_component_class_set_description( comp_class, cc_full_descr->description); if (ret) { - BT_LOGE_STR("Cannot set component class's description."); - status = BT_PLUGIN_STATUS_NOMEM; + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot set component class's description."); + status = BT_FUNC_STATUS_MEMORY_ERROR; BT_OBJECT_PUT_REF_AND_RESET(comp_class); goto end; } @@ -810,8 +954,9 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, ret = bt_component_class_set_help(comp_class, cc_full_descr->help); if (ret) { - BT_LOGE_STR("Cannot set component class's help string."); - status = BT_PLUGIN_STATUS_NOMEM; + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot set component class's help string."); + status = BT_FUNC_STATUS_MEMORY_ERROR; BT_OBJECT_PUT_REF_AND_RESET(comp_class); goto end; } @@ -819,13 +964,27 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, switch (cc_full_descr->descriptor->type) { case BT_COMPONENT_CLASS_TYPE_SOURCE: + if (cc_full_descr->methods.source.get_supported_mip_versions) { + ret = bt_component_class_source_set_get_supported_mip_versions_method( + src_comp_class, + cc_full_descr->methods.source.get_supported_mip_versions); + if (ret) { + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot set source component class's \"get supported MIP versions\" method."); + status = BT_FUNC_STATUS_MEMORY_ERROR; + BT_OBJECT_PUT_REF_AND_RESET(src_comp_class); + goto end; + } + } + if (cc_full_descr->methods.source.init) { - ret = bt_component_class_source_set_init_method( + ret = bt_component_class_source_set_initialize_method( src_comp_class, cc_full_descr->methods.source.init); if (ret) { - BT_LOGE_STR("Cannot set source component class's initialization method."); - status = BT_PLUGIN_STATUS_NOMEM; + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot set source component class's initialization method."); + status = BT_FUNC_STATUS_MEMORY_ERROR; BT_OBJECT_PUT_REF_AND_RESET(src_comp_class); goto end; } @@ -836,8 +995,9 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, src_comp_class, cc_full_descr->methods.source.finalize); if (ret) { - BT_LOGE_STR("Cannot set source component class's finalization method."); - status = BT_PLUGIN_STATUS_NOMEM; + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot set source component class's finalization method."); + status = BT_FUNC_STATUS_MEMORY_ERROR; BT_OBJECT_PUT_REF_AND_RESET(src_comp_class); goto end; } @@ -848,8 +1008,9 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, src_comp_class, cc_full_descr->methods.source.query); if (ret) { - BT_LOGE_STR("Cannot set source component class's query method."); - status = BT_PLUGIN_STATUS_NOMEM; + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot set source component class's query method."); + status = BT_FUNC_STATUS_MEMORY_ERROR; BT_OBJECT_PUT_REF_AND_RESET(src_comp_class); goto end; } @@ -860,94 +1021,37 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, src_comp_class, cc_full_descr->methods.source.output_port_connected); if (ret) { - BT_LOGE_STR("Cannot set source component class's \"output port connected\" method."); - status = BT_PLUGIN_STATUS_NOMEM; + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot set source component class's \"output port connected\" method."); + status = BT_FUNC_STATUS_MEMORY_ERROR; BT_OBJECT_PUT_REF_AND_RESET(src_comp_class); goto end; } } - 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.msg_iter_init); - if (ret) { - BT_LOGE_STR("Cannot set source component class's message iterator initialization method."); - status = BT_PLUGIN_STATUS_NOMEM; - BT_OBJECT_PUT_REF_AND_RESET(src_comp_class); - goto end; - } - } - - 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.msg_iter_finalize); - if (ret) { - BT_LOGE_STR("Cannot set source component class's message iterator finalization method."); - status = BT_PLUGIN_STATUS_NOMEM; - BT_OBJECT_PUT_REF_AND_RESET(src_comp_class); - goto end; - } - } - - 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.msg_iter_seek_ns_from_origin); - if (ret) { - BT_LOGE_STR("Cannot set source component class's message iterator \"seek nanoseconds from origin\" method."); - status = BT_PLUGIN_STATUS_NOMEM; - 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_NOMEM; - 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_NOMEM; - 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); + break; + case BT_COMPONENT_CLASS_TYPE_FILTER: + if (cc_full_descr->methods.filter.get_supported_mip_versions) { + ret = bt_component_class_filter_set_get_supported_mip_versions_method( + flt_comp_class, + cc_full_descr->methods.filter.get_supported_mip_versions); if (ret) { - BT_LOGE_STR("Cannot set source component class's message iterator \"can seek beginning\" method."); - status = BT_PLUGIN_STATUS_NOMEM; - BT_OBJECT_PUT_REF_AND_RESET(src_comp_class); + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot set filter component class's \"get supported MIP versions\" method."); + status = BT_FUNC_STATUS_MEMORY_ERROR; + BT_OBJECT_PUT_REF_AND_RESET(flt_comp_class); goto end; } } - break; - case BT_COMPONENT_CLASS_TYPE_FILTER: if (cc_full_descr->methods.filter.init) { - ret = bt_component_class_filter_set_init_method( + ret = bt_component_class_filter_set_initialize_method( flt_comp_class, cc_full_descr->methods.filter.init); if (ret) { - BT_LOGE_STR("Cannot set filter component class's initialization method."); - status = BT_PLUGIN_STATUS_NOMEM; + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot set filter component class's initialization method."); + status = BT_FUNC_STATUS_MEMORY_ERROR; BT_OBJECT_PUT_REF_AND_RESET(flt_comp_class); goto end; } @@ -958,8 +1062,9 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, flt_comp_class, cc_full_descr->methods.filter.finalize); if (ret) { - BT_LOGE_STR("Cannot set filter component class's finalization method."); - status = BT_PLUGIN_STATUS_NOMEM; + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot set filter component class's finalization method."); + status = BT_FUNC_STATUS_MEMORY_ERROR; BT_OBJECT_PUT_REF_AND_RESET(flt_comp_class); goto end; } @@ -970,8 +1075,9 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, flt_comp_class, cc_full_descr->methods.filter.query); if (ret) { - BT_LOGE_STR("Cannot set filter component class's query method."); - status = BT_PLUGIN_STATUS_NOMEM; + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot set filter component class's query method."); + status = BT_FUNC_STATUS_MEMORY_ERROR; BT_OBJECT_PUT_REF_AND_RESET(flt_comp_class); goto end; } @@ -982,8 +1088,9 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, flt_comp_class, cc_full_descr->methods.filter.input_port_connected); if (ret) { - BT_LOGE_STR("Cannot set filter component class's \"input port connected\" method."); - status = BT_PLUGIN_STATUS_NOMEM; + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot set filter component class's \"input port connected\" method."); + status = BT_FUNC_STATUS_MEMORY_ERROR; BT_OBJECT_PUT_REF_AND_RESET(flt_comp_class); goto end; } @@ -994,94 +1101,37 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, flt_comp_class, cc_full_descr->methods.filter.output_port_connected); if (ret) { - BT_LOGE_STR("Cannot set filter component class's \"output port connected\" method."); - status = BT_PLUGIN_STATUS_NOMEM; - BT_OBJECT_PUT_REF_AND_RESET(flt_comp_class); - goto end; - } - } - - 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_NOMEM; - 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_NOMEM; - 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.msg_iter_seek_ns_from_origin); - if (ret) { - BT_LOGE_STR("Cannot set filter component class's message iterator \"seek nanoseconds from origin\" method."); - status = BT_PLUGIN_STATUS_NOMEM; - BT_OBJECT_PUT_REF_AND_RESET(flt_comp_class); - goto end; - } - } - - 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.msg_iter_seek_beginning); - if (ret) { - BT_LOGE_STR("Cannot set filter component class's message iterator \"seek beginning\" method."); - status = BT_PLUGIN_STATUS_NOMEM; + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot set filter component class's \"output port connected\" method."); + status = BT_FUNC_STATUS_MEMORY_ERROR; BT_OBJECT_PUT_REF_AND_RESET(flt_comp_class); goto end; } } - 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.msg_iter_can_seek_ns_from_origin); - if (ret) { - BT_LOGE_STR("Cannot set filter component class's message iterator \"can seek nanoseconds from origin\" method."); - status = BT_PLUGIN_STATUS_NOMEM; - BT_OBJECT_PUT_REF_AND_RESET(flt_comp_class); - goto end; - } - } - - 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.msg_iter_can_seek_beginning); + break; + case BT_COMPONENT_CLASS_TYPE_SINK: + if (cc_full_descr->methods.sink.get_supported_mip_versions) { + ret = bt_component_class_sink_set_get_supported_mip_versions_method( + sink_comp_class, + cc_full_descr->methods.sink.get_supported_mip_versions); if (ret) { - BT_LOGE_STR("Cannot set filter component class's message iterator \"can seek beginning\" method."); - status = BT_PLUGIN_STATUS_NOMEM; - BT_OBJECT_PUT_REF_AND_RESET(flt_comp_class); + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot set sink component class's \"get supported MIP versions\" method."); + status = BT_FUNC_STATUS_MEMORY_ERROR; + BT_OBJECT_PUT_REF_AND_RESET(sink_comp_class); goto end; } } - break; - case BT_COMPONENT_CLASS_TYPE_SINK: if (cc_full_descr->methods.sink.init) { - ret = bt_component_class_sink_set_init_method( + ret = bt_component_class_sink_set_initialize_method( sink_comp_class, cc_full_descr->methods.sink.init); if (ret) { - BT_LOGE_STR("Cannot set sink component class's initialization method."); - status = BT_PLUGIN_STATUS_NOMEM; + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot set sink component class's initialization method."); + status = BT_FUNC_STATUS_MEMORY_ERROR; BT_OBJECT_PUT_REF_AND_RESET(sink_comp_class); goto end; } @@ -1092,8 +1142,9 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, sink_comp_class, cc_full_descr->methods.sink.finalize); if (ret) { - BT_LOGE_STR("Cannot set sink component class's finalization method."); - status = BT_PLUGIN_STATUS_NOMEM; + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot set sink component class's finalization method."); + status = BT_FUNC_STATUS_MEMORY_ERROR; BT_OBJECT_PUT_REF_AND_RESET(sink_comp_class); goto end; } @@ -1104,8 +1155,9 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, sink_comp_class, cc_full_descr->methods.sink.query); if (ret) { - BT_LOGE_STR("Cannot set sink component class's query method."); - status = BT_PLUGIN_STATUS_NOMEM; + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot set sink component class's query method."); + status = BT_FUNC_STATUS_MEMORY_ERROR; BT_OBJECT_PUT_REF_AND_RESET(sink_comp_class); goto end; } @@ -1116,8 +1168,9 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, sink_comp_class, cc_full_descr->methods.sink.input_port_connected); if (ret) { - BT_LOGE_STR("Cannot set sink component class's \"input port connected\" method."); - status = BT_PLUGIN_STATUS_NOMEM; + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot set sink component class's \"input port connected\" method."); + status = BT_FUNC_STATUS_MEMORY_ERROR; BT_OBJECT_PUT_REF_AND_RESET(sink_comp_class); goto end; } @@ -1128,8 +1181,9 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, sink_comp_class, cc_full_descr->methods.sink.graph_is_configured); if (ret) { - BT_LOGE_STR("Cannot set sink component class's \"graph is configured\" method."); - status = BT_PLUGIN_STATUS_NOMEM; + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot set sink component class's \"graph is configured\" method."); + status = BT_FUNC_STATUS_MEMORY_ERROR; BT_OBJECT_PUT_REF_AND_RESET(sink_comp_class); goto end; } @@ -1137,7 +1191,7 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, break; default: - abort(); + bt_common_abort(); } /* @@ -1152,12 +1206,14 @@ enum bt_plugin_status bt_plugin_so_init(struct bt_plugin *plugin, (void *) comp_class); BT_OBJECT_PUT_REF_AND_RESET(comp_class); if (status < 0) { - BT_LOGE("Cannot add component class to plugin."); + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot add component class to plugin."); goto end; } } end: + bt_message_iterator_class_put_ref(msg_iter_class); g_array_free(comp_class_full_descriptors, TRUE); return status; } @@ -1177,13 +1233,14 @@ struct bt_plugin *bt_plugin_so_create_empty( plugin->destroy_spec_data = bt_plugin_so_destroy_spec_data; plugin->spec_data = g_new0(struct bt_plugin_so_spec_data, 1); if (!plugin->spec_data) { - BT_LOGE_STR("Failed to allocate one SO plugin specific data structure."); + BT_LIB_LOGE_APPEND_CAUSE( + "Failed to allocate one SO plugin specific data structure."); goto error; } spec = plugin->spec_data; spec->shared_lib_handle = shared_lib_handle; - bt_object_get_no_null_check(spec->shared_lib_handle); + bt_object_get_ref_no_null_check(spec->shared_lib_handle); goto end; error: @@ -1211,7 +1268,7 @@ size_t count_non_null_items_in_section(const void *begin, const void *end) } static -enum bt_plugin_status bt_plugin_so_create_all_from_sections( +int bt_plugin_so_create_all_from_sections( struct bt_plugin_so_shared_lib_handle *shared_lib_handle, bool fail_on_load_error, struct __bt_plugin_descriptor const * const *descriptors_begin, @@ -1224,13 +1281,14 @@ enum bt_plugin_status bt_plugin_so_create_all_from_sections( struct __bt_plugin_component_class_descriptor_attribute const * const *cc_descr_attrs_end, struct bt_plugin_set **plugin_set_out) { - enum bt_plugin_status status = BT_PLUGIN_STATUS_OK; + int status = BT_FUNC_STATUS_OK; size_t descriptor_count; size_t attrs_count; size_t cc_descriptors_count; size_t cc_descr_attrs_count; size_t i; + BT_ASSERT(shared_lib_handle); BT_ASSERT(plugin_set_out); *plugin_set_out = NULL; descriptor_count = count_non_null_items_in_section(descriptors_begin, descriptors_end); @@ -1254,47 +1312,31 @@ enum bt_plugin_status bt_plugin_so_create_all_from_sections( cc_descriptors_count, cc_descr_attrs_count); *plugin_set_out = bt_plugin_set_create(); if (!*plugin_set_out) { - BT_LOGE_STR("Cannot create empty plugin set."); - status = BT_PLUGIN_STATUS_NOMEM; + BT_LIB_LOGE_APPEND_CAUSE("Cannot create empty plugin set."); + status = BT_FUNC_STATUS_MEMORY_ERROR; goto error; } for (i = 0; i < descriptors_end - descriptors_begin; i++) { - enum bt_plugin_status status; const struct __bt_plugin_descriptor *descriptor = descriptors_begin[i]; struct bt_plugin *plugin; - if (descriptor == NULL) { + if (!descriptor) { continue; } - BT_LOGI("Creating plugin object for plugin: " - "name=\"%s\", abi-major=%d, abi-minor=%d", - descriptor->name, descriptor->major, descriptor->minor); - - if (descriptor->major > __BT_PLUGIN_VERSION_MAJOR) { - BT_LOG_WRITE(fail_on_load_error ? BT_LOG_WARN : - BT_LOG_INFO, BT_LOG_TAG, - "Unknown ABI major version: abi-major=%d", - descriptor->major); - - if (fail_on_load_error) { - status = BT_PLUGIN_STATUS_LOADING_ERROR; - goto error; - } else { - continue; - } - } - + BT_LOGI("Creating plugin object for plugin: name=\"%s\"", + descriptor->name); plugin = bt_plugin_so_create_empty(shared_lib_handle); if (!plugin) { - BT_LOGE_STR("Cannot create empty shared library handle."); - status = BT_PLUGIN_STATUS_NOMEM; + BT_LIB_LOGE_APPEND_CAUSE( + "Cannot create empty shared library handle."); + status = BT_FUNC_STATUS_MEMORY_ERROR; goto error; } - if (shared_lib_handle && shared_lib_handle->path) { + if (shared_lib_handle->path) { bt_plugin_set_path(plugin, shared_lib_handle->path->str); } @@ -1303,7 +1345,7 @@ enum bt_plugin_status bt_plugin_so_create_all_from_sections( descriptor, attrs_begin, attrs_end, cc_descriptors_begin, cc_descriptors_end, cc_descr_attrs_begin, cc_descr_attrs_end); - if (status == BT_PLUGIN_STATUS_OK) { + if (status == BT_FUNC_STATUS_OK) { /* Add to plugin set */ bt_plugin_set_add_plugin(*plugin_set_out, plugin); BT_OBJECT_PUT_REF_AND_RESET(plugin); @@ -1313,7 +1355,8 @@ enum bt_plugin_status bt_plugin_so_create_all_from_sections( * `fail_on_load_error`, so this is a "real" * error. */ - BT_LOGW_STR("Cannot initialize SO plugin object from sections."); + BT_LIB_LOGW_APPEND_CAUSE( + "Cannot initialize SO plugin object from sections."); BT_OBJECT_PUT_REF_AND_RESET(plugin); goto error; } @@ -1325,7 +1368,7 @@ enum bt_plugin_status bt_plugin_so_create_all_from_sections( if ((*plugin_set_out)->plugins->len == 0) { BT_OBJECT_PUT_REF_AND_RESET(*plugin_set_out); - status = BT_PLUGIN_STATUS_NOT_FOUND; + status = BT_FUNC_STATUS_NOT_FOUND; } goto end; @@ -1339,18 +1382,17 @@ end: } BT_HIDDEN -enum bt_plugin_status bt_plugin_so_create_all_from_static( - bool fail_on_load_error, +int bt_plugin_so_create_all_from_static(bool fail_on_load_error, struct bt_plugin_set **plugin_set_out) { - enum bt_plugin_status status; + int status; struct bt_plugin_so_shared_lib_handle *shared_lib_handle = NULL; BT_ASSERT(plugin_set_out); *plugin_set_out = NULL; status = bt_plugin_so_shared_lib_handle_create(NULL, &shared_lib_handle); - if (status != BT_PLUGIN_STATUS_OK) { + if (status != BT_FUNC_STATUS_OK) { BT_ASSERT(!shared_lib_handle); goto end; } @@ -1368,7 +1410,7 @@ enum bt_plugin_status bt_plugin_so_create_all_from_static( __bt_get_begin_section_component_class_descriptor_attributes(), __bt_get_end_section_component_class_descriptor_attributes(), plugin_set_out); - BT_ASSERT((status == BT_PLUGIN_STATUS_OK && *plugin_set_out && + BT_ASSERT((status == BT_FUNC_STATUS_OK && *plugin_set_out && (*plugin_set_out)->plugins->len > 0) || !*plugin_set_out); end: @@ -1377,11 +1419,11 @@ end: } BT_HIDDEN -enum bt_plugin_status bt_plugin_so_create_all_from_file(const char *path, +int bt_plugin_so_create_all_from_file(const char *path, bool fail_on_load_error, struct bt_plugin_set **plugin_set_out) { size_t path_len; - enum bt_plugin_status status; + int status; struct __bt_plugin_descriptor const * const *descriptors_begin = NULL; struct __bt_plugin_descriptor const * const *descriptors_end = NULL; struct __bt_plugin_descriptor_attribute const * const *attrs_begin = NULL; @@ -1405,9 +1447,19 @@ enum bt_plugin_status bt_plugin_so_create_all_from_file(const char *path, BT_ASSERT(plugin_set_out); *plugin_set_out = NULL; path_len = strlen(path); - BT_ASSERT_PRE(path_len > PLUGIN_SUFFIX_LEN, - "Path length is too short: path-length=%zu, min-length=%zu", - path_len, PLUGIN_SUFFIX_LEN); + + /* + * An SO plugin file must have a known plugin file suffix. So the file + * path must be longer than the suffix length. + */ + if (path_len <= PLUGIN_SUFFIX_LEN) { + BT_LOGI("Path is too short to be an `.so` or `.la` plugin file:" + "path=%s, path-length=%zu, min-length=%zu", + path, path_len, PLUGIN_SUFFIX_LEN); + status = BT_FUNC_STATUS_NOT_FOUND; + goto end; + } + BT_LOGI("Trying to create all SO plugins from file: path=\"%s\"", path); path_len++; @@ -1424,16 +1476,15 @@ enum bt_plugin_status bt_plugin_so_create_all_from_file(const char *path, if (!is_shared_object && !is_libtool_wrapper) { /* Name indicates this is not a plugin file; not an error */ BT_LOGI("File is not an SO plugin file: path=\"%s\"", path); - status = BT_PLUGIN_STATUS_NOT_FOUND; + status = BT_FUNC_STATUS_NOT_FOUND; goto end; } status = bt_plugin_so_shared_lib_handle_create(path, &shared_lib_handle); - if (status != BT_PLUGIN_STATUS_OK) { + if (status != BT_FUNC_STATUS_OK) { /* bt_plugin_so_shared_lib_handle_create() logs more details */ BT_ASSERT(!shared_lib_handle); - BT_LOGE_STR("Cannot create shared library handle."); goto end; } @@ -1450,7 +1501,7 @@ enum bt_plugin_status bt_plugin_so_create_all_from_file(const char *path, BT_LOGI("Cannot resolve plugin symbol: path=\"%s\", " "symbol=\"%s\"", path, "__bt_get_begin_section_plugin_descriptors"); - status = BT_PLUGIN_STATUS_NOT_FOUND; + status = BT_FUNC_STATUS_NOT_FOUND; goto end; } @@ -1462,13 +1513,20 @@ enum bt_plugin_status bt_plugin_so_create_all_from_file(const char *path, (gpointer *) &get_end_section_plugin_descriptors)) { descriptors_end = get_end_section_plugin_descriptors(); } else { - BT_LOG_WRITE(fail_on_load_error ? BT_LOG_WARN : BT_LOG_INFO, - BT_LOG_TAG, - "Cannot resolve plugin symbol: path=\"%s\", " - "symbol=\"%s\"", path, - "__bt_get_end_section_plugin_descriptors"); - status = fail_on_load_error ? BT_PLUGIN_STATUS_LOADING_ERROR : - BT_PLUGIN_STATUS_NOT_FOUND; + if (fail_on_load_error) { + BT_LIB_LOGW_APPEND_CAUSE( + "Cannot resolve plugin symbol: path=\"%s\", " + "symbol=\"%s\"", path, + "__bt_get_end_section_plugin_descriptors"); + status = BT_FUNC_STATUS_ERROR; + } else { + BT_LIB_LOGW( + "Cannot resolve plugin symbol: path=\"%s\", " + "symbol=\"%s\"", path, + "__bt_get_end_section_plugin_descriptors"); + status = BT_FUNC_STATUS_NOT_FOUND; + } + goto end; } @@ -1491,17 +1549,28 @@ enum bt_plugin_status bt_plugin_so_create_all_from_file(const char *path, } if ((!!attrs_begin - !!attrs_end) != 0) { - BT_LOG_WRITE(fail_on_load_error ? BT_LOG_WARN : BT_LOG_INFO, - BT_LOG_TAG, - "Found section start or end symbol, but not both: " - "path=\"%s\", symbol-start=\"%s\", " - "symbol-end=\"%s\", symbol-start-addr=%p, " - "symbol-end-addr=%p", - path, "__bt_get_begin_section_plugin_descriptor_attributes", - "__bt_get_end_section_plugin_descriptor_attributes", - attrs_begin, attrs_end); - status = fail_on_load_error ? BT_PLUGIN_STATUS_LOADING_ERROR : - BT_PLUGIN_STATUS_NOT_FOUND; + if (fail_on_load_error) { + BT_LIB_LOGW_APPEND_CAUSE( + "Found section start or end symbol, but not both: " + "path=\"%s\", symbol-start=\"%s\", " + "symbol-end=\"%s\", symbol-start-addr=%p, " + "symbol-end-addr=%p", + path, "__bt_get_begin_section_plugin_descriptor_attributes", + "__bt_get_end_section_plugin_descriptor_attributes", + attrs_begin, attrs_end); + status = BT_FUNC_STATUS_ERROR; + } else { + BT_LIB_LOGW( + "Found section start or end symbol, but not both: " + "path=\"%s\", symbol-start=\"%s\", " + "symbol-end=\"%s\", symbol-start-addr=%p, " + "symbol-end-addr=%p", + path, "__bt_get_begin_section_plugin_descriptor_attributes", + "__bt_get_end_section_plugin_descriptor_attributes", + attrs_begin, attrs_end); + status = BT_FUNC_STATUS_NOT_FOUND; + } + goto end; } @@ -1524,17 +1593,28 @@ enum bt_plugin_status bt_plugin_so_create_all_from_file(const char *path, } if ((!!cc_descriptors_begin - !!cc_descriptors_end) != 0) { - BT_LOG_WRITE(fail_on_load_error ? BT_LOG_WARN : BT_LOG_INFO, - BT_LOG_TAG, - "Found section start or end symbol, but not both: " - "path=\"%s\", symbol-start=\"%s\", " - "symbol-end=\"%s\", symbol-start-addr=%p, " - "symbol-end-addr=%p", - path, "__bt_get_begin_section_component_class_descriptors", - "__bt_get_end_section_component_class_descriptors", - cc_descriptors_begin, cc_descriptors_end); - status = fail_on_load_error ? BT_PLUGIN_STATUS_LOADING_ERROR : - BT_PLUGIN_STATUS_NOT_FOUND; + if (fail_on_load_error) { + BT_LIB_LOGW_APPEND_CAUSE( + "Found section start or end symbol, but not both: " + "path=\"%s\", symbol-start=\"%s\", " + "symbol-end=\"%s\", symbol-start-addr=%p, " + "symbol-end-addr=%p", + path, "__bt_get_begin_section_component_class_descriptors", + "__bt_get_end_section_component_class_descriptors", + cc_descriptors_begin, cc_descriptors_end); + status = BT_FUNC_STATUS_ERROR; + } else { + BT_LIB_LOGW( + "Found section start or end symbol, but not both: " + "path=\"%s\", symbol-start=\"%s\", " + "symbol-end=\"%s\", symbol-start-addr=%p, " + "symbol-end-addr=%p", + path, "__bt_get_begin_section_component_class_descriptors", + "__bt_get_end_section_component_class_descriptors", + cc_descriptors_begin, cc_descriptors_end); + status = BT_FUNC_STATUS_NOT_FOUND; + } + goto end; } @@ -1557,17 +1637,28 @@ enum bt_plugin_status bt_plugin_so_create_all_from_file(const char *path, } if ((!!cc_descr_attrs_begin - !!cc_descr_attrs_end) != 0) { - BT_LOG_WRITE(fail_on_load_error ? BT_LOG_WARN : BT_LOG_INFO, - BT_LOG_TAG, - "Found section start or end symbol, but not both: " - "path=\"%s\", symbol-start=\"%s\", " - "symbol-end=\"%s\", symbol-start-addr=%p, " - "symbol-end-addr=%p", - path, "__bt_get_begin_section_component_class_descriptor_attributes", - "__bt_get_end_section_component_class_descriptor_attributes", - cc_descr_attrs_begin, cc_descr_attrs_end); - status = fail_on_load_error ? BT_PLUGIN_STATUS_LOADING_ERROR : - BT_PLUGIN_STATUS_NOT_FOUND; + if (fail_on_load_error) { + BT_LIB_LOGW_APPEND_CAUSE( + "Found section start or end symbol, but not both: " + "path=\"%s\", symbol-start=\"%s\", " + "symbol-end=\"%s\", symbol-start-addr=%p, " + "symbol-end-addr=%p", + path, "__bt_get_begin_section_component_class_descriptor_attributes", + "__bt_get_end_section_component_class_descriptor_attributes", + cc_descr_attrs_begin, cc_descr_attrs_end); + status = BT_FUNC_STATUS_ERROR; + } else { + BT_LIB_LOGW( + "Found section start or end symbol, but not both: " + "path=\"%s\", symbol-start=\"%s\", " + "symbol-end=\"%s\", symbol-start-addr=%p, " + "symbol-end-addr=%p", + path, "__bt_get_begin_section_component_class_descriptor_attributes", + "__bt_get_end_section_component_class_descriptor_attributes", + cc_descr_attrs_begin, cc_descr_attrs_end); + status = BT_FUNC_STATUS_NOT_FOUND; + } + goto end; } @@ -1604,7 +1695,7 @@ void bt_plugin_so_on_add_component_class(struct bt_plugin *plugin, bt_list_add(&comp_class->node, &component_class_list); comp_class->so_handle = spec->shared_lib_handle; - bt_object_get_no_null_check(comp_class->so_handle); + bt_object_get_ref_no_null_check(comp_class->so_handle); /* Add our custom destroy listener */ bt_component_class_add_destroy_listener(comp_class,