X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fplugin%2Fplugin.c;h=434bb3ea5a0d43fa510d894c909a09f0ef8fba14;hb=7cbfb97d31328c7d3543f9d3a803133e6d9adcef;hp=24b3aef9bbcc44a89bb301fec3c2bc5146c929d4;hpb=7c7301d5827bd10ec7c34da7ffc5fe74e5047d38;p=babeltrace.git diff --git a/src/lib/plugin/plugin.c b/src/lib/plugin/plugin.c index 24b3aef9..434bb3ea 100644 --- a/src/lib/plugin/plugin.c +++ b/src/lib/plugin/plugin.c @@ -1,43 +1,27 @@ /* + * SPDX-License-Identifier: MIT + * * Copyright 2017-2018 Philippe Proulx * Copyright 2016 Jérémie Galarneau - * - * Author: Jérémie Galarneau - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. */ #define BT_LOG_TAG "LIB/PLUGIN" #include "lib/logging.h" #include "common/assert.h" -#include "lib/assert-pre.h" +#include "lib/assert-cond.h" #include "common/macros.h" #include "compat/compiler.h" +#include "compat/limits.h" #include "common/common.h" -#include -#include -#include +#include +#include +#include #include "lib/graph/component-class.h" #include #include #include +#include #include #include #include @@ -171,14 +155,14 @@ void fini_python_plugin_provider(void) { uint64_t bt_plugin_set_get_plugin_count(const struct bt_plugin_set *plugin_set) { - BT_ASSERT_PRE_DEV_NON_NULL(plugin_set, "Plugin set"); + BT_ASSERT_PRE_DEV_PLUGIN_SET_NON_NULL(plugin_set); return (uint64_t) plugin_set->plugins->len; } const struct bt_plugin *bt_plugin_set_borrow_plugin_by_index_const( const struct bt_plugin_set *plugin_set, uint64_t index) { - BT_ASSERT_PRE_DEV_NON_NULL(plugin_set, "Plugin set"); + BT_ASSERT_PRE_DEV_PLUGIN_SET_NON_NULL(plugin_set); BT_ASSERT_PRE_DEV_VALID_INDEX(index, plugin_set->plugins->len); return g_ptr_array_index(plugin_set->plugins, index); } @@ -187,6 +171,8 @@ enum bt_plugin_find_all_from_static_status bt_plugin_find_all_from_static( bt_bool fail_on_load_error, const struct bt_plugin_set **plugin_set_out) { + BT_ASSERT_PRE_NO_ERROR(); + /* bt_plugin_so_create_all_from_static() logs errors */ return bt_plugin_so_create_all_from_static(fail_on_load_error, (void *) plugin_set_out); @@ -198,8 +184,9 @@ enum bt_plugin_find_all_from_file_status bt_plugin_find_all_from_file( { enum bt_plugin_find_all_from_file_status status; - BT_ASSERT_PRE_NON_NULL(path, "Path"); - BT_ASSERT_PRE_NON_NULL(path, "Plugin set (output)"); + BT_ASSERT_PRE_NO_ERROR(); + BT_ASSERT_PRE_NON_NULL("path", path, "Path"); + BT_ASSERT_PRE_PLUGIN_SET_OUT_NON_NULL(path); BT_LOGI("Creating plugins from file: path=\"%s\"", path); /* Try shared object plugins */ @@ -281,7 +268,8 @@ enum bt_plugin_find_all_status bt_plugin_find_all(bt_bool find_in_std_env_var, int status = BT_FUNC_STATUS_OK; uint64_t dir_i, plugin_i; - BT_ASSERT_PRE_NON_NULL(plugin_set_out, "Plugin set (output)"); + BT_ASSERT_PRE_NO_ERROR(); + BT_ASSERT_PRE_PLUGIN_SET_OUT_NON_NULL(plugin_set_out); BT_LOGI("Finding all plugins in standard directories and built-in plugins: " "find-in-std-env-var=%d, find-in-user-dir=%d, " "find-in-sys-dir=%d, find-in-static=%d", @@ -464,8 +452,9 @@ enum bt_plugin_find_status bt_plugin_find(const char *plugin_name, const struct bt_plugin_set *plugin_set = NULL; uint64_t i; - BT_ASSERT_PRE_NON_NULL(plugin_name, "Name"); - BT_ASSERT_PRE_NON_NULL(plugin_out, "Plugin (output)"); + BT_ASSERT_PRE_NO_ERROR(); + BT_ASSERT_PRE_NAME_NON_NULL(plugin_name); + BT_ASSERT_PRE_PLUGIN_OUT_NON_NULL(plugin_out); BT_LOGI("Finding named plugin in standard directories and built-in plugins: " "name=\"%s\", find-in-std-env-var=%d, find-in-user-dir=%d, " "find-in-sys-dir=%d, find-in-static=%d", @@ -620,7 +609,7 @@ int bt_plugin_create_append_all_from_dir(struct bt_plugin_set *plugin_set, ": path=\"%s\", recurse=%d", path, recurse); (void) BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_UNKNOWN( - "Babeltrace library", + BT_LIB_LOG_LIBBABELTRACE2_NAME, "Cannot open directory: path=\"%s\", recurse=%d", path, recurse); status = BT_FUNC_STATUS_ERROR; @@ -665,7 +654,8 @@ enum bt_plugin_find_all_from_dir_status bt_plugin_find_all_from_dir( enum bt_plugin_find_all_from_dir_status status = BT_FUNC_STATUS_OK; - BT_ASSERT_PRE_NON_NULL(plugin_set_out, "Plugin set (output)"); + BT_ASSERT_PRE_NO_ERROR(); + BT_ASSERT_PRE_PLUGIN_SET_OUT_NON_NULL(plugin_set_out); BT_LOGI("Creating all plugins in directory: path=\"%s\", recurse=%d", path, recurse); *plugin_set_out = bt_plugin_set_create(); @@ -717,31 +707,31 @@ end: const char *bt_plugin_get_name(const struct bt_plugin *plugin) { - BT_ASSERT_PRE_DEV_NON_NULL(plugin, "Plugin"); + BT_ASSERT_PRE_DEV_PLUGIN_NON_NULL(plugin); return plugin->info.name_set ? plugin->info.name->str : NULL; } const char *bt_plugin_get_author(const struct bt_plugin *plugin) { - BT_ASSERT_PRE_DEV_NON_NULL(plugin, "Plugin"); + BT_ASSERT_PRE_DEV_PLUGIN_NON_NULL(plugin); return plugin->info.author_set ? plugin->info.author->str : NULL; } const char *bt_plugin_get_license(const struct bt_plugin *plugin) { - BT_ASSERT_PRE_DEV_NON_NULL(plugin, "Plugin"); + BT_ASSERT_PRE_DEV_PLUGIN_NON_NULL(plugin); return plugin->info.license_set ? plugin->info.license->str : NULL; } const char *bt_plugin_get_path(const struct bt_plugin *plugin) { - BT_ASSERT_PRE_DEV_NON_NULL(plugin, "Plugin"); + BT_ASSERT_PRE_DEV_PLUGIN_NON_NULL(plugin); return plugin->info.path_set ? plugin->info.path->str : NULL; } const char *bt_plugin_get_description(const struct bt_plugin *plugin) { - BT_ASSERT_PRE_DEV_NON_NULL(plugin, "Plugin"); + BT_ASSERT_PRE_DEV_PLUGIN_NON_NULL(plugin); return plugin->info.description_set ? plugin->info.description->str : NULL; } @@ -753,7 +743,7 @@ enum bt_property_availability bt_plugin_get_version(const struct bt_plugin *plug enum bt_property_availability avail = BT_PROPERTY_AVAILABILITY_AVAILABLE; - BT_ASSERT_PRE_DEV_NON_NULL(plugin, "Plugin"); + BT_ASSERT_PRE_DEV_PLUGIN_NON_NULL(plugin); if (!plugin->info.version_set) { BT_LIB_LOGD("Plugin's version is not set: %!+l", plugin); @@ -783,19 +773,19 @@ end: uint64_t bt_plugin_get_source_component_class_count(const struct bt_plugin *plugin) { - BT_ASSERT_PRE_DEV_NON_NULL(plugin, "Plugin"); + BT_ASSERT_PRE_DEV_PLUGIN_NON_NULL(plugin); return (uint64_t) plugin->src_comp_classes->len; } uint64_t bt_plugin_get_filter_component_class_count(const struct bt_plugin *plugin) { - BT_ASSERT_PRE_DEV_NON_NULL(plugin, "Plugin"); + BT_ASSERT_PRE_DEV_PLUGIN_NON_NULL(plugin); return (uint64_t) plugin->flt_comp_classes->len; } uint64_t bt_plugin_get_sink_component_class_count(const struct bt_plugin *plugin) { - BT_ASSERT_PRE_DEV_NON_NULL(plugin, "Plugin"); + BT_ASSERT_PRE_DEV_PLUGIN_NON_NULL(plugin); return (uint64_t) plugin->sink_comp_classes->len; } @@ -804,7 +794,7 @@ struct bt_component_class *borrow_component_class_by_index( const struct bt_plugin *plugin, GPtrArray *comp_classes, uint64_t index) { - BT_ASSERT_PRE_DEV_NON_NULL(plugin, "Plugin"); + BT_ASSERT_PRE_DEV_PLUGIN_NON_NULL(plugin); BT_ASSERT_PRE_DEV_VALID_INDEX(index, comp_classes->len); return g_ptr_array_index(comp_classes, index); } @@ -841,8 +831,8 @@ struct bt_component_class *borrow_component_class_by_name( struct bt_component_class *comp_class = NULL; size_t i; - BT_ASSERT_PRE_DEV_NON_NULL(plugin, "Plugin"); - BT_ASSERT_PRE_DEV_NON_NULL(name, "Name"); + BT_ASSERT_PRE_DEV_PLUGIN_NON_NULL(plugin); + BT_ASSERT_PRE_DEV_NAME_NON_NULL(name); for (i = 0; i < comp_classes->len; i++) { struct bt_component_class *comp_class_candidate =