lib: remove plugin's ABI version

[babeltrace.git] / src / lib / plugin / plugin-so.c

diff --git a/src/lib/plugin/plugin-so.c b/src/lib/plugin/plugin-so.c
index 0f6ec1c6fb5140466a80866880873d9b16e69ed6..bbd91692df285045695ff6eec2492b973b1aefa6 100644 (file)
--- a/src/lib/plugin/plugin-so.c
+++ b/src/lib/plugin/plugin-so.c
@@ -959,51 +959,27 @@ int bt_plugin_so_init(struct bt_plugin *plugin,
                        }
 
                        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_LIB_LOGE_APPEND_CAUSE(
-                                               "Cannot set source component class's message iterator \"seek nanoseconds from origin\" 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_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_LIB_LOGE_APPEND_CAUSE(
-                                               "Cannot set source component class's message iterator \"seek beginning\" 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_can_seek_ns_from_origin) {
-                               ret = bt_component_class_source_set_message_iterator_can_seek_ns_from_origin_method(
+                               ret = bt_component_class_source_set_message_iterator_seek_ns_from_origin_methods(
                                        src_comp_class,
+                                       cc_full_descr->methods.source.msg_iter_seek_ns_from_origin,
                                        cc_full_descr->methods.source.msg_iter_can_seek_ns_from_origin);
                                if (ret) {
                                        BT_LIB_LOGE_APPEND_CAUSE(
-                                               "Cannot set source component class's message iterator \"can seek nanoseconds from origin\" method.");
+                                               "Cannot set source component class's message iterator \"seek nanoseconds from origin\" methods.");
                                        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_can_seek_beginning) {
-                               ret = bt_component_class_source_set_message_iterator_can_seek_beginning_method(
+                       if (cc_full_descr->methods.source.msg_iter_seek_beginning) {
+                               ret = bt_component_class_source_set_message_iterator_seek_beginning_methods(
                                        src_comp_class,
+                                       cc_full_descr->methods.source.msg_iter_seek_beginning,
                                        cc_full_descr->methods.source.msg_iter_can_seek_beginning);
                                if (ret) {
                                        BT_LIB_LOGE_APPEND_CAUSE(
-                                               "Cannot set source component class's message iterator \"can seek beginning\" method.");
+                                               "Cannot set source component class's message iterator \"seek beginning\" methods.");
                                        status = BT_FUNC_STATUS_MEMORY_ERROR;
                                        BT_OBJECT_PUT_REF_AND_RESET(src_comp_class);
                                        goto end;
@@ -1117,51 +1093,27 @@ int bt_plugin_so_init(struct bt_plugin *plugin,
                        }
 
                        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_LIB_LOGE_APPEND_CAUSE(
-                                               "Cannot set filter component class's message iterator \"seek nanoseconds from origin\" 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_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_LIB_LOGE_APPEND_CAUSE(
-                                               "Cannot set filter component class's message iterator \"seek beginning\" 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(
+                               ret = bt_component_class_filter_set_message_iterator_seek_ns_from_origin_methods(
                                        flt_comp_class,
+                                       cc_full_descr->methods.filter.msg_iter_seek_ns_from_origin,
                                        cc_full_descr->methods.filter.msg_iter_can_seek_ns_from_origin);
                                if (ret) {
                                        BT_LIB_LOGE_APPEND_CAUSE(
-                                               "Cannot set filter component class's message iterator \"can seek nanoseconds from origin\" method.");
+                                               "Cannot set filter component class's message iterator \"seek nanoseconds from origin\" methods.");
                                        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_beginning) {
-                               ret = bt_component_class_filter_set_message_iterator_can_seek_beginning_method(
+                       if (cc_full_descr->methods.filter.msg_iter_seek_beginning) {
+                               ret = bt_component_class_filter_set_message_iterator_seek_beginning_methods(
                                        flt_comp_class,
+                                       cc_full_descr->methods.filter.msg_iter_seek_beginning,
                                        cc_full_descr->methods.filter.msg_iter_can_seek_beginning);
                                if (ret) {
                                        BT_LIB_LOGE_APPEND_CAUSE(
-                                               "Cannot set filter component class's message iterator \"can seek beginning\" method.");
+                                               "Cannot set filter component class's message iterator \"seek beginning\" methods.");
                                        status = BT_FUNC_STATUS_MEMORY_ERROR;
                                        BT_OBJECT_PUT_REF_AND_RESET(flt_comp_class);
                                        goto end;
@@ -1298,7 +1250,7 @@ struct bt_plugin *bt_plugin_so_create_empty(
 
        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:
@@ -1384,25 +1336,8 @@ int bt_plugin_so_create_all_from_sections(
                        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) {
-                       if (fail_on_load_error) {
-                               BT_LIB_LOGW_APPEND_CAUSE(
-                                       "Unknown ABI major version: abi-major=%d",
-                                               descriptor->major);
-                               status = BT_FUNC_STATUS_ERROR;
-                               goto error;
-                       } else {
-                               BT_LIB_LOGW(
-                                       "Unknown ABI major version: abi-major=%d",
-                                               descriptor->major);
-                               continue;
-                       }
-               }
-
+               BT_LOGI("Creating plugin object for plugin: name=\"%s\"",
+                       descriptor->name);
                plugin = bt_plugin_so_create_empty(shared_lib_handle);
                if (!plugin) {
                        BT_LIB_LOGE_APPEND_CAUSE(
@@ -1770,7 +1705,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,