Allow a component to remove a port and any user to disconnect one

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

diff --git a/lib/plugin/plugin-so.c b/lib/plugin/plugin-so.c
index 9a2a7cc8cd3c7bdb0cda81d335daba13b38825a0..d5522445464ee2f841dfee5088ca3beac4b49432 100644 (file)
--- a/lib/plugin/plugin-so.c
+++ b/lib/plugin/plugin-so.c
@@ -188,7 +188,7 @@ end:
        return shared_lib_handle;
 }
 
-BT_HIDDEN
+static
 void bt_plugin_so_destroy_spec_data(struct bt_plugin *plugin)
 {
        struct bt_plugin_so_spec_data *spec = plugin->spec_data;
@@ -252,8 +252,9 @@ enum bt_plugin_status bt_plugin_so_init(
                const char *help;
                bt_component_class_init_method init_method;
                bt_component_class_destroy_method destroy_method;
-               bt_component_class_filter_add_iterator_method filter_add_iterator_method;
-               bt_component_class_sink_add_iterator_method sink_add_iterator_method;
+               bt_component_class_query_method query_method;
+               bt_component_class_accept_port_connection_method accept_port_connection_method;
+               bt_component_class_port_disconnected_method port_disconnected_method;
                struct bt_component_class_iterator_methods iterator_methods;
        };
 
@@ -378,13 +379,17 @@ enum bt_plugin_status bt_plugin_so_init(
                                        cc_full_descr->destroy_method =
                                                cur_cc_descr_attr->value.destroy_method;
                                        break;
-                               case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_FILTER_ADD_ITERATOR_METHOD:
-                                       cc_full_descr->filter_add_iterator_method =
-                                               cur_cc_descr_attr->value.filter_add_iterator_method;
+                               case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_QUERY_METHOD:
+                                       cc_full_descr->query_method =
+                                               cur_cc_descr_attr->value.query_method;
+                                       break;
+                               case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_ACCEPT_PORT_CONNECTION_METHOD:
+                                       cc_full_descr->accept_port_connection_method =
+                                               cur_cc_descr_attr->value.accept_port_connection_method;
                                        break;
-                               case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_SINK_ADD_ITERATOR_METHOD:
-                                       cc_full_descr->sink_add_iterator_method =
-                                               cur_cc_descr_attr->value.sink_add_iterator_method;
+                               case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_PORT_DISCONNECTED_METHOD:
+                                       cc_full_descr->port_disconnected_method =
+                                               cur_cc_descr_attr->value.port_disconnected_method;
                                        break;
                                case BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_NOTIF_ITER_INIT_METHOD:
                                        cc_full_descr->iterator_methods.init =
@@ -501,6 +506,36 @@ enum bt_plugin_status bt_plugin_so_init(
                        }
                }
 
+               if (cc_full_descr->query_method) {
+                       ret = bt_component_class_set_query_method(
+                               comp_class, cc_full_descr->query_method);
+                       if (ret) {
+                               status = BT_PLUGIN_STATUS_ERROR;
+                               BT_PUT(comp_class);
+                               goto end;
+                       }
+               }
+
+               if (cc_full_descr->accept_port_connection_method) {
+                       ret = bt_component_class_set_accept_port_connection_method(
+                               comp_class, cc_full_descr->accept_port_connection_method);
+                       if (ret) {
+                               status = BT_PLUGIN_STATUS_ERROR;
+                               BT_PUT(comp_class);
+                               goto end;
+                       }
+               }
+
+               if (cc_full_descr->port_disconnected_method) {
+                       ret = bt_component_class_set_port_disconnected_method(
+                               comp_class, cc_full_descr->port_disconnected_method);
+                       if (ret) {
+                               status = BT_PLUGIN_STATUS_ERROR;
+                               BT_PUT(comp_class);
+                               goto end;
+                       }
+               }
+
                switch (cc_full_descr->descriptor->type) {
                case BT_COMPONENT_CLASS_TYPE_SOURCE:
                        if (cc_full_descr->iterator_methods.init) {
@@ -537,17 +572,6 @@ enum bt_plugin_status bt_plugin_so_init(
                        }
                        break;
                case BT_COMPONENT_CLASS_TYPE_FILTER:
-                       if (cc_full_descr->filter_add_iterator_method) {
-                               ret = bt_component_class_filter_set_add_iterator_method(
-                                       comp_class,
-                                       cc_full_descr->filter_add_iterator_method);
-                               if (ret) {
-                                       status = BT_PLUGIN_STATUS_ERROR;
-                                       BT_PUT(comp_class);
-                                       goto end;
-                               }
-                       }
-
                        if (cc_full_descr->iterator_methods.init) {
                                ret = bt_component_class_filter_set_notification_iterator_init_method(
                                        comp_class,
@@ -582,16 +606,6 @@ enum bt_plugin_status bt_plugin_so_init(
                        }
                        break;
                case BT_COMPONENT_CLASS_TYPE_SINK:
-                       if (cc_full_descr->sink_add_iterator_method) {
-                               ret = bt_component_class_sink_set_add_iterator_method(
-                                       comp_class,
-                                       cc_full_descr->sink_add_iterator_method);
-                               if (ret) {
-                                       status = BT_PLUGIN_STATUS_ERROR;
-                                       BT_PUT(comp_class);
-                                       goto end;
-                               }
-                       }
                        break;
                default:
                        assert(false);
@@ -643,6 +657,7 @@ struct bt_plugin *bt_plugin_so_create_empty(
                goto error;
        }
 
+       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) {
                goto error;