/*
+ * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
* Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- * Copyright 2017 Philippe Proulx <pproulx@efficios.com>
*
* Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
*
#define BT_LOG_TAG "PLUGIN-SO"
#include <babeltrace/lib-logging-internal.h>
+#include <babeltrace/assert-internal.h>
+#include <babeltrace/assert-pre-internal.h>
#include <babeltrace/compiler-internal.h>
-#include <babeltrace/object.h>
#include <babeltrace/plugin/plugin-internal.h>
#include <babeltrace/plugin/plugin-so-internal.h>
#include <babeltrace/plugin/plugin-dev.h>
#include <babeltrace/plugin/plugin-internal.h>
#include <babeltrace/graph/component-class-internal.h>
-#include <babeltrace/graph/private-component-class.h>
-#include <babeltrace/graph/private-component-class-source.h>
-#include <babeltrace/graph/private-component-class-filter.h>
-#include <babeltrace/graph/private-component-class-sink.h>
+#include <babeltrace/graph/component-class.h>
+#include <babeltrace/graph/component-class-source.h>
+#include <babeltrace/graph/component-class-filter.h>
+#include <babeltrace/graph/component-class-sink.h>
#include <babeltrace/types.h>
#include <babeltrace/list-internal.h>
-#include <babeltrace/assert-internal.h>
#include <string.h>
#include <stdlib.h>
#include <glib.h>
*
* 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
* 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\"",
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_output_port_disconnected_method output_port_disconnected;
+ bt_component_class_source_message_iterator_init_method msg_iter_init;
+ bt_component_class_source_message_iterator_finalize_method msg_iter_finalize;
} 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_input_port_disconnected_method input_port_disconnected;
+ bt_component_class_filter_output_port_disconnected_method output_port_disconnected;
+ bt_component_class_filter_message_iterator_init_method msg_iter_init;
+ bt_component_class_filter_message_iterator_finalize_method msg_iter_finalize;
} 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_input_port_disconnected_method input_port_disconnected;
} sink;
} methods;
};
abort();
}
break;
- case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_NOTIF_ITER_INIT_METHOD:
+ 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.notif_iter_init =
- cur_cc_descr_attr->value.source_notif_iter_init_method;
+ 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.notif_iter_init =
- cur_cc_descr_attr->value.filter_notif_iter_init_method;
+ cc_full_descr->methods.filter.msg_iter_init =
+ cur_cc_descr_attr->value.filter_msg_iter_init_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_FINALIZE_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_finalize =
+ cur_cc_descr_attr->value.source_msg_iter_finalize_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_finalize =
+ cur_cc_descr_attr->value.filter_msg_iter_finalize_method;
break;
default:
abort();
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\", "
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:
}
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.");
}
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.");
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) {
}
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) {
}
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) {
}
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) {
}
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) {
}
if (cc_full_descr->methods.source.output_port_disconnected) {
- ret = bt_private_component_class_source_set_output_port_disconnected_method(
+ ret = bt_component_class_source_set_output_port_disconnected_method(
src_comp_class,
cc_full_descr->methods.source.output_port_disconnected);
if (ret) {
}
}
- 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_init) {
+ ret = bt_component_class_source_set_message_iterator_init_method(
src_comp_class,
- cc_full_descr->methods.source.notif_iter_init);
+ cc_full_descr->methods.source.msg_iter_init);
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 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_finalize) {
- ret = bt_private_component_class_source_set_notification_iterator_finalize_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_finalize);
+ cc_full_descr->methods.source.msg_iter_finalize);
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 finalization method.");
status = BT_PLUGIN_STATUS_ERROR;
BT_OBJECT_PUT_REF_AND_RESET(src_comp_class);
goto end;
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) {
}
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) {
}
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) {
}
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) {
}
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) {
}
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) {
}
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) {
}
if (cc_full_descr->methods.filter.input_port_disconnected) {
- ret = bt_private_component_class_filter_set_input_port_disconnected_method(
+ ret = bt_component_class_filter_set_input_port_disconnected_method(
flt_comp_class,
cc_full_descr->methods.filter.input_port_disconnected);
if (ret) {
}
if (cc_full_descr->methods.filter.output_port_disconnected) {
- ret = bt_private_component_class_filter_set_output_port_disconnected_method(
+ ret = bt_component_class_filter_set_output_port_disconnected_method(
flt_comp_class,
cc_full_descr->methods.filter.output_port_disconnected);
if (ret) {
}
}
- 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_init) {
+ ret = bt_component_class_filter_set_message_iterator_init_method(
flt_comp_class,
- cc_full_descr->methods.filter.notif_iter_init);
+ cc_full_descr->methods.filter.msg_iter_init);
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 initialization 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_finalize) {
+ ret = bt_component_class_filter_set_message_iterator_finalize_method(
flt_comp_class,
- cc_full_descr->methods.filter.notif_iter_finalize);
+ cc_full_descr->methods.filter.msg_iter_finalize);
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 finalization method.");
status = BT_PLUGIN_STATUS_ERROR;
BT_OBJECT_PUT_REF_AND_RESET(flt_comp_class);
goto end;
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) {
}
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) {
}
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) {
}
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) {
}
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) {
}
if (cc_full_descr->methods.sink.input_port_disconnected) {
- ret = bt_private_component_class_sink_set_input_port_disconnected_method(
+ ret = bt_component_class_sink_set_input_port_disconnected_method(
sink_comp_class,
cc_full_descr->methods.sink.input_port_disconnected);
if (ret) {
}
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:
* _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",
* _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.");
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,
projects / babeltrace.git / blobdiff