Put Python plugin support in a separate shared object

[babeltrace.git] / lib / component / component-class.c

diff --git a/lib/component/component-class.c b/lib/component/component-class.c
index 4e337e030876fd5accb698f7a405817d873e64f3..0843e0c25d71030ff327fefb6bf4ccaf79bbd59f 100644 (file)
--- a/lib/component/component-class.c
+++ b/lib/component/component-class.c
@@ -228,18 +228,36 @@ end:
        return ret;
 }
 
-int bt_component_class_set_query_info_method(
+int bt_component_class_set_query_method(
                struct bt_component_class *component_class,
-               bt_component_class_query_info_method query_info_method)
+               bt_component_class_query_method query_method)
 {
        int ret = 0;
 
-       if (!component_class || component_class->frozen || !query_info_method) {
+       if (!component_class || component_class->frozen || !query_method) {
                ret = -1;
                goto end;
        }
 
-       component_class->methods.query_info = query_info_method;
+       component_class->methods.query = query_method;
+
+end:
+       return ret;
+}
+
+int bt_component_class_set_new_connection_method(
+               struct bt_component_class *component_class,
+               bt_component_class_new_connection_method new_connection_method)
+{
+       int ret = 0;
+
+       if (!component_class || component_class->frozen ||
+                       !new_connection_method) {
+               ret = -1;
+               goto end;
+       }
+
+       component_class->methods.new_connection_method = new_connection_method;
 
 end:
        return ret;
@@ -481,51 +499,6 @@ end:
        return ret;
 }
 
-extern int bt_component_class_sink_set_add_iterator_method(
-               struct bt_component_class *component_class,
-               bt_component_class_sink_add_iterator_method add_iterator_method)
-{
-       struct bt_component_class_sink *sink_class;
-       int ret = 0;
-
-       if (!component_class || component_class->frozen ||
-                       !add_iterator_method ||
-                       component_class->type != BT_COMPONENT_CLASS_TYPE_SINK) {
-               ret = -1;
-               goto end;
-       }
-
-       sink_class = container_of(component_class,
-               struct bt_component_class_sink, parent);
-       sink_class->methods.add_iterator = add_iterator_method;
-
-end:
-       return ret;
-}
-
-extern int bt_component_class_filter_set_add_iterator_method(
-               struct bt_component_class *component_class,
-               bt_component_class_filter_add_iterator_method add_iterator_method)
-{
-       struct bt_component_class_filter *filter_class;
-       int ret = 0;
-
-       if (!component_class || component_class->frozen ||
-                       !add_iterator_method ||
-                       component_class->type !=
-                       BT_COMPONENT_CLASS_TYPE_FILTER) {
-               ret = -1;
-               goto end;
-       }
-
-       filter_class = container_of(component_class,
-               struct bt_component_class_filter, parent);
-       filter_class->methods.add_iterator = add_iterator_method;
-
-end:
-       return ret;
-}
-
 int bt_component_class_freeze(
                struct bt_component_class *component_class)
 {
@@ -542,19 +515,19 @@ end:
        return ret;
 }
 
-struct bt_value *bt_component_class_query_info(
+struct bt_value *bt_component_class_query(
                struct bt_component_class *component_class,
-               const char *action, struct bt_value *params)
+               const char *object, struct bt_value *params)
 {
        struct bt_value *results = NULL;
 
-       if (!component_class || !action || !params ||
-                       !component_class->methods.query_info) {
+       if (!component_class || !object || !params ||
+                       !component_class->methods.query) {
                goto end;
        }
 
-       results = component_class->methods.query_info(component_class,
-               action, params);
+       results = component_class->methods.query(component_class,
+               object, params);
 
 end:
        return results;