Strip babeltrace.c

[babeltrace.git] / plugins / source.c

diff --git a/plugins/source.c b/plugins/source.c
index 6b115abeede46b34b3c9974a06e6666353367174..ed3b1642b56c2d76e5b8032771acdfa0a67009c0 100644 (file)
--- a/plugins/source.c
+++ b/plugins/source.c
@@ -1,7 +1,7 @@
 /*
  * source.c
  *
- * Babeltrace Source Plugin
+ * Babeltrace Source Component
  *
  * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
@@ -26,48 +26,82 @@
  * SOFTWARE.
  */
 
+#include <babeltrace/ref.h>
 #include <babeltrace/compiler.h>
 #include <babeltrace/plugin/source-internal.h>
-#include <babeltrace/plugin/plugin-internal.h>
+#include <babeltrace/plugin/component-internal.h>
+#include <babeltrace/plugin/notification/iterator.h>
+#include <babeltrace/plugin/notification/iterator-internal.h>
 
 static
-void bt_plugin_source_destroy(struct bt_plugin *plugin)
+void bt_component_source_destroy(struct bt_component *component)
 {
-       struct bt_plugin_source *source;
+       return;
+}
 
-       if (!plugin) {
-               return;
+BT_HIDDEN
+enum bt_component_status bt_component_source_validate(
+               struct bt_component *component)
+{
+       return BT_COMPONENT_STATUS_OK;
+}
+
+BT_HIDDEN
+struct bt_component *bt_component_source_create(
+               struct bt_component_class *class, struct bt_value *params)
+{
+       struct bt_component_source *source = NULL;
+       enum bt_component_status ret;
+
+       source = g_new0(struct bt_component_source, 1);
+       if (!source) {
+               goto end;
        }
 
-       source = container_of(plugin, struct bt_plugin_source, parent);
-       g_free(source);
+       ret = bt_component_init(&source->parent, bt_component_source_destroy);
+       if (ret != BT_COMPONENT_STATUS_OK) {
+               BT_PUT(source);
+               goto end;
+       }
+end:
+       return source ? &source->parent : NULL;
 }
 
-struct bt_plugin *bt_plugin_source_create(const char *name,
-               void *private_data, bt_plugin_destroy_cb destroy_func,
-               bt_plugin_source_iterator_create_cb iterator_create_cb)
+struct bt_notification_iterator *bt_component_source_create_iterator(
+               struct bt_component *component)
 {
-       struct bt_plugin_source *source = NULL;
-       enum bt_plugin_status ret;
+       enum bt_component_status ret_component;
+       enum bt_notification_iterator_status ret_iterator;
+       struct bt_component_source *source;
+       struct bt_notification_iterator *iterator = NULL;
 
-       if (!iterator_create_cb) {
+       if (!component) {
                goto end;
        }
 
-       source = g_new0(struct bt_plugin_source, 1);
-       if (!source) {
+       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_SOURCE) {
                goto end;
        }
 
-       ret = bt_plugin_init(&source->parent, name, private_data,
-               destroy_func, BT_PLUGIN_TYPE_SOURCE, bt_plugin_source_destroy);
-       if (ret != BT_PLUGIN_STATUS_OK) {
-               g_free(source);
-               source = NULL;
+       iterator = bt_notification_iterator_create(component);
+       if (!iterator) {
                goto end;
        }
 
-       source->create_iterator = iterator_create_cb;
+       source = container_of(component, struct bt_component_source, parent);
+       assert(source->init_iterator);
+       ret_component = source->init_iterator(component, iterator);
+       if (ret_component != BT_COMPONENT_STATUS_OK) {
+               goto error;
+       }
+
+       ret_iterator = bt_notification_iterator_validate(iterator);
+       if (ret_iterator != BT_NOTIFICATION_ITERATOR_STATUS_OK) {
+               goto error;
+       }
 end:
-       return source ? &source->parent : NULL;
+       return iterator;
+error:
+       BT_PUT(iterator);
+       return iterator;
 }