Decouple component class from plugin subsystem, remove component factory

This is a refactoring of the component class and plugin subsystems of
Babeltrace 2. There's not much new code, it's mostly moved from one
file to another and some functions are renamed.

The goal of this patch is to decouple the component class objects from
plugin objects, that is, remove the dependency from the component class
to the plugin. This reference is not necessary, as component classes
can be provided by many sources, a plugin being one of them. A similar
plugin subsystem could be implemented outside of the Babeltrace library
with plugin-agnostic component class objects.

Also the component factory concept is completely removed. At the end
of this refactoring, it's nothing more than a hash table, so the name
is bad, and the object itself is just a very basic util.

Summary of changes:

* You can create a bt_component_class object manually with
  bt_component_class_create(). The function accepts the same parameters
  as before, except for a plugin reference.

* Internal code can use bt_component_class_add_destroy_listener() to add
  a custom destroy listener to a component class. Destroy listeners are
  called in reverse order just before the component class is destroyed
  when its last reference is dropped.

  This is needed to implement the plugin subsystem. It could be made
  public eventually to allow a custom component class provider system
  similar to the Babeltrace plugin subsystem. It could be generalized to
  bt_object_add_destroy_listener() or bt_add_destroy_listener().

* bt_component_class_get_plugin() is removed.

* There are three functions to create a bt_plugin object (in
  `babeltrace/plugin/plugin.h`):

  * bt_plugin_create_from_file(): Accepts a path and creates a plugin
    object from this single file. This must be a `.so` or `.la` file for
    the moment, but eventually we can support other plugins like Python
    plugins `.py`, Windows DLLs `.dll`, etc.

  * bt_plugin_create_all_from_dir(): Traverses a directory, optionally
    recursively, and creates one plugin object for each shared library
    found. Errors are ignored in this function because it's possible
    that a shared library in this directoy is not a Babeltrace plugin
    and we still want to continue the search.

    The return value is a NULL-terminated array of bt_plugin objects
    which the caller must free. Each plugin object in this array has its
    reference count set to 1.

  * bt_plugin_create_all_from_static(): Loads all the plugins found in
    the static sections of the Babeltrace binary. The return value has
    the same format as with bt_plugin_create_all_from_dir().

  There is no way to create an "empty", fresh bt_plugin object. It's
  always created from an existing file in the end.

* A bt_plugin object is a simple provider of component classes. Once
  it's created with one of the three functions above, you can access its
  global properties (name, license, description, etc.), as well as its
  component classes with bt_plugin_get_component_class_count(),
  bt_plugin_get_component_class(), and
  bt_plugin_get_component_class_by_name_and_type().

  The initialization function of a plugin can add new component classes
  to a bt_plugin object (passed as a parameter) thanks to the new
  bt_plugin_add_component_class() function. This function is exclusive
  to a plugin's initialization stage: once the initialization is done,
  the plugin is marked as frozen, and you cannot call
  bt_plugin_add_component_class() again on this plugin. This ensures
  that all the contained component classes were created by the plugin's
  code itself.

  There's a mechanism which involves a global hash table of
  component class adresses to shared library handles and a custom
  component class destroy listener to ensure that, even if a bt_plugin
  object is destroyed (reference count falls to zero), its associated
  shared library is not closed until all its component classes are
  also destroyed. See plugin.c:89 for more details.

* All the headers related to components, component classes, and
  notifications are moved to `babeltrace/component`. Plugin-specific
  headers are in `babeltrace/plugin`.

* Plugin development macros are in `babeltrace/plugin/plugin-dev.h`
  (instead of `plugin-macros.h`). This is the header that any plugin's
  main source file must include.

  * Two new function typedefs in `plugin-dev.h`:

    * bt_plugin_init_func: plugin's initialization function which
      accepts a plugin object to which to add component classes.

      You can set such a function with BT_PLUGIN_INIT().

    * bt_plugin_exit_func: plugin's exit function, if anything global to
      the plugin must be freed/released.

      This is not called when the bt_plugin object is destroyed: because
      component classes could still be alive when this happens, it's
      called just before the shared library is closed (when it is
      guaranteed that no user code found in this plugin will be called
      in the future of this process).

      You can set such a function with BT_PLUGIN_EXIT().

  * The BT_PLUGIN_COMPONENT_CLASS_*_ENTRY() macros create a component
    class of the associated type with bt_component_class_create(), and
    add it to the plugin object with bt_plugin_add_component_class().

    You can also do this manually in a custom initialization function.
    When you use BT_PLUGIN_COMPONENT_CLASSES_BEGIN and
    BT_PLUGIN_COMPONENT_CLASSES_END, BT_PLUGIN_INIT() and
    BT_PLUGIN_EXIT() (no-op exit function) are automatically used.

* Everything found in `babeltrace/plugin/plugin-system.h` is moved to
  the appropriate headers, depending on the types of the objects.

* Plugins, tests, and internal code are updated to use the new macros
  and header files.

* The converter is updated to use the updated subsystems instead of
  relying on a component factory.

  A global GLib pointer array is used to keep the currently loaded
  plugins. This is used instead of the component factory. When a new
  plugin is found, we check in this array if it was already added (same
  name) from another file or statically before adding it.

  The static find_plugin() and find_component_class() are the equivalent
  of the component factory interface.

  print_component_classes_found() also prints the number of loaded
  plugins.

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/configure.ac b/configure.ac
index bc04b288b9c859cdf2764214a9faa8670677a821..25ad0ac582091cfaae96bdbfac880e55f0e084be 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -349,8 +349,11 @@ AC_SUBST(babeltracectfirincludedir)
 babeltracepluginincludedir="${includedir}/babeltrace/plugin"
 AC_SUBST(babeltracepluginincludedir)
 
-# Add a rule to $program_transform_name to rename babeltrace.bin to babeltrace on installation
+babeltracecomponentincludedir="${includedir}/babeltrace/component"
+AC_SUBST(babeltracecomponentincludedir)
+
 program_transform_name="s&babeltrace\.bin&babeltrace&;$program_transform_name"
+AC_SUBST(program_transform_name)
 
 # check for Doxygen
 AC_ARG_ENABLE(
@@ -402,8 +405,9 @@ AC_CONFIG_FILES([
        doc/images/Makefile
        lib/Makefile
        lib/prio_heap/Makefile
-       lib/plugin-system/Makefile
-       lib/plugin-system/notification/Makefile
+       lib/plugin/Makefile
+        lib/component/Makefile
+       lib/component/notification/Makefile
        include/Makefile
        bindings/Makefile
        bindings/python/Makefile

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index af789b1856f849bb186eafbf7eaba04d3710b4a1..f884467eae97bfb3e7d9ff07e5f381e0b2ac8f29 100644 (file)
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -27,10 +27,13 @@
  */
 
 #include <babeltrace/babeltrace.h>
-#include <babeltrace/plugin/component-factory.h>
 #include <babeltrace/plugin/plugin.h>
-#include <babeltrace/plugin/component-class.h>
-#include <babeltrace/plugin/notification/iterator.h>
+#include <babeltrace/component/component.h>
+#include <babeltrace/component/source.h>
+#include <babeltrace/component/sink.h>
+#include <babeltrace/component/filter.h>
+#include <babeltrace/component/component-class.h>
+#include <babeltrace/component/notification/iterator.h>
 #include <babeltrace/ref.h>
 #include <babeltrace/values.h>
 #include <stdlib.h>
@@ -38,10 +41,61 @@
 #include <popt.h>
 #include <string.h>
 #include <stdio.h>
+#include <glib.h>
 #include "babeltrace-cfg.h"
 #include "default-cfg.h"
 
-static struct bt_component_factory *component_factory;
+GPtrArray *loaded_plugins;
+
+static
+void init_loaded_plugins_array(void)
+{
+       loaded_plugins = g_ptr_array_new_full(8, bt_put);
+}
+
+static
+void fini_loaded_plugins_array(void)
+{
+       g_ptr_array_free(loaded_plugins, TRUE);
+}
+
+static
+struct bt_plugin *find_plugin(const char *name)
+{
+       int i;
+       struct bt_plugin *plugin = NULL;
+
+       for (i = 0; i < loaded_plugins->len; i++) {
+               plugin = g_ptr_array_index(loaded_plugins, i);
+
+               if (strcmp(name, bt_plugin_get_name(plugin)) == 0) {
+                       break;
+               }
+
+               plugin = NULL;
+       }
+
+       return bt_get(plugin);
+}
+
+static
+struct bt_component_class *find_component_class(const char *plugin_name,
+               const char *comp_class_name,
+               enum bt_component_type comp_class_type)
+{
+       struct bt_component_class *comp_class = NULL;
+       struct bt_plugin *plugin = find_plugin(plugin_name);
+
+       if (!plugin) {
+               goto end;
+       }
+
+       comp_class = bt_plugin_get_component_class_by_name_and_type(plugin,
+                       comp_class_name, comp_class_type);
+       BT_PUT(plugin);
+end:
+       return comp_class;
+}
 
 static
 const char *component_type_str(enum bt_component_type type)
@@ -60,53 +114,65 @@ const char *component_type_str(enum bt_component_type type)
 }
 
 static
-void print_component_classes_found(struct bt_component_factory *factory)
+void print_component_classes_found(void)
 {
-       int count, i;
+       int plugins_count, component_classes_count = 0, i;
 
        if (!babeltrace_verbose) {
                return;
        }
 
-       count = bt_component_factory_get_component_class_count(factory);
-       if (count <= 0) {
-               fprintf(stderr, "No component classes found. Please make sure your plug-in search path is set correctly.\n");
+       plugins_count = loaded_plugins->len;
+       if (plugins_count == 0) {
+               fprintf(stderr, "No plugins found. Please make sure your plug-in search path is set correctly.\n");
                return;
        }
 
-       printf_verbose("Found %d component classes.\n", count);
-       for (i = 0; i < count; i++) {
-               struct bt_component_class *component_class =
-                               bt_component_factory_get_component_class_index(
-                               factory, i);
-               struct bt_plugin *plugin = bt_component_class_get_plugin(
-                               component_class);
-               const char *plugin_name = bt_plugin_get_name(plugin);
-               const char *component_name = bt_component_class_get_name(
-                               component_class);
-               const char *path = bt_plugin_get_path(plugin);
-               const char *author = bt_plugin_get_author(plugin);
-               const char *license = bt_plugin_get_license(plugin);
-               const char *plugin_description = bt_plugin_get_description(
-                               plugin);
-               const char *component_description =
-                               bt_component_class_get_description(
-                                       component_class);
-               enum bt_component_type type = bt_component_class_get_type(
-                               component_class);
-
-               printf_verbose("[%s - %s (%s)]\n", plugin_name, component_name,
-                              component_type_str(type));
-               printf_verbose("\tpath: %s\n", path ? path : "None");
-               printf_verbose("\tauthor: %s\n", author ? author : "Unknown");
-               printf_verbose("\tlicense: %s\n", license ? license : "Unknown");
-               printf_verbose("\tplugin description: %s\n",
-                               plugin_description ? plugin_description : "None");
-               printf_verbose("\tcomponent description: %s\n",
-                               component_description ? component_description : "None");
+       for (i = 0; i < plugins_count; i++) {
+               struct bt_plugin *plugin = g_ptr_array_index(loaded_plugins, i);
+
+               component_classes_count += bt_plugin_get_component_class_count(plugin);
+       }
 
-               bt_put(plugin);
-               bt_put(component_class);
+       printf_verbose("Found %d component classes in %d plugins.\n",
+               component_classes_count, plugins_count);
+
+       for (i = 0; i < plugins_count; i++) {
+               int j;
+               struct bt_plugin *plugin = g_ptr_array_index(loaded_plugins, i);
+
+               component_classes_count =
+                       bt_plugin_get_component_class_count(plugin);
+
+               for (j = 0; j < component_classes_count; j++) {
+                       struct bt_component_class *comp_class =
+                               bt_plugin_get_component_class(plugin, j);
+                       const char *plugin_name = bt_plugin_get_name(plugin);
+                       const char *comp_class_name =
+                               bt_component_class_get_name(comp_class);
+                       const char *path = bt_plugin_get_path(plugin);
+                       const char *author = bt_plugin_get_author(plugin);
+                       const char *license = bt_plugin_get_license(plugin);
+                       const char *plugin_description =
+                               bt_plugin_get_description(plugin);
+                       const char *comp_class_description =
+                               bt_component_class_get_description(comp_class);
+                       enum bt_component_type type =
+                               bt_component_class_get_type(comp_class);
+
+                       printf_verbose("[%s - %s (%s)]\n", plugin_name,
+                               comp_class_name, component_type_str(type));
+                       printf_verbose("\tpath: %s\n", path ? path : "None");
+                       printf_verbose("\tauthor: %s\n",
+                               author ? author : "Unknown");
+                       printf_verbose("\tlicense: %s\n",
+                               license ? license : "Unknown");
+                       printf_verbose("\tplugin description: %s\n",
+                               plugin_description ? plugin_description : "None");
+                       printf_verbose("\tcomponent description: %s\n",
+                               comp_class_description ? comp_class_description : "None");
+                       bt_put(comp_class);
+               }
        }
 }
 
@@ -250,7 +316,6 @@ struct bt_component *create_trimmer(struct bt_config_component *source_cfg)
        struct bt_value *trimmer_params = NULL;
        struct bt_value *value;
 
-       assert(component_factory);
        trimmer_params = bt_value_map_create();
        if (!trimmer_params) {
                goto end;
@@ -290,9 +355,8 @@ struct bt_component *create_trimmer(struct bt_config_component *source_cfg)
                }
        }
 
-       trimmer_class = bt_component_factory_get_component_class(
-                       component_factory, "utils", BT_COMPONENT_TYPE_FILTER,
-                       "trimmer");
+       trimmer_class = find_component_class("utils", "trimmer",
+               BT_COMPONENT_TYPE_FILTER);
        if (!trimmer_class) {
                fprintf(stderr, "Could not find trimmer component class. Aborting...\n");
                goto end;
@@ -370,17 +434,44 @@ end:
        return ret;
 }
 
-static int load_plugins(struct bt_config *cfg)
+static
+void add_to_loaded_plugins(struct bt_plugin **plugins)
 {
-       int nr_paths, i;
+       while (*plugins) {
+               struct bt_plugin *plugin = *plugins;
+               /* Check if it's already loaded (from another path). */
+               struct bt_plugin *loaded_plugin =
+                               find_plugin(bt_plugin_get_name(plugin));
+
+               if (loaded_plugin) {
+                       printf_verbose("Not loading plugin `%s`: already loaded from `%s`\n",
+                                       bt_plugin_get_path(plugin),
+                                       bt_plugin_get_path(loaded_plugin));
+                       BT_PUT(loaded_plugin);
+                       BT_PUT(plugin);
+               } else {
+                       /* Transfer ownership to global array. */
+                       g_ptr_array_add(loaded_plugins, plugin);
+               }
+               *(plugins++) = NULL;
+       }
+}
+
+static
+int load_dynamic_plugins(struct bt_config *cfg)
+{
+       int nr_paths, i, ret = 0;
 
        nr_paths = bt_value_array_size(cfg->plugin_paths);
        if (nr_paths < 0) {
-               return -1;
+               ret = -1;
+               goto end;
        }
+
        for (i = 0; i < nr_paths; i++) {
                struct bt_value *plugin_path_value = NULL;
                const char *plugin_path;
+               struct bt_plugin **plugins;
 
                plugin_path_value = bt_value_array_get(cfg->plugin_paths, i);
                if (bt_value_string_get(plugin_path_value,
@@ -388,14 +479,41 @@ static int load_plugins(struct bt_config *cfg)
                        BT_PUT(plugin_path_value);
                        continue;
                }
-               if (bt_component_factory_load_recursive(component_factory,
-                               plugin_path)) {
+
+               plugins = bt_plugin_create_all_from_dir(plugin_path, true);
+               if (!plugins) {
                        printf_debug("Unable to dynamically load plugins from path %s.\n",
                                plugin_path);
+                       BT_PUT(plugin_path_value);
+                       continue;
                }
+
+               add_to_loaded_plugins(plugins);
+               free(plugins);
+
                BT_PUT(plugin_path_value);
        }
-       return 0;
+end:
+       return ret;
+}
+
+static
+int load_static_plugins(void)
+{
+       int ret = 0;
+       struct bt_plugin **plugins;
+
+       plugins = bt_plugin_create_all_from_static();
+       if (!plugins) {
+               printf_debug("Unable to load static plugins.\n");
+               ret = -1;
+               goto end;
+       }
+
+       add_to_loaded_plugins(plugins);
+       free(plugins);
+end:
+       return ret;
 }
 
 int main(int argc, const char **argv)
@@ -409,6 +527,8 @@ int main(int argc, const char **argv)
        enum bt_component_status sink_status;
        struct bt_config_component *source_cfg = NULL, *sink_cfg = NULL;
 
+       init_loaded_plugins_array();
+
        cfg = bt_config_create();
        if (!cfg) {
                fprintf(stderr, "Failed to create Babeltrace configuration\n");
@@ -421,7 +541,7 @@ int main(int argc, const char **argv)
                goto end;
        }
 
-       ret = bt_config_init_from_args(cfg, argc, argv);        
+       ret = bt_config_init_from_args(cfg, argc, argv);
        if (ret == 0) {
                babeltrace_verbose = cfg->verbose;
                babeltrace_debug = cfg->debug;
@@ -438,33 +558,24 @@ int main(int argc, const char **argv)
 
        printf_verbose("Verbose mode active.\n");
        printf_debug("Debug mode active.\n");
-       component_factory = bt_component_factory_create();
-       if (!component_factory) {
-               fprintf(stderr, "Failed to create component factory.\n");
-               ret = -1;
-               goto end;
-       }
 
-       if (load_plugins(cfg)) {
-               fprintf(stderr, "Failed to load plugins.\n");
+       if (load_dynamic_plugins(cfg)) {
+               fprintf(stderr, "Failed to load dynamic plugins.\n");
                ret = -1;
                goto end;
        }
 
-       ret = bt_component_factory_load_static(component_factory);
-       if (ret) {
+       if (load_static_plugins()) {
                fprintf(stderr, "Failed to load static plugins.\n");
                goto end;
        }
 
-       print_component_classes_found(component_factory);
-
+       print_component_classes_found();
        source_cfg = bt_config_get_component(cfg->sources, 0);
        source_params = bt_get(source_cfg->params);
-       source_class = bt_component_factory_get_component_class(
-                       component_factory, source_cfg->plugin_name->str,
-                       BT_COMPONENT_TYPE_SOURCE,
-                       source_cfg->component_name->str);
+       source_class = find_component_class(source_cfg->plugin_name->str,
+                       source_cfg->component_name->str,
+                       BT_COMPONENT_TYPE_SOURCE);
        if (!source_class) {
                fprintf(stderr, "Could not find %s.%s source component class. Aborting...\n",
                                source_cfg->plugin_name->str,
@@ -475,9 +586,9 @@ int main(int argc, const char **argv)
 
        sink_cfg = bt_config_get_component(cfg->sinks, 0);
        sink_params = bt_get(sink_cfg->params);
-       sink_class = bt_component_factory_get_component_class(component_factory,
-                       sink_cfg->plugin_name->str, BT_COMPONENT_TYPE_SINK,
-                       sink_cfg->component_name->str);
+       sink_class = find_component_class(sink_cfg->plugin_name->str,
+                       sink_cfg->component_name->str,
+                       BT_COMPONENT_TYPE_SINK);
        if (!sink_class) {
                fprintf(stderr, "Could not find %s.%s output component class. Aborting...\n",
                                sink_cfg->plugin_name->str,
@@ -523,7 +634,6 @@ int main(int argc, const char **argv)
                }
        }
 end:
-       BT_PUT(component_factory);
        BT_PUT(sink_class);
        BT_PUT(source_class);
        BT_PUT(source);
@@ -533,5 +643,6 @@ end:
        BT_PUT(cfg);
        BT_PUT(sink_cfg);
        BT_PUT(source_cfg);
+       fini_loaded_plugins_array();
        return ret ? 1 : 0;
 }

diff --git a/formats/ctf/ir/trace.c b/formats/ctf/ir/trace.c
index 9c314fe11801573aa6cfed39356e1d9a9bd8d006..37884069132f9fe5b82a6b4e8a262de38bf9c1ce 100644 (file)
--- a/formats/ctf/ir/trace.c
+++ b/formats/ctf/ir/trace.c
@@ -40,7 +40,7 @@
 #include <babeltrace/ctf-ir/validation-internal.h>
 #include <babeltrace/ctf-ir/visitor-internal.h>
 #include <babeltrace/ctf-ir/utils.h>
-#include <babeltrace/plugin/notification/schema.h>
+#include <babeltrace/component/notification/schema.h>
 #include <babeltrace/compiler.h>
 #include <babeltrace/values.h>
 #include <babeltrace/ref.h>

diff --git a/include/Makefile.am b/include/Makefile.am
index a463dba4f10ccb65f1bd56126213b4656c2ea079..bcd1994acbaa0e4731d7d9f9f9baa03d9a98971d 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -39,23 +39,24 @@ babeltracectfirinclude_HEADERS = \
 
 babeltraceplugininclude_HEADERS = \
        babeltrace/plugin/plugin.h \
-       babeltrace/plugin/component.h \
-       babeltrace/plugin/component-class.h \
-       babeltrace/plugin/component-connection.h \
-       babeltrace/plugin/component-factory.h \
-       babeltrace/plugin/component-graph.h \
-       babeltrace/plugin/source.h \
-       babeltrace/plugin/sink.h \
-       babeltrace/plugin/filter.h \
-       babeltrace/plugin/plugin-system.h \
-       babeltrace/plugin/notification/eot.h \
-       babeltrace/plugin/notification/notification.h \
-       babeltrace/plugin/notification/event.h \
-       babeltrace/plugin/notification/iterator.h \
-       babeltrace/plugin/notification/packet.h \
-       babeltrace/plugin/notification/schema.h \
-       babeltrace/plugin/notification/stream.h \
-       babeltrace/plugin/notification/heap.h
+       babeltrace/plugin/plugin-dev.h
+
+babeltracecomponentinclude_HEADERS = \
+       babeltrace/component/component.h \
+       babeltrace/component/component-class.h \
+       babeltrace/component/component-connection.h \
+       babeltrace/component/component-graph.h \
+       babeltrace/component/source.h \
+       babeltrace/component/sink.h \
+       babeltrace/component/filter.h \
+       babeltrace/component/notification/eot.h \
+       babeltrace/component/notification/notification.h \
+       babeltrace/component/notification/event.h \
+       babeltrace/component/notification/iterator.h \
+       babeltrace/component/notification/packet.h \
+       babeltrace/component/notification/schema.h \
+       babeltrace/component/notification/stream.h \
+       babeltrace/component/notification/heap.h
 
 noinst_HEADERS = \
        babeltrace/align.h \
@@ -116,20 +117,19 @@ noinst_HEADERS = \
        babeltrace/compat/mman.h \
        babeltrace/endian.h \
        babeltrace/mmap-align.h \
-       babeltrace/plugin/component-class-internal.h \
-       babeltrace/plugin/component-connection-internal.h \
-       babeltrace/plugin/component-factory-internal.h \
-       babeltrace/plugin/component-internal.h \
-       babeltrace/plugin/component-graph-internal.h \
        babeltrace/plugin/plugin-internal.h \
-       babeltrace/plugin/filter-internal.h \
-       babeltrace/plugin/sink-internal.h \
-       babeltrace/plugin/source-internal.h \
-       babeltrace/plugin/input.h \
-       babeltrace/plugin/notification/eot-internal.h \
-       babeltrace/plugin/notification/event-internal.h \
-       babeltrace/plugin/notification/iterator-internal.h \
-       babeltrace/plugin/notification/notification-internal.h \
-       babeltrace/plugin/notification/packet-internal.h \
-       babeltrace/plugin/notification/stream-internal.h \
-       babeltrace/plugin/notification/heap-internal.h
+       babeltrace/component/component-class-internal.h \
+       babeltrace/component/component-connection-internal.h \
+       babeltrace/component/component-internal.h \
+       babeltrace/component/component-graph-internal.h \
+       babeltrace/component/filter-internal.h \
+       babeltrace/component/sink-internal.h \
+       babeltrace/component/source-internal.h \
+       babeltrace/component/input.h \
+       babeltrace/component/notification/eot-internal.h \
+       babeltrace/component/notification/event-internal.h \
+       babeltrace/component/notification/iterator-internal.h \
+       babeltrace/component/notification/notification-internal.h \
+       babeltrace/component/notification/packet-internal.h \
+       babeltrace/component/notification/stream-internal.h \
+       babeltrace/component/notification/heap-internal.h

diff --git a/include/babeltrace/component/component-class-internal.h b/include/babeltrace/component/component-class-internal.h
new file mode 100644 (file)
index 0000000..7ed0f16
--- /dev/null
+++ b/include/babeltrace/component/component-class-internal.h
@@ -0,0 +1,62 @@
+#ifndef BABELTRACE_COMPONENT_COMPONENT_CLASS_INTERNAL_H
+#define BABELTRACE_COMPONENT_COMPONENT_CLASS_INTERNAL_H
+
+/*
+ * BabelTrace - Component Class Internal
+ *
+ * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright 2017 Philippe Proulx <pproulx@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/component/component.h>
+#include <babeltrace/component/component-class.h>
+#include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/object-internal.h>
+#include <glib.h>
+
+struct bt_component_class;
+
+typedef void (*bt_component_class_destroy_listener_func)(
+               struct bt_component_class *class, void *data);
+
+struct bt_component_class_destroyer_listener {
+       bt_component_class_destroy_listener_func func;
+       void *data;
+};
+
+struct bt_component_class {
+       struct bt_object base;
+       enum bt_component_type type;
+       GString *name;
+       GString *description;
+       bt_component_init_cb init;
+
+       /* Array of struct bt_component_class_destroyer_listener */
+       GArray *destroy_listeners;
+};
+
+BT_HIDDEN
+int bt_component_class_add_destroy_listener(struct bt_component_class *class,
+               bt_component_class_destroy_listener_func func, void *data);
+
+#endif /* BABELTRACE_COMPONENT_COMPONENT_CLASS_INTERNAL_H */

diff --git a/include/babeltrace/component/component-class.h b/include/babeltrace/component/component-class.h
new file mode 100644 (file)
index 0000000..d12a120
--- /dev/null
+++ b/include/babeltrace/component/component-class.h
@@ -0,0 +1,87 @@
+#ifndef BABELTRACE_COMPONENT_COMPONENT_CLASS_H
+#define BABELTRACE_COMPONENT_COMPONENT_CLASS_H
+
+/*
+ * Babeltrace - Component Class Interface.
+ *
+ * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/component/component.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Component type.
+ */
+enum bt_component_type {
+       BT_COMPONENT_TYPE_UNKNOWN =     -1,
+
+       /** A source component is a notification generator. */
+       BT_COMPONENT_TYPE_SOURCE =      0,
+
+       /** A sink component handles incoming notifications. */
+       BT_COMPONENT_TYPE_SINK =        1,
+
+       /** A filter component implements both Source and Sink interfaces. */
+       BT_COMPONENT_TYPE_FILTER =      2,
+};
+
+struct bt_plugin;
+struct bt_component_class;
+
+extern struct bt_component_class *bt_component_class_create(
+               enum bt_component_type type, const char *name,
+               const char *description, bt_component_init_cb init);
+
+/**
+ * Get a component class' name.
+ *
+ * @param component_class      Component class of which to get the name
+ * @returns                    Name of the component class
+ */
+extern const char *bt_component_class_get_name(
+               struct bt_component_class *component_class);
+
+/**
+ * Get a component class' description.
+ *
+ * Component classes may provide an optional description. It may, however,
+ * opt not to.
+ *
+ * @param component_class      Component class of which to get the description
+ * @returns                    Description of the component class, or NULL.
+ */
+extern const char *bt_component_class_get_description(
+               struct bt_component_class *component_class);
+
+/**
+ * Get a component class' type.
+ *
+ * @param component_class      Component class of which to get the type
+ * @returns                    One of #bt_component_type
+ */
+extern enum bt_component_type bt_component_class_get_type(
+               struct bt_component_class *component_class);
+
+#endif /* BABELTRACE_COMPONENT_COMPONENT_CLASS_H */

diff --git a/include/babeltrace/component/component-connection-internal.h b/include/babeltrace/component/component-connection-internal.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/include/babeltrace/component/component-connection.h b/include/babeltrace/component/component-connection.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/include/babeltrace/component/component-graph-internal.h b/include/babeltrace/component/component-graph-internal.h
new file mode 100644 (file)
index 0000000..ab89a03
--- /dev/null
+++ b/include/babeltrace/component/component-graph-internal.h
@@ -0,0 +1,55 @@
+#ifndef BABELTRACE_COMPONENT_COMPONENT_GRAPH_INTERNAL_H
+#define BABELTRACE_COMPONENT_COMPONENT_GRAPH_INTERNAL_H
+
+/*
+ * BabelTrace - Component Graph Internal
+ *
+ * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/component/component-graph.h>
+#include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/object-internal.h>
+#include <glib.h>
+
+struct bt_component_graph {
+       struct bt_object base;
+       /* Array of pointers to bt_component_connection. */
+       GPtrArray *connections;
+       /*
+        * Array of pointers to bt_component.
+        *
+        * Components which were added to the graph, but have not been connected
+        * yet.
+        */
+       GPtrArray *loose_components;
+       /*
+        * Array of pointers to sink bt_component.
+        *
+        * A reference is held to the Sink components in order to implement the
+        * "run" interface, which executes the sinks in a round-robin pattern.
+        */
+       GPtrArray *sinks;
+};
+
+#endif /* BABELTRACE_COMPONENT_COMPONENT_GRAPH_INTERNAL_H */

diff --git a/include/babeltrace/component/component-graph.h b/include/babeltrace/component/component-graph.h
new file mode 100644 (file)
index 0000000..d87b43b
--- /dev/null
+++ b/include/babeltrace/component/component-graph.h
@@ -0,0 +1,99 @@
+#ifndef BABELTRACE_COMPONENT_COMPONENT_GRAPH_H
+#define BABELTRACE_COMPONENT_COMPONENT_GRAPH_H
+
+/*
+ * BabelTrace - Babeltrace Component Graph Interface
+ *
+ * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/component/component-class.h>
+#include <babeltrace/component/component.h>
+#include <babeltrace/values.h>
+#include <stdio.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum bt_component_graph_status {
+       BT_COMPONENT_GRAPH_STATUS_OK = 0,
+};
+
+/*
+Graph Ownership:
+
+                  Graph
+                    ^
+                    |
+               Connection
+                 ^     ^
+                /       \
+         ComponentA    ComponentB
+
+1) A graph only owns a set of connections.
+2) Components should _never_ own each other.
+3) A component can keep the complete graph "alive".
+
+*/
+extern struct bt_component_graph *bt_component_graph_create(void);
+
+/**
+ * Creates a connection object which owns both components, invokes the
+ * components' connection callback, and add the connection to the component
+ * graph's set of connection.
+ *
+ * Will add any component that is not already part of the graph.
+ */
+extern enum bt_component_graph_status bt_component_graph_connect(
+               struct bt_component_graph *graph, struct bt_component *upstream,
+               struct bt_component *downstream);
+
+/**
+ * Add component to the graph
+ */
+extern enum bt_component_graph_status bt_component_graph_add_component(
+               struct bt_component_graph *graph,
+               struct bt_component *component);
+
+/**
+ * Add a component as a "sibling" of the origin component. Sibling share
+ * connections equivalent to each other at the time of connection (same
+ * parents and children).
+ */
+extern enum bt_component_graph_status bt_component_graph_add_component_as_sibling(
+               struct bt_component_graph *graph, struct bt_component *origin,
+               struct bt_component *new_component);
+
+/**
+ * Runs "bt_component_sink_consume()" on all sinks in round-robin until they all
+ * indicate that the end is reached on that an error occured.
+ */
+extern enum bt_component_graph_status bt_component_graph_run(
+               struct bt_component_graph *graph);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* BABELTRACE_COMPONENT_COMPONENT_GRAPH_H */

diff --git a/include/babeltrace/component/component-internal.h b/include/babeltrace/component/component-internal.h
new file mode 100644 (file)
index 0000000..7c18f49
--- /dev/null
+++ b/include/babeltrace/component/component-internal.h
@@ -0,0 +1,66 @@
+#ifndef BABELTRACE_COMPONENT_COMPONENT_INTERNAL_H
+#define BABELTRACE_COMPONENT_COMPONENT_INTERNAL_H
+
+/*
+ * BabelTrace - Component internal
+ *
+ * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/component/component.h>
+#include <babeltrace/component/component-class-internal.h>
+#include <babeltrace/object-internal.h>
+#include <glib.h>
+#include <stdio.h>
+
+struct bt_component {
+       struct bt_object base;
+       struct bt_component_class *class;
+       GString *name;
+       /** Source, Sink or Filter destroy */
+       bt_component_destroy_cb destroy;
+
+       /** User-defined data and its destruction callback */
+       void *user_data;
+       bt_component_destroy_cb user_destroy;
+
+       /**
+        * Used to protect operations which may only be used during
+        * a component's initialization.
+        */
+       bool initializing;
+};
+
+BT_HIDDEN
+enum bt_component_status bt_component_init(struct bt_component *component,
+               bt_component_destroy_cb destroy);
+
+BT_HIDDEN
+enum bt_component_type bt_component_get_type(struct bt_component *component);
+
+BT_HIDDEN
+struct bt_notification_iterator *bt_component_create_iterator(
+               struct bt_component *component);
+
+#endif /* BABELTRACE_COMPONENT_COMPONENT_INTERNAL_H */

diff --git a/include/babeltrace/component/component.h b/include/babeltrace/component/component.h
new file mode 100644 (file)
index 0000000..7a1464f
--- /dev/null
+++ b/include/babeltrace/component/component.h
@@ -0,0 +1,310 @@
+#ifndef BABELTRACE_COMPONENT_COMPONENT_H
+#define BABELTRACE_COMPONENT_COMPONENT_H
+
+/*
+ * BabelTrace - Babeltrace Component Interface
+ *
+ * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/component/notification/iterator.h>
+#include <babeltrace/values.h>
+#include <stdio.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Status code. Errors are always negative.
+ */
+enum bt_component_status {
+       /** No error, okay. */
+       BT_COMPONENT_STATUS_OK =                0,
+       /** No more work to be done by this component. **/
+       BT_COMPONENT_STATUS_END =               1,
+       /**
+        * Component can't process a notification at this time
+        * (e.g. would block), try again later.
+        */
+       BT_COMPONENT_STATUS_AGAIN =             2,
+       /** General error. */
+       BT_COMPONENT_STATUS_ERROR =             -1,
+       /** Unsupported component feature. */
+       BT_COMPONENT_STATUS_UNSUPPORTED =       -2,
+       /** Invalid arguments. */
+       BT_COMPONENT_STATUS_INVALID =           -3,
+       /** Memory allocation failure. */
+       BT_COMPONENT_STATUS_NOMEM =             -4,
+};
+
+struct bt_component_class;
+struct bt_component;
+struct bt_value;
+
+/**
+ * Component private data deallocation function type.
+ *
+ * @param component    Component instance
+ */
+typedef void (*bt_component_destroy_cb)(struct bt_component *component);
+
+/**
+ * Component initialization function type.
+ *
+ * A component's private data and required callbacks must be set by this
+ * function.
+ *
+ * @param component    Component instance
+ * @param params       A dictionary of component parameters
+ * @returns            One of #bt_component_status values
+ */
+typedef enum bt_component_status (*bt_component_init_cb)(
+               struct bt_component *component, struct bt_value *params);
+
+
+/**
+ * Get a component's private data.
+ *
+ * @param component    Component of which to get the private data
+ * @returns            Component's private data
+ */
+extern void *bt_component_get_private_data(struct bt_component *component);
+
+/**
+ * Set a component's private data.
+ *
+ * @param component    Component of which to set the private data
+ * @param data         Component private data
+ * @returns            One of #bt_component_status values
+ */
+extern enum bt_component_status bt_component_set_private_data(
+               struct bt_component *component, void *data);
+
+/**
+ * Set a component's private data cleanup function.
+ *
+ * @param component    Component of which to set the private data destruction
+ *                     function
+ * @param data         Component private data clean-up function
+ * @returns            One of #bt_component_status values
+ */
+extern enum bt_component_status bt_component_set_destroy_cb(
+               struct bt_component *component,
+               bt_component_destroy_cb destroy);
+
+/** bt_component_souce */
+/**
+ * Iterator initialization function type.
+ *
+ * A notification iterator's private data, deinitialization, next, and get
+ * callbacks must be set by this function.
+ *
+ * @param source       Source component instance
+ * @param iterator     Notification iterator instance
+ */
+typedef enum bt_component_status (*bt_component_source_init_iterator_cb)(
+               struct bt_component *, struct bt_notification_iterator *);
+
+/**
+ * Set a source component's iterator initialization function.
+ *
+ * @param source       Source component instance
+ * @param init_iterator        Notification iterator initialization callback
+ */
+extern enum bt_component_status
+bt_component_source_set_iterator_init_cb(struct bt_component *source,
+               bt_component_source_init_iterator_cb init_iterator);
+
+/** bt_component_sink */
+/**
+ * Notification consumption function type.
+ *
+ * @param sink         Sink component instance
+ * @returns            One of #bt_component_status values
+ */
+typedef enum bt_component_status (*bt_component_sink_consume_cb)(
+               struct bt_component *);
+
+/**
+ * Iterator addition function type.
+ *
+ * A sink component may choose to refuse the addition of an iterator
+ * by not returning BT_COMPONENT_STATUS_OK.
+ *
+ * @param sink         Sink component instance
+ * @returns            One of #bt_component_status values
+ */
+typedef enum bt_component_status (*bt_component_sink_add_iterator_cb)(
+               struct bt_component *, struct bt_notification_iterator *);
+
+/**
+ * Set a sink component's consumption callback.
+ *
+ * @param sink         Sink component instance
+ * @param consume      Consumption callback
+ * @returns            One of #bt_component_status values
+ */
+extern enum bt_component_status
+bt_component_sink_set_consume_cb(struct bt_component *sink,
+               bt_component_sink_consume_cb consume);
+
+/**
+ * Set a sink component's iterator addition callback.
+ *
+ * @param sink         Sink component instance
+ * @param add_iterator Iterator addition callback
+ * @returns            One of #bt_component_status values
+ */
+extern enum bt_component_status
+bt_component_sink_set_add_iterator_cb(struct bt_component *sink,
+               bt_component_sink_add_iterator_cb add_iterator);
+
+/* Defaults to 1. */
+extern enum bt_component_status
+bt_component_sink_set_minimum_input_count(struct bt_component *sink,
+               unsigned int minimum);
+
+/* Defaults to 1. */
+extern enum bt_component_status
+bt_component_sink_set_maximum_input_count(struct bt_component *sink,
+               unsigned int maximum);
+
+extern enum bt_component_status
+bt_component_sink_get_input_count(struct bt_component *sink,
+               unsigned int *count);
+
+/* May return NULL after an interator has reached its end. */
+extern enum bt_component_status
+bt_component_sink_get_input_iterator(struct bt_component *sink,
+               unsigned int input, struct bt_notification_iterator **iterator);
+
+/** bt_component_filter */
+/**
+ * Iterator initialization function type.
+ *
+ * A notification iterator's private data, deinitialization, next, and get
+ * callbacks must be set by this function.
+ *
+ * @param filter       Filter component instance
+ * @param iterator     Notification iterator instance
+ */
+typedef enum bt_component_status (*bt_component_filter_init_iterator_cb)(
+               struct bt_component *, struct bt_notification_iterator *);
+
+/**
+ * Iterator addition function type.
+ *
+ * A filter component may choose to refuse the addition of an iterator
+ * by not returning BT_COMPONENT_STATUS_OK.
+ *
+ * @param filter       Filter component instance
+ * @returns            One of #bt_component_status values
+ */
+typedef enum bt_component_status (*bt_component_filter_add_iterator_cb)(
+               struct bt_component *, struct bt_notification_iterator *);
+
+/**
+ * Set a filter component's iterator initialization function.
+ *
+ * @param filter       Filter component instance
+ * @param init_iterator        Notification iterator initialization callback
+ */
+extern enum bt_component_status
+bt_component_filter_set_iterator_init_cb(struct bt_component *filter,
+               bt_component_filter_init_iterator_cb init_iterator);
+
+/**
+ * Set a filter component's iterator addition callback.
+ *
+ * @param filter       Filter component instance
+ * @param add_iterator Iterator addition callback
+ * @returns            One of #bt_component_status values
+ */
+extern enum bt_component_status
+bt_component_filter_set_add_iterator_cb(struct bt_component *filter,
+               bt_component_filter_add_iterator_cb add_iterator);
+
+/* Defaults to 1. */
+extern enum bt_component_status
+bt_component_filter_set_minimum_input_count(struct bt_component *filter,
+               unsigned int minimum);
+
+/* Defaults to 1. */
+extern enum bt_component_status
+bt_component_filter_set_maximum_input_count(struct bt_component *filter,
+               unsigned int maximum);
+
+extern enum bt_component_status
+bt_component_filter_get_input_count(struct bt_component *filter,
+               unsigned int *count);
+
+/* May return NULL after an interator has reached its end. */
+extern enum bt_component_status
+bt_component_filter_get_input_iterator(struct bt_component *filter,
+               unsigned int input, struct bt_notification_iterator **iterator);
+
+/**
+ * Create an instance of a component from a component class.
+ *
+ * @param component_class      Component class of which to create an instance
+ * @param name                 Name of the new component instance, optional
+ * @param params               A dictionary of component parameters
+ * @returns                    Returns a pointer to a new component instance
+ */
+extern struct bt_component *bt_component_create(
+               struct bt_component_class *component_class, const char *name,
+               struct bt_value *params);
+
+/**
+ * Get component's name.
+ *
+ * @param component    Component instance of which to get the name
+ * @returns            Returns a pointer to the component's name
+ */
+extern const char *bt_component_get_name(struct bt_component *component);
+
+/**
+ * Set component's name.
+ *
+ * @param component    Component instance of which to set the name
+ * @param name         New component name (will be copied)
+ * @returns            One of #bt_component_status values
+ */
+extern enum bt_component_status bt_component_set_name(
+               struct bt_component *component, const char *name);
+
+/**
+ * Get component's class.
+ *
+ * @param component    Component instance of which to get the class
+ * @returns            The component's class
+ */
+extern struct bt_component_class *bt_component_get_class(
+               struct bt_component *component);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* BABELTRACE_COMPONENT_COMPONENT_H */

diff --git a/include/babeltrace/component/filter-internal.h b/include/babeltrace/component/filter-internal.h
new file mode 100644 (file)
index 0000000..3a17aa0
--- /dev/null
+++ b/include/babeltrace/component/filter-internal.h
@@ -0,0 +1,69 @@
+#ifndef BABELTRACE_COMPONENT_FILTER_INTERNAL_H
+#define BABELTRACE_COMPONENT_FILTER_INTERNAL_H
+
+/*
+ * BabelTrace - Filter Component Internal
+ *
+ * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/component/component-internal.h>
+#include <babeltrace/component/component-class-internal.h>
+#include <babeltrace/component/input.h>
+
+struct bt_value;
+
+struct bt_component_filter_class {
+       struct bt_component_class parent;
+};
+
+struct bt_component_filter {
+       struct bt_component parent;
+       bt_component_filter_init_iterator_cb init_iterator;
+       bt_component_sink_add_iterator_cb add_iterator;
+       struct component_input input;
+};
+
+/**
+ * Allocate a filter component.
+ *
+ * @param class                        Component class
+ * @param params               A dictionary of component parameters
+ * @returns                    A filter component instance
+ */
+BT_HIDDEN
+struct bt_component *bt_component_filter_create(
+               struct bt_component_class *class, struct bt_value *params);
+
+/**
+ * Validate a filter component.
+ *
+ * @param component            Filter component instance to validate
+ * @returns                    One of #bt_component_status
+ */
+BT_HIDDEN
+enum bt_component_status bt_component_filter_validate(
+               struct bt_component *component);
+
+#endif /* BABELTRACE_COMPONENT_FILTER_INTERNAL_H */

diff --git a/include/babeltrace/component/filter.h b/include/babeltrace/component/filter.h
new file mode 100644 (file)
index 0000000..f33d49f
--- /dev/null
+++ b/include/babeltrace/component/filter.h
@@ -0,0 +1,66 @@
+#ifndef BABELTRACE_COMPONENT_FILTER_H
+#define BABELTRACE_COMPONENT_FILTER_H
+
+/*
+ * BabelTrace - Filter Plug-in Interface
+ *
+ * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <stdint.h>
+#include <babeltrace/component/component.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct bt_component;
+struct bt_notification_iterator;
+
+/**
+ * Add a notification iterator to a filter component.
+ *
+ * @param component    Component instance
+ * @param iterator     Notification iterator to add
+ * @returns            One of #bt_component_status values
+ */
+extern
+enum bt_component_status bt_component_filter_add_iterator(
+               struct bt_component *component,
+               struct bt_notification_iterator *iterator);
+
+/**
+ * Create an iterator on a component instance.
+ *
+ * @param component    Component instance
+ * @returns            Notification iterator instance
+ */
+extern
+struct bt_notification_iterator *bt_component_filter_create_iterator(
+               struct bt_component *component);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* BABELTRACE_COMPONENT_FILTER_H */

diff --git a/include/babeltrace/component/input.h b/include/babeltrace/component/input.h
new file mode 100644 (file)
index 0000000..7bf5542
--- /dev/null
+++ b/include/babeltrace/component/input.h
@@ -0,0 +1,51 @@
+#ifndef BABELTRACE_COMPONENT_INPUT_INTERNAL_H
+#define BABELTRACE_COMPONENT_INPUT_INTERNAL_H
+
+/*
+ * BabelTrace - Component Input
+ *
+ * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/babeltrace-internal.h>
+#include <glib.h>
+#include <stdbool.h>
+
+struct component_input {
+       /* Array of struct bt_notification_iterator pointers. */
+       GPtrArray *iterators;
+       unsigned int min_count;
+       unsigned int max_count;
+       bool validated;
+};
+
+BT_HIDDEN
+int component_input_init(struct component_input *input);
+
+BT_HIDDEN
+int component_input_validate(struct component_input *input);
+
+BT_HIDDEN
+void component_input_fini(struct component_input *input);
+
+#endif /* BABELTRACE_COMPONENT_INPUT_INTERNAL_H */

diff --git a/include/babeltrace/component/notification/eot-internal.h b/include/babeltrace/component/notification/eot-internal.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/include/babeltrace/component/notification/eot.h b/include/babeltrace/component/notification/eot.h
new file mode 100644 (file)
index 0000000..4c3626c
--- /dev/null
+++ b/include/babeltrace/component/notification/eot.h
@@ -0,0 +1,38 @@
+#ifndef BABELTRACE_COMPONENT_NOTIFICATION_EOT_H
+#define BABELTRACE_COMPONENT_NOTIFICATION_EOT_H
+
+/*
+ * BabelTrace - Plug-in End of Trace Notification
+ *
+ * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* BABELTRACE_COMPONENT_NOTIFICATION_EOT_H */

diff --git a/include/babeltrace/component/notification/event-internal.h b/include/babeltrace/component/notification/event-internal.h
new file mode 100644 (file)
index 0000000..3db8ffd
--- /dev/null
+++ b/include/babeltrace/component/notification/event-internal.h
@@ -0,0 +1,46 @@
+#ifndef BABELTRACE_COMPONENT_NOTIFICATION_EVENT_INTERNAL_H
+#define BABELTRACE_COMPONENT_NOTIFICATION_EVENT_INTERNAL_H
+
+/*
+ * BabelTrace - Plug-in Event Notification internal
+ *
+ * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/ctf-ir/event.h>
+#include <babeltrace/component/notification/notification-internal.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct bt_notification_event {
+       struct bt_notification parent;
+       struct bt_ctf_event *event;
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* BABELTRACECOMPONENTPLUGIN_NOTIFICATION_EVENT_INTERNAL_H */

diff --git a/include/babeltrace/component/notification/event.h b/include/babeltrace/component/notification/event.h
new file mode 100644 (file)
index 0000000..e5947b7
--- /dev/null
+++ b/include/babeltrace/component/notification/event.h
@@ -0,0 +1,64 @@
+#ifndef BABELTRACE_COMPONENT_NOTIFICATION_EVENT_H
+#define BABELTRACE_COMPONENT_NOTIFICATION_EVENT_H
+
+/*
+ * BabelTrace - Plug-in Event Notification
+ *
+ * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct bt_notification;
+struct bt_ctf_event;
+
+/***BT_NOTIFICATION_TYPE_EVENT ***/
+/**
+ * Create an event notification.
+ *
+ * @param event                        The event
+ * @returns                    An event notification instance
+ *
+ * @see #bt_notification_type
+ */
+extern struct bt_notification *bt_notification_event_create(
+               struct bt_ctf_event *event);
+
+/**
+ * Get an event notification's event.
+ *
+ * @param notification Event notification instance
+ * @returns            An event instance
+ *
+ * @see #bt_ctf_event
+ */
+extern struct bt_ctf_event *bt_notification_event_get_event(
+               struct bt_notification *notification);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* BABELTRACE_COMPONENT_NOTIFICATION_EVENT_H */

diff --git a/include/babeltrace/component/notification/heap-internal.h b/include/babeltrace/component/notification/heap-internal.h
new file mode 100644 (file)
index 0000000..8603780
--- /dev/null
+++ b/include/babeltrace/component/notification/heap-internal.h
@@ -0,0 +1,41 @@
+#ifndef BABELTRACE_COMPONENT_NOTIFICATION_HEAP_INTERNAL_H
+#define BABELTRACE_COMPONENT_NOTIFICATION_HEAP_INTERNAL_H
+
+/*
+ * Babeltrace - CTF notification heap priority heap
+ *
+ * Copyright (c) 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/object-internal.h>
+#include <babeltrace/component/notification/heap.h>
+#include <babeltrace/component/notification/notification.h>
+#include <glib.h>
+
+struct bt_notification_heap {
+       struct bt_object base;
+       GPtrArray *ptrs;
+       size_t count;
+       bt_notification_time_compare_func compare;
+       void *compare_data;
+};
+
+#endif /* BABELTRACE_COMPONENT_NOTIFICATION_HEAP_INTERNAL_H */

diff --git a/include/babeltrace/component/notification/heap.h b/include/babeltrace/component/notification/heap.h
new file mode 100644 (file)
index 0000000..3a5ce6d
--- /dev/null
+++ b/include/babeltrace/component/notification/heap.h
@@ -0,0 +1,93 @@
+#ifndef BABELTRACE_COMPONENT_NOTIFICATION_HEAP_H
+#define BABELTRACE_COMPONENT_NOTIFICATION_HEAP_H
+
+/*
+ * Babeltrace - Notification Heap
+ *
+ * Copyright (c) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (c) 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <stddef.h>
+#include <stdbool.h>
+#include <babeltrace/component/notification/notification.h>
+#include <babeltrace/babeltrace-internal.h>
+
+/**
+ * bt_notification_time_compare - Compare two notifications' timestamps
+ *
+ * Compare two notifications in the time domain. Return true if 'a' happened
+ * prior to 'b'. In the case where both notifications are deemed to have
+ * happened at the same time, an implementation-defined critarion shall be
+ * used to order the notifications. This criterion shall ensure a consistent
+ * ordering over multiple runs.
+ */
+typedef bool (*bt_notification_time_compare_func)(
+               struct bt_notification *a, struct bt_notification *b,
+               void *user_data);
+
+/**
+ * bt_notification_heap_create - create a new bt_notification heap.
+ *
+ * @comparator: Function to use for notification comparisons.
+ *
+ * Returns a new notification heap, NULL on error.
+ */
+extern struct bt_notification_heap *bt_notification_heap_create(
+               bt_notification_time_compare_func comparator, void *user_data);
+
+/**
+ * bt_notification_heap_insert - insert an element into the heap
+ *
+ * @heap: the heap to be operated on
+ * @notification: the notification to add
+ *
+ * Insert a notification into the heap.
+ *
+ * Returns 0 on success, a negative value on error.
+ */
+extern int bt_notification_heap_insert(struct bt_notification_heap *heap,
+               struct bt_notification *notification);
+
+/**
+ * bt_notification_heap_peek - return the element on top of the heap.
+ *
+ * @heap: the heap to be operated on
+ *
+ * Returns the top element of the heap, without performing any modification
+ * to the heap structure. Returns NULL if the heap is empty. The returned
+ * notification must be bt_put() by the caller.
+ */
+extern struct bt_notification *bt_notification_heap_peek(
+               struct bt_notification_heap *heap);
+
+/**
+ * bt_notification_heap_pop - remove the element sitting on top of the heap.
+ * @heap: the heap to be operated on
+ *
+ * Returns the top element of the heap. The element is removed from the
+ * heap. Returns NULL if the heap is empty. The returned notification must be
+ * bt_put() by the caller.
+ */
+extern struct bt_notification *bt_notification_heap_pop(
+               struct bt_notification_heap *heap);
+
+#endif /* BABELTRACE_COMPONENT_NOTIFICATION_HEAP_H */

diff --git a/include/babeltrace/component/notification/iterator-internal.h b/include/babeltrace/component/notification/iterator-internal.h
new file mode 100644 (file)
index 0000000..29a5ff0
--- /dev/null
+++ b/include/babeltrace/component/notification/iterator-internal.h
@@ -0,0 +1,64 @@
+#ifndef BABELTRACE_COMPONENT_NOTIFICATION_ITERATOR_INTERNAL_H
+#define BABELTRACE_COMPONENT_NOTIFICATION_ITERATOR_INTERNAL_H
+
+/*
+ * BabelTrace - Notification Iterator Internal
+ *
+ * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/ref-internal.h>
+#include <babeltrace/component/notification/iterator.h>
+
+struct bt_notification_iterator {
+       struct bt_object base;
+       struct bt_component *component;
+       bt_notification_iterator_get_cb get;
+       bt_notification_iterator_next_cb next;
+       bt_notification_iterator_seek_time_cb seek_time;
+       void *user_data;
+       bt_notification_iterator_destroy_cb user_destroy;
+};
+
+/**
+ * Allocate a notification iterator.
+ *
+ * @param component            Component instance
+ * @returns                    A notification iterator instance
+ */
+BT_HIDDEN
+struct bt_notification_iterator *bt_notification_iterator_create(
+               struct bt_component *component);
+
+/**
+ * Validate a notification iterator.
+ *
+ * @param iterator             Notification iterator instance
+ * @returns                    One of #bt_component_status values
+ */
+BT_HIDDEN
+enum bt_notification_iterator_status bt_notification_iterator_validate(
+               struct bt_notification_iterator *iterator);
+
+#endif /* BABELTRACE_COMPONENT_NOTIFICATION_ITERATOR_INTERNAL_H */

diff --git a/include/babeltrace/component/notification/iterator.h b/include/babeltrace/component/notification/iterator.h
new file mode 100644 (file)
index 0000000..69c9b39
--- /dev/null
+++ b/include/babeltrace/component/notification/iterator.h
@@ -0,0 +1,238 @@
+#ifndef BABELTRACE_COMPONENT_NOTIFICATION_ITERATOR_H
+#define BABELTRACE_COMPONENT_NOTIFICATION_ITERATOR_H
+
+/*
+ * BabelTrace - Plug-in Notification Iterator
+ *
+ * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct bt_notification;
+struct bt_notification_iterator;
+
+/**
+ * Status code. Errors are always negative.
+ */
+enum bt_notification_iterator_status {
+       /** No more notifications to be delivered. */
+       BT_NOTIFICATION_ITERATOR_STATUS_END = 1,
+       /** No error, okay. */
+       BT_NOTIFICATION_ITERATOR_STATUS_OK = 0,
+       /** Invalid arguments. */
+       BT_NOTIFICATION_ITERATOR_STATUS_INVAL = -1,
+       /** General error. */
+       BT_NOTIFICATION_ITERATOR_STATUS_ERROR = -2,
+       /** Out of memory. */
+       BT_NOTIFICATION_ITERATOR_STATUS_NOMEM = -3,
+       /** Unsupported iterator feature. */
+       BT_NOTIFICATION_ITERATOR_STATUS_UNSUPPORTED = -4,
+
+};
+
+/**
+ * Notification iterator seek reference.
+ */
+enum bt_notification_iterator_seek_origin {
+       /** Seek at a time relative to the beginning of the trace. */
+       BT_NOTIFICATION_ITERATOR_SEEK_ORIGIN_BEGIN = 0,
+
+       /** Seek at a time relative to the current position. */
+       BT_NOTIFICATION_ITERATOR_SEEK_ORIGIN_CURRENT = 1,
+
+       /** Seek at a time relative to the end of the trace. */
+       BT_NOTIFICATION_ITERATOR_SEEK_ORIGIN_END = 2,
+
+       /** Seek at a time relative to EPOCH. */
+       BT_NOTIFICATION_ITERATOR_SEEK_ORIGIN_EPOCH = 3,
+};
+
+/**
+ * Get current notification at iterator's position.
+ *
+ * This functions will <b>not</b> advance the cursor's position.
+ * The returned notification's reference count is already incremented.
+ *
+ * @param iterator     Iterator instance
+ * @returns            Returns a bt_notification instance
+ *
+ * @see bt_put()
+ */
+extern struct bt_notification *bt_notification_iterator_get_notification(
+               struct bt_notification_iterator *iterator);
+
+/**
+ * Advance the iterator's position forward.
+ *
+ * This function can be called repeatedly to iterate through the iterator's
+ * associated trace.
+ *
+ * @param iterator     Iterator instance
+ * @returns            Returns a bt_notification instance
+ *
+ * @see bt_notification_iterator_get_notification()
+ */
+extern enum bt_notification_iterator_status
+bt_notification_iterator_next(struct bt_notification_iterator *iterator);
+
+/**
+ * Seek iterator to time.
+ *
+ * Sets the iterator's position for the trace associated with the iterator.
+ * The new position is computed by adding \p time to the position specified
+ * by \p seek_origin.
+ *
+ * time is expressed in nanoseconds.
+ *
+ * @param iterator     Iterator instance
+ * @param seek_origin  One of #bt_notification_iterator_seek_type values.
+ * @returns            One of #bt_notification_iterator_status values;
+ *                     if \iterator does not support seeking,
+ *                     #BT_NOTIFICATION_ITERATOR_STATUS_UNSUPPORTED is
+ *                     returned.
+ *
+ * @see bt_notification_iterator_get_notification()
+ */
+extern enum bt_notification_iterator_status bt_notification_iterator_seek_time(
+               struct bt_notification_iterator *iterator,
+               enum bt_notification_iterator_seek_origin seek_origin,
+               int64_t time);
+
+extern struct bt_component *bt_notification_iterator_get_component(
+               struct bt_notification_iterator *iterator);
+
+/** bt_notification_iterator */
+/**
+ * Function returning an iterator's current notification.
+ *
+ * @param iterator     Notification iterator instance
+ * @returns            A notification instance
+ */
+typedef struct bt_notification *(*bt_notification_iterator_get_cb)(
+               struct bt_notification_iterator *iterator);
+
+/**
+ * Function advancing an iterator's position of one element.
+ *
+ * @param iterator     Notification iterator instance
+ * @returns            One of #bt_notification_iterator_status values
+ */
+typedef enum bt_notification_iterator_status (*bt_notification_iterator_next_cb)(
+               struct bt_notification_iterator *iterator);
+
+/**
+ * Function advancing an iterator's position to a given time (relative to Epoch).
+ *
+ * @param iterator     Notification iterator instance
+ * @param time         Time at which to seek, expressed in ns since Epoch
+ * @returns            One of #bt_notification_iterator_status values
+ */
+typedef enum bt_notification_iterator_status
+               (*bt_notification_iterator_seek_time_cb)(
+               struct bt_notification_iterator *iterator, int64_t time);
+
+/**
+ * Function cleaning-up an iterator's private data on destruction.
+ *
+ * @param iterator     Notification iterator instance
+ */
+typedef void (*bt_notification_iterator_destroy_cb)(
+               struct bt_notification_iterator *iterator);
+
+/**
+ * Set an iterator's "get" callback which return the current notification.
+ *
+ * @param iterator     Notification iterator instance
+ * @param get          Notification return callback
+ * @returns            One of #bt_notification_iterator_status values
+ */
+extern enum bt_notification_iterator_status
+bt_notification_iterator_set_get_cb(struct bt_notification_iterator *iterator,
+               bt_notification_iterator_get_cb get);
+
+/**
+ * Set an iterator's "next" callback which advances the iterator's position.
+ *
+ * @param iterator     Notification iterator instance
+ * @param next         Iterator "next" callback
+ * @returns            One of #bt_notification_iterator_status values
+ */
+extern enum bt_notification_iterator_status
+bt_notification_iterator_set_next_cb(struct bt_notification_iterator *iterator,
+               bt_notification_iterator_next_cb next);
+
+/**
+ * Set an iterator's "seek_time" callback which sets the iterator's position to
+ *     provided time (in ns since Epoch).
+ *
+ * @param iterator     Notification iterator instance
+ * @param seek_timetime        Iterator "seek_time" callback
+ * @returns            One of #bt_notification_iterator_status values
+ */
+extern enum bt_notification_iterator_status
+bt_notification_iterator_set_seek_time_cb(struct bt_notification_iterator *iterator,
+               bt_notification_iterator_seek_time_cb seek_time);
+
+/**
+ * Set an iterator's "destroy" callback.
+ *
+ * @param iterator     Notification iterator instance
+ * @param next         Iterator destruction callback
+ * @returns            One of #bt_notification_iterator_status values
+ */
+extern enum bt_notification_iterator_status
+bt_notification_iterator_set_destroy_cb(
+               struct bt_notification_iterator *iterator,
+               bt_notification_iterator_destroy_cb destroy);
+
+/**
+ * Set an iterator's private data.
+ *
+ * @param iterator     Notification iterator instance
+ * @param data         Iterator private data
+ * @returns            One of #bt_notification_iterator_status values
+ */
+extern enum bt_notification_iterator_status
+bt_notification_iterator_set_private_data(
+               struct bt_notification_iterator *iterator, void *data);
+
+/**
+ * Get an iterator's private data.
+ *
+ * @param iterator     Notification iterator instance
+ * @returns            Iterator instance private data
+ */
+extern void *bt_notification_iterator_get_private_data(
+               struct bt_notification_iterator *iterator);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* BABELTRACE_COMPONENT_NOTIFICATION_ITERATOR_H */

diff --git a/include/babeltrace/component/notification/notification-internal.h b/include/babeltrace/component/notification/notification-internal.h
new file mode 100644 (file)
index 0000000..8f3d055
--- /dev/null
+++ b/include/babeltrace/component/notification/notification-internal.h
@@ -0,0 +1,58 @@
+#ifndef BABELTRACE_COMPONENT_NOTIFICATION_NOTIFICATION_INTERNAL_H
+#define BABELTRACE_COMPONENT_NOTIFICATION_NOTIFICATION_INTERNAL_H
+
+/*
+ * BabelTrace - Plug-in Notification internal
+ *
+ * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/ref-internal.h>
+#include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/object-internal.h>
+#include <babeltrace/component/notification/notification.h>
+#include <babeltrace/ctf-ir/stream.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct bt_ctf_stream *(*get_stream_func)(
+               struct bt_notification *notification);
+
+struct bt_notification {
+       struct bt_object base;
+       enum bt_notification_type type;
+       get_stream_func get_stream;
+};
+
+BT_HIDDEN
+void bt_notification_init(struct bt_notification *notification,
+               enum bt_notification_type type,
+               bt_object_release_func release);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* BABELTRACE_COMPONENT_NOTIFICATION_NOTIFICATION_INTERNAL_H */

diff --git a/include/babeltrace/component/notification/notification.h b/include/babeltrace/component/notification/notification.h
new file mode 100644 (file)
index 0000000..d179733
--- /dev/null
+++ b/include/babeltrace/component/notification/notification.h
@@ -0,0 +1,88 @@
+#ifndef BABELTRACE_COMPONENT_NOTIFICATION_NOTIFICATION_H
+#define BABELTRACE_COMPONENT_NOTIFICATION_NOTIFICATION_H
+
+/*
+ * BabelTrace - Plug-in Notification
+ *
+ * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct bt_notification;
+
+/**
+ * Notification types. Unhandled notification types should be ignored.
+ */
+enum bt_notification_type {
+       BT_NOTIFICATION_TYPE_UNKNOWN = -1,
+
+       /**
+        * All types of notifications (used to register to notification
+        * delivery).
+        */
+       BT_NOTIFICATION_TYPE_ALL = 0,
+
+       /** Event delivery notification, see event.h */
+       BT_NOTIFICATION_TYPE_EVENT = 1,
+
+       /** Beginning of stream packet notification, see packet.h */
+       BT_NOTIFICATION_TYPE_PACKET_BEGIN = 2,
+
+       /** End of stream packet notification, see packet.h */
+       BT_NOTIFICATION_TYPE_PACKET_END = 3,
+
+       /** End of stream packet notification, see stream.h */
+       BT_NOTIFICATION_TYPE_STREAM_END = 4,
+
+       /** New trace notification, see model.h */
+       BT_NOTIFICATION_TYPE_NEW_TRACE = 5,
+
+       /** New stream class notification, see model.h */
+       BT_NOTIFICATION_TYPE_NEW_STREAM_CLASS = 6,
+
+       /** New event class notification, see model.h */
+       BT_NOTIFICATION_TYPE_NEW_EVENT_CLASS = 7,
+
+       /** End of trace notification, see eot.h */
+       BT_NOTIFICATION_TYPE_END_OF_TRACE = 8,
+
+       BT_NOTIFICATION_TYPE_NR, /* Not part of ABI. */
+};
+
+/**
+ * Get a notification's type.
+ *
+ * @param notification Notification instance
+ * @returns            One of #bt_notification_type
+ */
+extern enum bt_notification_type bt_notification_get_type(
+               struct bt_notification *notification);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* BABELTRACE_COMPONENT_NOTIFICATION_NOTIFICATION_H */

diff --git a/include/babeltrace/component/notification/packet-internal.h b/include/babeltrace/component/notification/packet-internal.h
new file mode 100644 (file)
index 0000000..3b7836d
--- /dev/null
+++ b/include/babeltrace/component/notification/packet-internal.h
@@ -0,0 +1,43 @@
+#ifndef BABELTRACE_COMPONENT_NOTIFICATION_PACKET_INTERNAL_H
+#define BABELTRACE_COMPONENT_NOTIFICATION_PACKET_INTERNAL_H
+
+/*
+ * BabelTrace - Packet-related Notifications
+ *
+ * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/ctf-ir/packet.h>
+#include <babeltrace/component/notification/notification-internal.h>
+
+struct bt_notification_packet_begin {
+       struct bt_notification parent;
+       struct bt_ctf_packet *packet;
+};
+
+struct bt_notification_packet_end {
+       struct bt_notification parent;
+       struct bt_ctf_packet *packet;
+};
+
+#endif /* BABELTRACE_COMPONENT_NOTIFICATION_PACKET_INTERNAL_H */

diff --git a/include/babeltrace/component/notification/packet.h b/include/babeltrace/component/notification/packet.h
new file mode 100644 (file)
index 0000000..d457aa2
--- /dev/null
+++ b/include/babeltrace/component/notification/packet.h
@@ -0,0 +1,54 @@
+#ifndef BABELTRACE_COMPONENT_NOTIFICATION_PACKET_H
+#define BABELTRACE_COMPONENT_NOTIFICATION_PACKET_H
+
+/*
+ * BabelTrace - Plug-in Packet-related Notifications
+ *
+ * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/component/notification/notification.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct bt_ctf_packet;
+
+/*** BT_NOTIFICATION_TYPE_PACKET_BEGIN ***/
+struct bt_notification *bt_notification_packet_begin_create(
+               struct bt_ctf_packet *packet);
+struct bt_ctf_packet *bt_notification_packet_begin_get_packet(
+               struct bt_notification *notification);
+
+/*** BT_NOTIFICATION_TYPE_PACKET_END ***/
+struct bt_notification *bt_notification_packet_end_create(
+               struct bt_ctf_packet *packet);
+struct bt_ctf_packet *bt_notification_packet_end_get_packet(
+               struct bt_notification *notification);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* BABELTRACE_COMPONENT_NOTIFICATION_PACKET_H */

diff --git a/include/babeltrace/component/notification/schema.h b/include/babeltrace/component/notification/schema.h
new file mode 100644 (file)
index 0000000..eb6f09e
--- /dev/null
+++ b/include/babeltrace/component/notification/schema.h
@@ -0,0 +1,114 @@
+#ifndef BABELTRACE_COMPONENT_NOTIFICATION_SCHEMA_H
+#define BABELTRACE_COMPONENT_NOTIFICATION_SCHEMA_H
+
+/*
+ * BabelTrace - Plug-in Schema Change Notification
+ *
+ * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct bt_notification;
+struct bt_ctf_trace;
+struct bt_ctf_stream_class;
+struct bt_ctf_event_class;
+
+/* BT_NOTIFICATION_TYPE_NEW_TRACE */
+/**
+ * Create a new trace notification.
+ *
+ * @param trace                        The new trace
+ * @returns                    A new trace notification instance
+ *
+ * @see #bt_notification_type
+ */
+extern struct bt_notification *bt_notification_new_trace_create(
+               struct bt_ctf_trace *trace);
+
+/**
+ * Get a new trace notification's associated trace.
+ *
+ * @param notification New trace notification instance
+ * @returns            A trace instance
+ *
+ * @see #bt_ctf_trace
+ */
+extern struct bt_ctf_trace *bt_notification_new_trace_get_trace(
+               struct bt_notification *notification);
+
+
+/* BT_NOTIFICATION_TYPE_NEW_STREAM_CLASS */
+/**
+ * Create a new stream class notification.
+ *
+ * @param trace                        The event's trace
+ * @returns                    A new stream class notification instance
+ *
+ * @see #bt_notification_type
+ */
+extern struct bt_notification *bt_notification_new_stream_class_create(
+               struct bt_ctf_stream_class *stream_class);
+
+/**
+ * Get a new stream class notification's associated stream class.
+ *
+ * @param notification New stream class notification instance
+ * @returns            A stream class instance
+ *
+ * @see #bt_ctf_stream_class
+ */
+extern struct bt_ctf_trace *bt_notification_new_stream_class_get_stream_class(
+               struct bt_notification *notification);
+
+
+/* BT_NOTIFICATION_TYPE_EVENT_CLASS */
+/**
+ * Create a new trace notification.
+ *
+ * @param trace                        The event's trace
+ * @returns                    An event notification instance
+ *
+ * @see #bt_notification_type
+ */
+extern struct bt_notification *bt_notification_new_trace_create(
+               struct bt_ctf_trace *trace);
+
+/**
+ * Get a new trace notification's associated trace.
+ *
+ * @param notification New trace notification instance
+ * @returns            A trace instance
+ *
+ * @see #bt_ctf_trace
+ */
+extern struct bt_ctf_trace *bt_notification_new_trace_get_trace(
+               struct bt_notification *notification);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* BABELTRACE_COMPONENT_NOTIFICATION_SCHEMA_H */

diff --git a/include/babeltrace/component/notification/stream-internal.h b/include/babeltrace/component/notification/stream-internal.h
new file mode 100644 (file)
index 0000000..83c7e24
--- /dev/null
+++ b/include/babeltrace/component/notification/stream-internal.h
@@ -0,0 +1,38 @@
+#ifndef BABELTRACE_COMPONENT_NOTIFICATION_STREAM_INTERNAL_H
+#define BABELTRACE_COMPONENT_NOTIFICATION_STREAM_INTERNAL_H
+
+/*
+ * BabelTrace - Stream-related Notifications
+ *
+ * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/ctf-ir/packet.h>
+#include <babeltrace/component/notification/notification-internal.h>
+
+struct bt_notification_stream_end {
+       struct bt_notification parent;
+       struct bt_ctf_stream *stream;
+};
+
+#endif /* BABELTRACE_COMPONENT_NOTIFICATION_STREAM_INTERNAL_H */

diff --git a/include/babeltrace/component/notification/stream.h b/include/babeltrace/component/notification/stream.h
new file mode 100644 (file)
index 0000000..c33b251
--- /dev/null
+++ b/include/babeltrace/component/notification/stream.h
@@ -0,0 +1,47 @@
+#ifndef BABELTRACE_COMPONENT_NOTIFICATION_STREAM_H
+#define BABELTRACE_COMPONENT_NOTIFICATION_STREAM_H
+
+/*
+ * BabelTrace - Plug-in Stream-related Notifications
+ *
+ * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/component/notification/notification.h>
+#include <babeltrace/ctf-ir/stream.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*** BT_NOTIFICATION_TYPE_STREAM_END ***/
+struct bt_notification *bt_notification_stream_end_create(
+               struct bt_ctf_stream *stream);
+struct bt_ctf_stream *bt_notification_stream_end_get_stream(
+               struct bt_notification *notification);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* BABELTRACE_COMPONENT_NOTIFICATION_STREAM_H */

diff --git a/include/babeltrace/component/sink-internal.h b/include/babeltrace/component/sink-internal.h
new file mode 100644 (file)
index 0000000..41733c3
--- /dev/null
+++ b/include/babeltrace/component/sink-internal.h
@@ -0,0 +1,72 @@
+#ifndef BABELTRACE_COMPONENT_SINK_INTERNAL_H
+#define BABELTRACE_COMPONENT_SINK_INTERNAL_H
+
+/*
+ * BabelTrace - Sink Component internal
+ *
+ * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/component/component-internal.h>
+#include <babeltrace/component/component-class-internal.h>
+#include <babeltrace/component/input.h>
+
+struct bt_value;
+
+struct bt_component_sink_class {
+       struct bt_component_class parent;
+};
+
+//typedef uint32_t notification_mask_t;
+
+struct bt_component_sink {
+       struct bt_component parent;
+       bt_component_sink_consume_cb consume;
+       bt_component_sink_add_iterator_cb add_iterator;
+       struct component_input input;
+/*     notification_mask_t registered_notifications_mask;*/
+};
+
+/**
+ * Allocate a sink component.
+ *
+ * @param class                        Component class
+ * @param params               A dictionary of component parameters
+ * @returns                    A sink component instance
+ */
+BT_HIDDEN
+struct bt_component *bt_component_sink_create(
+               struct bt_component_class *class, struct bt_value *params);
+
+/**
+ * Validate a sink component.
+ *
+ * @param component            Sink component instance to validate
+ * @returns                    One of #bt_component_status
+ */
+BT_HIDDEN
+enum bt_component_status bt_component_sink_validate(
+               struct bt_component *component);
+
+#endif /* BABELTRACE_COMPONENT_SINK_INTERNAL_H */

diff --git a/include/babeltrace/component/sink.h b/include/babeltrace/component/sink.h
new file mode 100644 (file)
index 0000000..31b5b67
--- /dev/null
+++ b/include/babeltrace/component/sink.h
@@ -0,0 +1,65 @@
+#ifndef BABELTRACE_COMPONENT_SINK_H
+#define BABELTRACE_COMPONENT_SINK_H
+
+/*
+ * BabelTrace - Sink Component Interface
+ *
+ * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/component/component.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct bt_component;
+struct bt_notification;
+
+/**
+ * Add a notification iterator to a sink component.
+ *
+ * @param component    Component instance
+ * @param iterator     Notification iterator to add
+ * @returns            One of #bt_component_status values
+ */
+extern
+enum bt_component_status bt_component_sink_add_iterator(
+               struct bt_component *component,
+               struct bt_notification_iterator *iterator);
+
+/**
+ * Process one event, consuming from sources as needed.
+ *
+ * @param component    Component instance
+ * @returns            One of #bt_component_status values
+ */
+extern
+enum bt_component_status bt_component_sink_consume(
+               struct bt_component *component);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* BABELTRACE_COMPONENT_SINK_H */

diff --git a/include/babeltrace/component/source-internal.h b/include/babeltrace/component/source-internal.h
new file mode 100644 (file)
index 0000000..0a926fc
--- /dev/null
+++ b/include/babeltrace/component/source-internal.h
@@ -0,0 +1,66 @@
+#ifndef BABELTRACE_COMPONENT_SOURCE_INTERNAL_H
+#define BABELTRACE_COMPONENT_SOURCE_INTERNAL_H
+
+/*
+ * BabelTrace - Source Component internal
+ *
+ * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/component/component-internal.h>
+#include <babeltrace/component/component-class-internal.h>
+
+struct bt_value;
+
+struct bt_component_source_class {
+       struct bt_component_class parent;
+};
+
+struct bt_component_source {
+       struct bt_component parent;
+       bt_component_source_init_iterator_cb init_iterator;
+};
+
+/**
+ * Allocate a source component.
+ *
+ * @param class                        Component class
+ * @param params               A dictionary of component parameters
+ * @returns                    A source component instance
+ */
+BT_HIDDEN
+struct bt_component *bt_component_source_create(
+               struct bt_component_class *class, struct bt_value *params);
+
+/**
+ * Validate a source component.
+ *
+ * @param component            Source component instance to validate
+ * @returns                    One of #bt_component_status
+ */
+BT_HIDDEN
+enum bt_component_status bt_component_source_validate(
+               struct bt_component *component);
+
+#endif /* BABELTRACE_COMPONENT_SOURCE_INTERNAL_H */

diff --git a/include/babeltrace/component/source.h b/include/babeltrace/component/source.h
new file mode 100644 (file)
index 0000000..fdb3eb2
--- /dev/null
+++ b/include/babeltrace/component/source.h
@@ -0,0 +1,54 @@
+#ifndef BABELTRACE_COMPONENT_SOURCE_H
+#define BABELTRACE_COMPONENT_SOURCE_H
+
+/*
+ * BabelTrace - Source Plug-in Interface
+ *
+ * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <stdint.h>
+#include <babeltrace/component/component.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct bt_component;
+struct bt_notification_iterator;
+
+/**
+ * Create an iterator on a component instance.
+ *
+ * @param component    Component instance
+ * @returns            Notification iterator instance
+ */
+extern
+struct bt_notification_iterator *bt_component_source_create_iterator(
+               struct bt_component *component);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* BABELTRACE_COMPONENT_SOURCE_H */

diff --git a/include/babeltrace/ctf-ir/trace.h b/include/babeltrace/ctf-ir/trace.h
index a95e206ee4fc6790ccd5709b100658bbeb0781d8..b722d92215f2909082ed88e2d4d44a1a761cbc72 100644 (file)
--- a/include/babeltrace/ctf-ir/trace.h
+++ b/include/babeltrace/ctf-ir/trace.h
@@ -33,7 +33,7 @@
 #include <babeltrace/ctf-ir/field-types.h>
 #include <babeltrace/ctf-ir/visitor.h>
 #include <babeltrace/values.h>
-#include <babeltrace/plugin/notification/notification.h>
+#include <babeltrace/component/notification/notification.h>
 #include <stdint.h>
 
 #ifdef __cplusplus

diff --git a/include/babeltrace/plugin/component-class-internal.h b/include/babeltrace/plugin/component-class-internal.h
deleted file mode 100644 (file)
index ccedff8..0000000
--- a/include/babeltrace/plugin/component-class-internal.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_COMPONENT_CLASS_INTERNAL_H
-#define BABELTRACE_PLUGIN_COMPONENT_CLASS_INTERNAL_H
-
-/*
- * BabelTrace - Component Class Internal
- *
- * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/plugin/component-factory-internal.h>
-#include <babeltrace/plugin/plugin-internal.h>
-#include <babeltrace/object-internal.h>
-
-struct bt_component_class {
-       struct bt_object base;
-       enum bt_component_type type;
-       GString *name;
-       GString *description;
-       struct bt_plugin *plugin;
-       bt_component_init_cb init;
-};
-
-BT_HIDDEN
-int bt_component_class_init(struct bt_component_class *class,
-               enum bt_component_type type, const char *name);
-
-BT_HIDDEN
-struct bt_component_class *bt_component_class_create(
-               enum bt_component_type type, const char *name,
-               const char *description, bt_component_init_cb init,
-               struct bt_plugin *plugin);
-
-#endif /* BABELTRACE_PLUGIN_COMPONENT_CLASS_INTERNAL_H */

diff --git a/include/babeltrace/plugin/component-class.h b/include/babeltrace/plugin/component-class.h
deleted file mode 100644 (file)
index 1526e4c..0000000
--- a/include/babeltrace/plugin/component-class.h
+++ /dev/null
@@ -1,91 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_COMPONENT_CLASS_H
-#define BABELTRACE_PLUGIN_COMPONENT_CLASS_H
-
-/*
- * Babeltrace - Component Class Interface.
- *
- * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Component type.
- */
-enum bt_component_type {
-       BT_COMPONENT_TYPE_UNKNOWN =     -1,
-
-       /** A source component is a notification generator. */
-       BT_COMPONENT_TYPE_SOURCE =      0,
-
-       /** A sink component handles incoming notifications. */
-       BT_COMPONENT_TYPE_SINK =        1,
-
-       /** A filter component implements both Source and Sink interfaces. */
-       BT_COMPONENT_TYPE_FILTER =      2,
-};
-
-struct bt_plugin;
-struct bt_component_class;
-
-
-/**
- * Get a component class' name.
- *
- * @param component_class      Component class of which to get the name
- * @returns                    Name of the component class
- */
-extern const char *bt_component_class_get_name(
-               struct bt_component_class *component_class);
-
-/**
- * Get a component class' description.
- *
- * Component classes may provide an optional description. It may, however,
- * opt not to.
- *
- * @param component_class      Component class of which to get the description
- * @returns                    Description of the component class, or NULL.
- */
-extern const char *bt_component_class_get_description(
-               struct bt_component_class *component_class);
-
-/**
- * Get a component class' type.
- *
- * @param component_class      Component class of which to get the type
- * @returns                    One of #bt_component_type
- */
-extern enum bt_component_type bt_component_class_get_type(
-               struct bt_component_class *component_class);
-
-/**
- * Get a component class' plug-in.
- *
- * @param component_class      Component class of which to get the plug-in
- * @returns                    The plug-in which registered the component class
- */
-extern struct bt_plugin *bt_component_class_get_plugin(
-               struct bt_component_class *component_class);
-
-#endif /* BABELTRACE_PLUGIN_COMPONENT_CLASS_H */

diff --git a/include/babeltrace/plugin/component-connection-internal.h b/include/babeltrace/plugin/component-connection-internal.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/include/babeltrace/plugin/component-connection.h b/include/babeltrace/plugin/component-connection.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/include/babeltrace/plugin/component-factory-internal.h b/include/babeltrace/plugin/component-factory-internal.h
deleted file mode 100644 (file)
index 10a2b78..0000000
--- a/include/babeltrace/plugin/component-factory-internal.h
+++ /dev/null
@@ -1,74 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_COMPONENT_FACTORY_INTERNAL_H
-#define BABELTRACE_PLUGIN_COMPONENT_FACTORY_INTERNAL_H
-
-/*
- * BabelTrace - Component Factory Internal
- *
- * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/object-internal.h>
-#include <babeltrace/plugin/component-factory.h>
-#include <babeltrace/plugin/component.h>
-#include <babeltrace/plugin/component-class-internal.h>
-#include <babeltrace/plugin/plugin-system.h>
-#include <babeltrace/plugin/plugin.h>
-#include <glib.h>
-
-#define SECTION_BEGIN(_name)   &__start_##_name
-#define SECTION_END(_name)     &__stop_##_name
-
-#define SECTION_ELEMENT_COUNT(_name) (SECTION_END(_name) - SECTION_BEGIN(_name))
-
-#define DECLARE_SECTION(_type, _name)                          \
-       extern _type const __start_##_name __attribute((weak)); \
-       extern _type const __stop_##_name __attribute((weak))
-
-#define DECLARE_PLUG_IN_SECTIONS                                               \
-       DECLARE_SECTION(bt_plugin_register_func, __plugin_register_funcs);      \
-       DECLARE_SECTION(const char *, __plugin_names);                          \
-       DECLARE_SECTION(const char *, __plugin_authors);                        \
-       DECLARE_SECTION(const char *, __plugin_licenses);                       \
-       DECLARE_SECTION(const char *, __plugin_descriptions)
-
-#define PRINT_SECTION(_printer, _name)                                 \
-       _printer("Section " #_name " [%p - %p], (%zu elements)\n",      \
-       SECTION_BEGIN(_name), SECTION_END(_name), SECTION_ELEMENT_COUNT(_name))
-
-#define PRINT_PLUG_IN_SECTIONS(_printer)                                       \
-       PRINT_SECTION(_printer, __plugin_register_funcs);                       \
-       PRINT_SECTION(_printer, __plugin_names);                                \
-       PRINT_SECTION(_printer, __plugin_authors);                              \
-       PRINT_SECTION(_printer, __plugin_licenses);                             \
-       PRINT_SECTION(_printer, __plugin_descriptions)
-
-struct bt_component_factory {
-       struct bt_object base;
-       /** Array of pointers to struct bt_component_class */
-       GPtrArray *component_classes;
-       /* Plug-in currently registering component classes. Weak ref. */
-       struct bt_plugin *current_plugin;
-};
-
-#endif /* BABELTRACE_PLUGIN_COMPONENT_FACTORY_INTERNAL_H */

diff --git a/include/babeltrace/plugin/component-factory.h b/include/babeltrace/plugin/component-factory.h
deleted file mode 100644 (file)
index 95c5767..0000000
--- a/include/babeltrace/plugin/component-factory.h
+++ /dev/null
@@ -1,169 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_COMPONENT_FACTORY_H
-#define BABELTRACE_PLUGIN_COMPONENT_FACTORY_H
-
-/*
- * Babeltrace - Component Factory Class Interface.
- *
- * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/plugin/component.h>
-#include <babeltrace/plugin/source.h>
-#include <babeltrace/plugin/sink.h>
-#include <babeltrace/plugin/filter.h>
-#include <babeltrace/plugin/plugin-system.h>
-#include <babeltrace/values.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Status code. Errors are always negative.
- */
-enum bt_component_factory_status {
-       /** General error. */
-       BT_COMPONENT_FACTORY_STATUS_ERROR =             -128,
-
-       /** Duplicate component class being registered. */
-       BT_COMPONENT_FACTORY_STATUS_DUPLICATE =         -7,
-
-       /** Invalid plugin. */
-       BT_COMPONENT_FACTORY_STATUS_INVAL_PLUGIN =      -6,
-
-       /** Invalid arguments. */
-       BT_COMPONENT_FACTORY_STATUS_INVAL =             -5,
-
-       /** Memory allocation failure. */
-       BT_COMPONENT_FACTORY_STATUS_NOMEM =             -4,
-
-       /** I/O error. */
-       BT_COMPONENT_FACTORY_STATUS_IO =                -3,
-
-       /** No such file or directory. */
-       BT_COMPONENT_FACTORY_STATUS_NOENT =             -2,
-
-       /** Operation not permitted. */
-       BT_COMPONENT_FACTORY_STATUS_PERM =              -1,
-
-       /** No error, okay. */
-       BT_COMPONENT_FACTORY_STATUS_OK =                0,
-};
-
-struct bt_component_factory;
-
-/**
- * Create a component factory.
- *
- * @returns    An instance of component factory
- */
-extern struct bt_component_factory *bt_component_factory_create(void);
-
-/**
- * Get the number of component classes registered to the component factory.
- *
- * @param factory      A component factory instance
- * @returns            The number of component classes registered to the
- *                     component factory, or a negative value on error.
- */
-extern int bt_component_factory_get_component_class_count(
-               struct bt_component_factory *factory);
-
-/**
- * Get component class at index.
- *
- * @param factory      A component factory instance
- * @param index                Index of the component class to return
- * @returns            A component class instance, NULL on error.
- */
-extern struct bt_component_class *bt_component_factory_get_component_class_index(
-               struct bt_component_factory *factory, int index);
-
-/**
- * Look-up component class.
- *
- * @param factory              A component factory instance
- * @param plugin_name          Name of the plug-in which registered the
- *                             component class
- * @param type                 Component type (@see #bt_component_type)
- * @param component_name       Component name
- * @returns                    A component class instance, NULL on error.
- */
-extern struct bt_component_class *bt_component_factory_get_component_class(
-               struct bt_component_factory *factory,
-               const char *plugin_name, enum bt_component_type type,
-               const char *component_name);
-
-/**
- * Load and register Babeltrace plugins under a given path.
- *
- * Path will be traversed if it is a directory, otherwise only the provided file
- * will be loaded.
- *
- * @param factory      A component factory instance
- * @param path         A path to a file or directory
- * @returns            One of #bt_component_factory_status values
- */
-extern enum bt_component_factory_status bt_component_factory_load(
-               struct bt_component_factory *factory, const char *path);
-
-/**
- * Recursively load and register Babeltrace plugins under a given path.
- *
- * Path will be traversed recursively if it is a directory, otherwise only the
- * provided file will be loaded.
- *
- * @param factory      A component factory instance
- * @param path         A path to a file or directory
- * @returns            One of #bt_component_factory_status values
- */
-extern enum bt_component_factory_status bt_component_factory_load_recursive(
-               struct bt_component_factory *factory, const char *path);
-
-/**
- * Load and register Babeltrace plugins statically-linked to the executable.
- *
- * @param factory      A component factory instance
- * @returns            One of #bt_component_factory_status values
- */
-extern enum bt_component_factory_status bt_component_factory_load_static(
-               struct bt_component_factory *factory);
-
-extern enum bt_component_factory_status
-bt_component_factory_register_source_component_class(
-               struct bt_component_factory *factory, const char *name,
-               const char *description, bt_component_init_cb init);
-
-extern enum bt_component_factory_status
-bt_component_factory_register_sink_component_class(
-               struct bt_component_factory *factory, const char *name,
-               const char *description, bt_component_init_cb init);
-
-extern enum bt_component_factory_status
-bt_component_factory_register_filter_component_class(
-               struct bt_component_factory *factory, const char *name,
-               const char *description, bt_component_init_cb init);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BABELTRACE_PLUGIN_COMPONENT_FACTORY_H */

diff --git a/include/babeltrace/plugin/component-graph-internal.h b/include/babeltrace/plugin/component-graph-internal.h
deleted file mode 100644 (file)
index ba618b7..0000000
--- a/include/babeltrace/plugin/component-graph-internal.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_COMPONENT_GRAPH_INTERNAL_H
-#define BABELTRACE_PLUGIN_COMPONENT_GRAPH_INTERNAL_H
-
-/*
- * BabelTrace - Component Graph Internal
- *
- * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/plugin/component-graph.h>
-#include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/object-internal.h>
-#include <glib.h>
-
-struct bt_component_graph {
-       struct bt_object base;
-       /* Array of pointers to bt_component_connection. */
-       GPtrArray *connections;
-       /*
-        * Array of pointers to bt_component.
-        *
-        * Components which were added to the graph, but have not been connected
-        * yet.
-        */
-       GPtrArray *loose_components;
-       /*
-        * Array of pointers to sink bt_component.
-        *
-        * A reference is held to the Sink components in order to implement the
-        * "run" interface, which executes the sinks in a round-robin pattern.
-        */
-       GPtrArray *sinks;
-};
-
-#endif /* BABELTRACE_PLUGIN_COMPONENT_GRAPH_INTERNAL_H */

diff --git a/include/babeltrace/plugin/component-graph.h b/include/babeltrace/plugin/component-graph.h
deleted file mode 100644 (file)
index 60dfe47..0000000
--- a/include/babeltrace/plugin/component-graph.h
+++ /dev/null
@@ -1,99 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_COMPONENT_GRAPH_H
-#define BABELTRACE_PLUGIN_COMPONENT_GRAPH_H
-
-/*
- * BabelTrace - Babeltrace Component Graph Interface
- *
- * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/plugin/component-class.h>
-#include <babeltrace/plugin/component.h>
-#include <babeltrace/values.h>
-#include <stdio.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum bt_component_graph_status {
-       BT_COMPONENT_GRAPH_STATUS_OK = 0,
-};
-
-/*
-Graph Ownership:
-
-                  Graph
-                    ^
-                    |
-               Connection
-                 ^     ^
-                /       \
-         ComponentA    ComponentB
-
-1) A graph only owns a set of connections.
-2) Components should _never_ own each other.
-3) A component can keep the complete graph "alive".
-
-*/
-extern struct bt_component_graph *bt_component_graph_create(void);
-
-/**
- * Creates a connection object which owns both components, invokes the
- * components' connection callback, and add the connection to the component
- * graph's set of connection.
- *
- * Will add any component that is not already part of the graph.
- */
-extern enum bt_component_graph_status bt_component_graph_connect(
-               struct bt_component_graph *graph, struct bt_component *upstream,
-               struct bt_component *downstream);
-
-/**
- * Add component to the graph
- */
-extern enum bt_component_graph_status bt_component_graph_add_component(
-               struct bt_component_graph *graph,
-               struct bt_component *component);
-
-/**
- * Add a component as a "sibling" of the origin component. Sibling share
- * connections equivalent to each other at the time of connection (same
- * parents and children).
- */
-extern enum bt_component_graph_status bt_component_graph_add_component_as_sibling(
-               struct bt_component_graph *graph, struct bt_component *origin,
-               struct bt_component *new_component);
-
-/**
- * Runs "bt_component_sink_consume()" on all sinks in round-robin until they all
- * indicate that the end is reached on that an error occured.
- */
-extern enum bt_component_graph_status bt_component_graph_run(
-               struct bt_component_graph *graph);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BABELTRACE_PLUGIN_COMPONENT_GRAPH_H */

diff --git a/include/babeltrace/plugin/component-internal.h b/include/babeltrace/plugin/component-internal.h
deleted file mode 100644 (file)
index 9cc39b3..0000000
--- a/include/babeltrace/plugin/component-internal.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_COMPONENT_INTERNAL_H
-#define BABELTRACE_PLUGIN_COMPONENT_INTERNAL_H
-
-/*
- * BabelTrace - Component internal
- *
- * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/plugin/plugin-system.h>
-#include <babeltrace/plugin/component.h>
-#include <babeltrace/plugin/component-class-internal.h>
-#include <babeltrace/object-internal.h>
-#include <glib.h>
-#include <stdio.h>
-
-struct bt_component {
-       struct bt_object base;
-       struct bt_component_class *class;
-       GString *name;
-       /** Source, Sink or Filter destroy */
-       bt_component_destroy_cb destroy;
-
-       /** User-defined data and its destruction callback */
-       void *user_data;
-       bt_component_destroy_cb user_destroy;
-
-       /**
-        * Used to protect operations which may only be used during
-        * a component's initialization.
-        */
-       bool initializing;
-};
-
-BT_HIDDEN
-enum bt_component_status bt_component_init(struct bt_component *component,
-               bt_component_destroy_cb destroy);
-
-BT_HIDDEN
-enum bt_component_type bt_component_get_type(struct bt_component *component);
-
-BT_HIDDEN
-struct bt_notification_iterator *bt_component_create_iterator(
-               struct bt_component *component);
-
-#endif /* BABELTRACE_PLUGIN_COMPONENT_INTERNAL_H */

diff --git a/include/babeltrace/plugin/component.h b/include/babeltrace/plugin/component.h
deleted file mode 100644 (file)
index c1ad622..0000000
--- a/include/babeltrace/plugin/component.h
+++ /dev/null
@@ -1,107 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_COMPONENT_H
-#define BABELTRACE_PLUGIN_COMPONENT_H
-
-/*
- * BabelTrace - Babeltrace Component Interface
- *
- * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/plugin/component-class.h>
-#include <babeltrace/values.h>
-#include <stdio.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Status code. Errors are always negative.
- */
-enum bt_component_status {
-       /** No error, okay. */
-       BT_COMPONENT_STATUS_OK =                0,
-       /** No more work to be done by this component. **/
-       BT_COMPONENT_STATUS_END =               1,
-       /**
-        * Component can't process a notification at this time
-        * (e.g. would block), try again later.
-        */
-       BT_COMPONENT_STATUS_AGAIN =             2,
-       /** General error. */
-       BT_COMPONENT_STATUS_ERROR =             -1,
-       /** Unsupported component feature. */
-       BT_COMPONENT_STATUS_UNSUPPORTED =       -2,
-       /** Invalid arguments. */
-       BT_COMPONENT_STATUS_INVALID =           -3,
-       /** Memory allocation failure. */
-       BT_COMPONENT_STATUS_NOMEM =             -4,
-};
-
-struct bt_component;
-struct bt_value;
-
-/**
- * Create an instance of a component from a component class.
- *
- * @param component_class      Component class of which to create an instance
- * @param name                 Name of the new component instance, optional
- * @param params               A dictionary of component parameters
- * @returns                    Returns a pointer to a new component instance
- */
-extern struct bt_component *bt_component_create(
-               struct bt_component_class *component_class, const char *name,
-               struct bt_value *params);
-
-/**
- * Get component's name.
- *
- * @param component    Component instance of which to get the name
- * @returns            Returns a pointer to the component's name
- */
-extern const char *bt_component_get_name(struct bt_component *component);
-
-/**
- * Set component's name.
- *
- * @param component    Component instance of which to set the name
- * @param name         New component name (will be copied)
- * @returns            One of #bt_component_status values
- */
-extern enum bt_component_status bt_component_set_name(
-               struct bt_component *component, const char *name);
-
-/**
- * Get component's class.
- *
- * @param component    Component instance of which to get the class
- * @returns            The component's class
- */
-extern struct bt_component_class *bt_component_get_class(
-               struct bt_component *component);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BABELTRACE_PLUGIN_COMPONENT_H */

diff --git a/include/babeltrace/plugin/filter-internal.h b/include/babeltrace/plugin/filter-internal.h
deleted file mode 100644 (file)
index 00498e4..0000000
--- a/include/babeltrace/plugin/filter-internal.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_FILTER_INTERNAL_H
-#define BABELTRACE_PLUGIN_FILTER_INTERNAL_H
-
-/*
- * BabelTrace - Filter Component Internal
- *
- * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/plugin/component-internal.h>
-#include <babeltrace/plugin/component-class-internal.h>
-#include <babeltrace/plugin/plugin-system.h>
-#include <babeltrace/plugin/input.h>
-
-struct bt_value;
-
-struct bt_component_filter_class {
-       struct bt_component_class parent;
-};
-
-struct bt_component_filter {
-       struct bt_component parent;
-       bt_component_filter_init_iterator_cb init_iterator;
-       bt_component_sink_add_iterator_cb add_iterator;
-       struct component_input input;
-};
-
-/**
- * Allocate a filter component.
- *
- * @param class                        Component class
- * @param params               A dictionary of component parameters
- * @returns                    A filter component instance
- */
-BT_HIDDEN
-struct bt_component *bt_component_filter_create(
-               struct bt_component_class *class, struct bt_value *params);
-
-/**
- * Validate a filter component.
- *
- * @param component            Filter component instance to validate
- * @returns                    One of #bt_component_status
- */
-BT_HIDDEN
-enum bt_component_status bt_component_filter_validate(
-               struct bt_component *component);
-
-#endif /* BABELTRACE_PLUGIN_FILTER_INTERNAL_H */

diff --git a/include/babeltrace/plugin/filter.h b/include/babeltrace/plugin/filter.h
deleted file mode 100644 (file)
index 14c6129..0000000
--- a/include/babeltrace/plugin/filter.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_FILTER_H
-#define BABELTRACE_PLUGIN_FILTER_H
-
-/*
- * BabelTrace - Filter Plug-in Interface
- *
- * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <stdint.h>
-#include <babeltrace/plugin/component.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct bt_component;
-struct bt_notification_iterator;
-
-/**
- * Add a notification iterator to a filter component.
- *
- * @param component    Component instance
- * @param iterator     Notification iterator to add
- * @returns            One of #bt_component_status values
- */
-extern
-enum bt_component_status bt_component_filter_add_iterator(
-               struct bt_component *component,
-               struct bt_notification_iterator *iterator);
-
-/**
- * Create an iterator on a component instance.
- *
- * @param component    Component instance
- * @returns            Notification iterator instance
- */
-extern
-struct bt_notification_iterator *bt_component_filter_create_iterator(
-               struct bt_component *component);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BABELTRACE_PLUGIN_FILTER_H */

diff --git a/include/babeltrace/plugin/input.h b/include/babeltrace/plugin/input.h
deleted file mode 100644 (file)
index e4b861b..0000000
--- a/include/babeltrace/plugin/input.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_INPUT_INTERNAL_H
-#define BABELTRACE_PLUGIN_INPUT_INTERNAL_H
-
-/*
- * BabelTrace - Component Input
- *
- * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/babeltrace-internal.h>
-#include <glib.h>
-#include <stdbool.h>
-
-struct component_input {
-       /* Array of struct bt_notification_iterator pointers. */
-       GPtrArray *iterators;
-       unsigned int min_count;
-       unsigned int max_count;
-       bool validated;
-};
-
-BT_HIDDEN
-int component_input_init(struct component_input *input);
-
-BT_HIDDEN
-int component_input_validate(struct component_input *input);
-
-BT_HIDDEN
-void component_input_fini(struct component_input *input);
-
-#endif /* BABELTRACE_PLUGIN_INPUT_INTERNAL_H */

diff --git a/include/babeltrace/plugin/notification/eot-internal.h b/include/babeltrace/plugin/notification/eot-internal.h
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/include/babeltrace/plugin/notification/eot.h b/include/babeltrace/plugin/notification/eot.h
deleted file mode 100644 (file)
index d33476c..0000000
--- a/include/babeltrace/plugin/notification/eot.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_NOTIFICATION_EOT_H
-#define BABELTRACE_PLUGIN_NOTIFICATION_EOT_H
-
-/*
- * BabelTrace - Plug-in End of Trace Notification
- *
- * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BABELTRACE_PLUGIN_NOTIFICATION_EOT_H */

diff --git a/include/babeltrace/plugin/notification/event-internal.h b/include/babeltrace/plugin/notification/event-internal.h
deleted file mode 100644 (file)
index 1f3143f..0000000
--- a/include/babeltrace/plugin/notification/event-internal.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_NOTIFICATION_EVENT_INTERNAL_H
-#define BABELTRACE_PLUGIN_NOTIFICATION_EVENT_INTERNAL_H
-
-/*
- * BabelTrace - Plug-in Event Notification internal
- *
- * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/ctf-ir/event.h>
-#include <babeltrace/plugin/notification/notification-internal.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct bt_notification_event {
-       struct bt_notification parent;
-       struct bt_ctf_event *event;
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BABELTRACE_PLUGIN_NOTIFICATION_EVENT_INTERNAL_H */

diff --git a/include/babeltrace/plugin/notification/event.h b/include/babeltrace/plugin/notification/event.h
deleted file mode 100644 (file)
index d60cd56..0000000
--- a/include/babeltrace/plugin/notification/event.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_NOTIFICATION_EVENT_H
-#define BABELTRACE_PLUGIN_NOTIFICATION_EVENT_H
-
-/*
- * BabelTrace - Plug-in Event Notification
- *
- * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct bt_notification;
-struct bt_ctf_event;
-
-/***BT_NOTIFICATION_TYPE_EVENT ***/
-/**
- * Create an event notification.
- *
- * @param event                        The event
- * @returns                    An event notification instance
- *
- * @see #bt_notification_type
- */
-extern struct bt_notification *bt_notification_event_create(
-               struct bt_ctf_event *event);
-
-/**
- * Get an event notification's event.
- *
- * @param notification Event notification instance
- * @returns            An event instance
- *
- * @see #bt_ctf_event
- */
-extern struct bt_ctf_event *bt_notification_event_get_event(
-               struct bt_notification *notification);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BABELTRACE_PLUGIN_NOTIFICATION_EVENT_H */

diff --git a/include/babeltrace/plugin/notification/heap-internal.h b/include/babeltrace/plugin/notification/heap-internal.h
deleted file mode 100644 (file)
index e21accb..0000000
--- a/include/babeltrace/plugin/notification/heap-internal.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef CTF_NOTIF_HEAP_INTERNAL_H
-#define CTF_NOTIF_HEAP_INTERNAL_H
-
-/*
- * Babeltrace - CTF notification heap priority heap
- *
- * Copyright (c) 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/object-internal.h>
-#include <babeltrace/plugin/notification/heap.h>
-#include <babeltrace/plugin/notification/notification.h>
-#include <glib.h>
-
-struct bt_notification_heap {
-       struct bt_object base;
-       GPtrArray *ptrs;
-       size_t count;
-       bt_notification_time_compare_func compare;
-       void *compare_data;
-};
-
-#endif /* CTF_NOTIF_HEAP_INTERNAL_H */

diff --git a/include/babeltrace/plugin/notification/heap.h b/include/babeltrace/plugin/notification/heap.h
deleted file mode 100644 (file)
index 7fde9ed..0000000
--- a/include/babeltrace/plugin/notification/heap.h
+++ /dev/null
@@ -1,93 +0,0 @@
-#ifndef BT_NOTIFICATION_HEAP_H
-#define BT_NOTIFICATION_HEAP_H
-
-/*
- * Babeltrace - Notification Heap
- *
- * Copyright (c) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- * Copyright (c) 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <stddef.h>
-#include <stdbool.h>
-#include <babeltrace/plugin/notification/notification.h>
-#include <babeltrace/babeltrace-internal.h>
-
-/**
- * bt_notification_time_compare - Compare two notifications' timestamps
- *
- * Compare two notifications in the time domain. Return true if 'a' happened
- * prior to 'b'. In the case where both notifications are deemed to have
- * happened at the same time, an implementation-defined critarion shall be
- * used to order the notifications. This criterion shall ensure a consistent
- * ordering over multiple runs.
- */
-typedef bool (*bt_notification_time_compare_func)(
-               struct bt_notification *a, struct bt_notification *b,
-               void *user_data);
-
-/**
- * bt_notification_heap_create - create a new bt_notification heap.
- *
- * @comparator: Function to use for notification comparisons.
- *
- * Returns a new notification heap, NULL on error.
- */
-extern struct bt_notification_heap *bt_notification_heap_create(
-               bt_notification_time_compare_func comparator, void *user_data);
-
-/**
- * bt_notification_heap_insert - insert an element into the heap
- *
- * @heap: the heap to be operated on
- * @notification: the notification to add
- *
- * Insert a notification into the heap.
- *
- * Returns 0 on success, a negative value on error.
- */
-extern int bt_notification_heap_insert(struct bt_notification_heap *heap,
-               struct bt_notification *notification);
-
-/**
- * bt_notification_heap_peek - return the element on top of the heap.
- *
- * @heap: the heap to be operated on
- *
- * Returns the top element of the heap, without performing any modification
- * to the heap structure. Returns NULL if the heap is empty. The returned
- * notification must be bt_put() by the caller.
- */
-extern struct bt_notification *bt_notification_heap_peek(
-               struct bt_notification_heap *heap);
-
-/**
- * bt_notification_heap_pop - remove the element sitting on top of the heap.
- * @heap: the heap to be operated on
- *
- * Returns the top element of the heap. The element is removed from the
- * heap. Returns NULL if the heap is empty. The returned notification must be
- * bt_put() by the caller.
- */
-extern struct bt_notification *bt_notification_heap_pop(
-               struct bt_notification_heap *heap);
-
-#endif /* BT_NOTIFICATION_HEAP_H */

diff --git a/include/babeltrace/plugin/notification/iterator-internal.h b/include/babeltrace/plugin/notification/iterator-internal.h
deleted file mode 100644 (file)
index 4718359..0000000
--- a/include/babeltrace/plugin/notification/iterator-internal.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_ITERATOR_INTERNAL_H
-#define BABELTRACE_PLUGIN_ITERATOR_INTERNAL_H
-
-/*
- * BabelTrace - Notification Iterator Internal
- *
- * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/plugin/plugin-system.h>
-#include <babeltrace/ref-internal.h>
-#include <babeltrace/plugin/notification/iterator.h>
-
-struct bt_notification_iterator {
-       struct bt_object base;
-       struct bt_component *component;
-       bt_notification_iterator_get_cb get;
-       bt_notification_iterator_next_cb next;
-       bt_notification_iterator_seek_time_cb seek_time;
-       void *user_data;
-       bt_notification_iterator_destroy_cb user_destroy;
-};
-
-/**
- * Allocate a notification iterator.
- *
- * @param component            Component instance
- * @returns                    A notification iterator instance
- */
-BT_HIDDEN
-struct bt_notification_iterator *bt_notification_iterator_create(
-               struct bt_component *component);
-
-/**
- * Validate a notification iterator.
- *
- * @param iterator             Notification iterator instance
- * @returns                    One of #bt_component_status values
- */
-BT_HIDDEN
-enum bt_notification_iterator_status bt_notification_iterator_validate(
-               struct bt_notification_iterator *iterator);
-
-#endif /* BABELTRACE_PLUGIN_ITERATOR_INTERNAL_H */

diff --git a/include/babeltrace/plugin/notification/iterator.h b/include/babeltrace/plugin/notification/iterator.h
deleted file mode 100644 (file)
index 20bc1cb..0000000
--- a/include/babeltrace/plugin/notification/iterator.h
+++ /dev/null
@@ -1,133 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_NOTIFICATION_ITERATOR_H
-#define BABELTRACE_PLUGIN_NOTIFICATION_ITERATOR_H
-
-/*
- * BabelTrace - Plug-in Notification Iterator
- *
- * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct bt_notification;
-struct bt_notification_iterator;
-
-/**
- * Status code. Errors are always negative.
- */
-enum bt_notification_iterator_status {
-       /** No more notifications to be delivered. */
-       BT_NOTIFICATION_ITERATOR_STATUS_END = 1,
-       /** No error, okay. */
-       BT_NOTIFICATION_ITERATOR_STATUS_OK = 0,
-       /** Invalid arguments. */
-       BT_NOTIFICATION_ITERATOR_STATUS_INVAL = -1,
-       /** General error. */
-       BT_NOTIFICATION_ITERATOR_STATUS_ERROR = -2,
-       /** Out of memory. */
-       BT_NOTIFICATION_ITERATOR_STATUS_NOMEM = -3,
-       /** Unsupported iterator feature. */
-       BT_NOTIFICATION_ITERATOR_STATUS_UNSUPPORTED = -4,
-
-};
-
-/**
- * Notification iterator seek reference.
- */
-enum bt_notification_iterator_seek_origin {
-       /** Seek at a time relative to the beginning of the trace. */
-       BT_NOTIFICATION_ITERATOR_SEEK_ORIGIN_BEGIN = 0,
-
-       /** Seek at a time relative to the current position. */
-       BT_NOTIFICATION_ITERATOR_SEEK_ORIGIN_CURRENT = 1,
-
-       /** Seek at a time relative to the end of the trace. */
-       BT_NOTIFICATION_ITERATOR_SEEK_ORIGIN_END = 2,
-
-       /** Seek at a time relative to EPOCH. */
-       BT_NOTIFICATION_ITERATOR_SEEK_ORIGIN_EPOCH = 3,
-};
-
-/**
- * Get current notification at iterator's position.
- *
- * This functions will <b>not</b> advance the cursor's position.
- * The returned notification's reference count is already incremented.
- *
- * @param iterator     Iterator instance
- * @returns            Returns a bt_notification instance
- *
- * @see bt_put()
- */
-extern struct bt_notification *bt_notification_iterator_get_notification(
-               struct bt_notification_iterator *iterator);
-
-/**
- * Advance the iterator's position forward.
- *
- * This function can be called repeatedly to iterate through the iterator's
- * associated trace.
- *
- * @param iterator     Iterator instance
- * @returns            Returns a bt_notification instance
- *
- * @see bt_notification_iterator_get_notification()
- */
-extern enum bt_notification_iterator_status
-bt_notification_iterator_next(struct bt_notification_iterator *iterator);
-
-/**
- * Seek iterator to time.
- *
- * Sets the iterator's position for the trace associated with the iterator.
- * The new position is computed by adding \p time to the position specified
- * by \p seek_origin.
- *
- * time is expressed in nanoseconds.
- *
- * @param iterator     Iterator instance
- * @param seek_origin  One of #bt_notification_iterator_seek_type values.
- * @returns            One of #bt_notification_iterator_status values;
- *                     if \iterator does not support seeking,
- *                     #BT_NOTIFICATION_ITERATOR_STATUS_UNSUPPORTED is
- *                     returned.
- *
- * @see bt_notification_iterator_get_notification()
- */
-extern enum bt_notification_iterator_status bt_notification_iterator_seek_time(
-               struct bt_notification_iterator *iterator,
-               enum bt_notification_iterator_seek_origin seek_origin,
-               int64_t time);
-
-extern struct bt_component *bt_notification_iterator_get_component(
-               struct bt_notification_iterator *iterator);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BABELTRACE_PLUGIN_NOTIFICATION_ITERATOR_H */

diff --git a/include/babeltrace/plugin/notification/notification-internal.h b/include/babeltrace/plugin/notification/notification-internal.h
deleted file mode 100644 (file)
index 2259eac..0000000
--- a/include/babeltrace/plugin/notification/notification-internal.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_NOTIFICATION_INTERNAL_H
-#define BABELTRACE_PLUGIN_NOTIFICATION_INTERNAL_H
-
-/*
- * BabelTrace - Plug-in Notification internal
- *
- * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/ref-internal.h>
-#include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/object-internal.h>
-#include <babeltrace/plugin/notification/notification.h>
-#include <babeltrace/ctf-ir/stream.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct bt_ctf_stream *(*get_stream_func)(
-               struct bt_notification *notification);
-
-struct bt_notification {
-       struct bt_object base;
-       enum bt_notification_type type;
-       get_stream_func get_stream;
-};
-
-BT_HIDDEN
-void bt_notification_init(struct bt_notification *notification,
-               enum bt_notification_type type,
-               bt_object_release_func release);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BABELTRACE_PLUGIN_NOTIFICATION_INTERNAL_H */

diff --git a/include/babeltrace/plugin/notification/notification.h b/include/babeltrace/plugin/notification/notification.h
deleted file mode 100644 (file)
index 34a185a..0000000
--- a/include/babeltrace/plugin/notification/notification.h
+++ /dev/null
@@ -1,88 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_NOTIFICATION_H
-#define BABELTRACE_PLUGIN_NOTIFICATION_H
-
-/*
- * BabelTrace - Plug-in Notification
- *
- * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct bt_notification;
-
-/**
- * Notification types. Unhandled notification types should be ignored.
- */
-enum bt_notification_type {
-       BT_NOTIFICATION_TYPE_UNKNOWN = -1,
-
-       /**
-        * All types of notifications (used to register to notification
-        * delivery).
-        */
-       BT_NOTIFICATION_TYPE_ALL = 0,
-
-       /** Event delivery notification, see event.h */
-       BT_NOTIFICATION_TYPE_EVENT = 1,
-
-       /** Beginning of stream packet notification, see packet.h */
-       BT_NOTIFICATION_TYPE_PACKET_BEGIN = 2,
-
-       /** End of stream packet notification, see packet.h */
-       BT_NOTIFICATION_TYPE_PACKET_END = 3,
-
-       /** End of stream packet notification, see stream.h */
-       BT_NOTIFICATION_TYPE_STREAM_END = 4,
-
-       /** New trace notification, see model.h */
-       BT_NOTIFICATION_TYPE_NEW_TRACE = 5,
-
-       /** New stream class notification, see model.h */
-       BT_NOTIFICATION_TYPE_NEW_STREAM_CLASS = 6,
-
-       /** New event class notification, see model.h */
-       BT_NOTIFICATION_TYPE_NEW_EVENT_CLASS = 7,
-
-       /** End of trace notification, see eot.h */
-       BT_NOTIFICATION_TYPE_END_OF_TRACE = 8,
-
-       BT_NOTIFICATION_TYPE_NR, /* Not part of ABI. */
-};
-
-/**
- * Get a notification's type.
- *
- * @param notification Notification instance
- * @returns            One of #bt_notification_type
- */
-extern enum bt_notification_type bt_notification_get_type(
-               struct bt_notification *notification);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BABELTRACE_PLUGIN_NOTIFICATION_H */

diff --git a/include/babeltrace/plugin/notification/packet-internal.h b/include/babeltrace/plugin/notification/packet-internal.h
deleted file mode 100644 (file)
index e36bb6a..0000000
--- a/include/babeltrace/plugin/notification/packet-internal.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_NOTIFICATION_PACKET_INTERNAL_H
-#define BABELTRACE_PLUGIN_NOTIFICATION_PACKET_INTERNAL_H
-
-/*
- * BabelTrace - Packet-related Notifications
- *
- * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/ctf-ir/packet.h>
-#include <babeltrace/plugin/notification/notification-internal.h>
-
-struct bt_notification_packet_begin {
-       struct bt_notification parent;
-       struct bt_ctf_packet *packet;
-};
-
-struct bt_notification_packet_end {
-       struct bt_notification parent;
-       struct bt_ctf_packet *packet;
-};
-
-#endif /* BABELTRACE_PLUGIN_NOTIFICATION_PACKET_INTERNAL_H */

diff --git a/include/babeltrace/plugin/notification/packet.h b/include/babeltrace/plugin/notification/packet.h
deleted file mode 100644 (file)
index c90b4c9..0000000
--- a/include/babeltrace/plugin/notification/packet.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_NOTIFICATION_PACKET_H
-#define BABELTRACE_PLUGIN_NOTIFICATION_PACKET_H
-
-/*
- * BabelTrace - Plug-in Packet-related Notifications
- *
- * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/plugin/notification/notification.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct bt_ctf_packet;
-
-/*** BT_NOTIFICATION_TYPE_PACKET_BEGIN ***/
-struct bt_notification *bt_notification_packet_begin_create(
-               struct bt_ctf_packet *packet);
-struct bt_ctf_packet *bt_notification_packet_begin_get_packet(
-               struct bt_notification *notification);
-
-/*** BT_NOTIFICATION_TYPE_PACKET_END ***/
-struct bt_notification *bt_notification_packet_end_create(
-               struct bt_ctf_packet *packet);
-struct bt_ctf_packet *bt_notification_packet_end_get_packet(
-               struct bt_notification *notification);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BABELTRACE_PLUGIN_NOTIFICATION_PACKET_H */

diff --git a/include/babeltrace/plugin/notification/schema.h b/include/babeltrace/plugin/notification/schema.h
deleted file mode 100644 (file)
index 5d7b642..0000000
--- a/include/babeltrace/plugin/notification/schema.h
+++ /dev/null
@@ -1,114 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_NOTIFICATION_SCHEMA_H
-#define BABELTRACE_PLUGIN_NOTIFICATION_SCHEMA_H
-
-/*
- * BabelTrace - Plug-in Schema Change Notification
- *
- * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct bt_notification;
-struct bt_ctf_trace;
-struct bt_ctf_stream_class;
-struct bt_ctf_event_class;
-
-/* BT_NOTIFICATION_TYPE_NEW_TRACE */
-/**
- * Create a new trace notification.
- *
- * @param trace                        The new trace
- * @returns                    A new trace notification instance
- *
- * @see #bt_notification_type
- */
-extern struct bt_notification *bt_notification_new_trace_create(
-               struct bt_ctf_trace *trace);
-
-/**
- * Get a new trace notification's associated trace.
- *
- * @param notification New trace notification instance
- * @returns            A trace instance
- *
- * @see #bt_ctf_trace
- */
-extern struct bt_ctf_trace *bt_notification_new_trace_get_trace(
-               struct bt_notification *notification);
-
-
-/* BT_NOTIFICATION_TYPE_NEW_STREAM_CLASS */
-/**
- * Create a new stream class notification.
- *
- * @param trace                        The event's trace
- * @returns                    A new stream class notification instance
- *
- * @see #bt_notification_type
- */
-extern struct bt_notification *bt_notification_new_stream_class_create(
-               struct bt_ctf_stream_class *stream_class);
-
-/**
- * Get a new stream class notification's associated stream class.
- *
- * @param notification New stream class notification instance
- * @returns            A stream class instance
- *
- * @see #bt_ctf_stream_class
- */
-extern struct bt_ctf_trace *bt_notification_new_stream_class_get_stream_class(
-               struct bt_notification *notification);
-
-
-/* BT_NOTIFICATION_TYPE_EVENT_CLASS */
-/**
- * Create a new trace notification.
- *
- * @param trace                        The event's trace
- * @returns                    An event notification instance
- *
- * @see #bt_notification_type
- */
-extern struct bt_notification *bt_notification_new_trace_create(
-               struct bt_ctf_trace *trace);
-
-/**
- * Get a new trace notification's associated trace.
- *
- * @param notification New trace notification instance
- * @returns            A trace instance
- *
- * @see #bt_ctf_trace
- */
-extern struct bt_ctf_trace *bt_notification_new_trace_get_trace(
-               struct bt_notification *notification);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BABELTRACE_PLUGIN_NOTIFICATION_SCHEMA_H */

diff --git a/include/babeltrace/plugin/notification/stream-internal.h b/include/babeltrace/plugin/notification/stream-internal.h
deleted file mode 100644 (file)
index 73e2fd6..0000000
--- a/include/babeltrace/plugin/notification/stream-internal.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_NOTIFICATION_STREAM_INTERNAL_H
-#define BABELTRACE_PLUGIN_NOTIFICATION_STREAM_INTERNAL_H
-
-/*
- * BabelTrace - Stream-related Notifications
- *
- * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/ctf-ir/packet.h>
-#include <babeltrace/plugin/notification/notification-internal.h>
-
-struct bt_notification_stream_end {
-       struct bt_notification parent;
-       struct bt_ctf_stream *stream;
-};
-
-#endif /* BABELTRACE_PLUGIN_NOTIFICATION_STREAM_INTERNAL_H */

diff --git a/include/babeltrace/plugin/notification/stream.h b/include/babeltrace/plugin/notification/stream.h
deleted file mode 100644 (file)
index f717365..0000000
--- a/include/babeltrace/plugin/notification/stream.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_NOTIFICATION_STREAM_H
-#define BABELTRACE_PLUGIN_NOTIFICATION_STREAM_H
-
-/*
- * BabelTrace - Plug-in Stream-related Notifications
- *
- * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/plugin/notification/notification.h>
-#include <babeltrace/ctf-ir/stream.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*** BT_NOTIFICATION_TYPE_STREAM_END ***/
-struct bt_notification *bt_notification_stream_end_create(
-               struct bt_ctf_stream *stream);
-struct bt_ctf_stream *bt_notification_stream_end_get_stream(
-               struct bt_notification *notification);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BABELTRACE_PLUGIN_NOTIFICATION_STREAM_H */

diff --git a/include/babeltrace/plugin/plugin-dev.h b/include/babeltrace/plugin/plugin-dev.h
new file mode 100644 (file)
index 0000000..ffa39bb
--- /dev/null
+++ b/include/babeltrace/plugin/plugin-dev.h
@@ -0,0 +1,123 @@
+#ifndef BABELTRACE_PLUGIN_PLUGIN_DEV_H
+#define BABELTRACE_PLUGIN_PLUGIN_DEV_H
+
+/*
+ * BabelTrace - Babeltrace Plug-in System Interface
+ *
+ * This is the header that you need to include for the development of
+ * a Babeltrace plug-in.
+ *
+ * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright 2017 Philippe Proulx <pproulx@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/plugin/plugin.h>
+#include <babeltrace/component/component-class.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum bt_plugin_status (*bt_plugin_init_func)(
+               struct bt_plugin *plugin);
+
+typedef enum bt_plugin_status (*bt_plugin_exit_func)(void);
+
+extern enum bt_plugin_status bt_plugin_add_component_class(
+               struct bt_plugin *plugin,
+               struct bt_component_class *component_class);
+
+#ifdef BT_BUILT_IN_PLUGINS
+/*
+ * Statically-linked plug-in symbol types are stored in separate sections and
+ * which are read using the bt_component_factory interface.
+ */
+# define BT_PLUGIN_INIT(_x)            static bt_plugin_init_func __attribute__((section("__bt_plugin_init_funcs"), used)) __bt_plugin_init = (_x)
+# define BT_PLUGIN_EXIT(_x)            static bt_plugin_exit_func __attribute__((section("__bt_plugin_exit_funcs"), used)) __bt_plugin_exit = (_x)
+# define BT_PLUGIN_NAME(_x)            static const char *__bt_plugin_name __attribute__((section("__bt_plugin_names"), used)) = (_x)
+# define BT_PLUGIN_AUTHOR(_x)          static const char *__bt_plugin_author __attribute__((section("__bt_plugin_authors"), used)) = (_x)
+# define BT_PLUGIN_LICENSE(_x)         static const char *__bt_plugin_license __attribute__((section("__bt_plugin_licenses"), used)) = (_x)
+# define BT_PLUGIN_DESCRIPTION(_x)     static const char *__bt_plugin_description __attribute__((section("__bt_plugin_descriptions"), used)) = (_x)
+#else /* BT_BUILT_IN_PLUGINS */
+# define BT_PLUGIN_INIT(_x)            bt_plugin_init_func __bt_plugin_init = (_x)
+# define BT_PLUGIN_EXIT(_x)            bt_plugin_exit_func __bt_plugin_exit = (_x)
+# define BT_PLUGIN_NAME(_x)            const char __bt_plugin_name[] = (_x)
+# define BT_PLUGIN_AUTHOR(_x)          const char __bt_plugin_author[] = (_x)
+# define BT_PLUGIN_LICENSE(_x)         const char __bt_plugin_license[] = (_x)
+# define BT_PLUGIN_DESCRIPTION(_x)     const char __bt_plugin_description[] = (_x)
+#endif /* BT_BUILT_IN_PLUGINS */
+
+#define BT_PLUGIN_COMPONENT_CLASSES_BEGIN                                      \
+       static enum bt_plugin_status __bt_plugin_init_add_component_classes(    \
+                       struct bt_plugin *plugin)                               \
+       {                                                                       \
+               enum bt_plugin_status status = BT_PLUGIN_STATUS_OK;             \
+               struct bt_component_class *component_class = NULL;
+
+#define __BT_PLUGIN_COMPONENT_CLASS_ENTRY_EPILOGUE                             \
+               if (!component_class) {                                         \
+                       status = BT_PLUGIN_STATUS_ERROR;                        \
+                       goto end;                                               \
+               }                                                               \
+               status = bt_plugin_add_component_class(plugin, component_class);\
+               bt_put(component_class);                                        \
+               component_class = NULL;                                         \
+               if (status < 0) {                                               \
+                       goto end;                                               \
+               }
+
+#define BT_PLUGIN_COMPONENT_CLASS_SOURCE_ENTRY(_name, _description, _init_func)        \
+               component_class = bt_component_class_create(                    \
+                       BT_COMPONENT_TYPE_SOURCE, _name,                        \
+                       _description, _init_func);                              \
+               __BT_PLUGIN_COMPONENT_CLASS_ENTRY_EPILOGUE
+
+#define BT_PLUGIN_COMPONENT_CLASS_SINK_ENTRY(_name, _description, _init_func)  \
+               component_class = bt_component_class_create(                    \
+                       BT_COMPONENT_TYPE_SINK, _name,                          \
+                       _description, _init_func);                              \
+               __BT_PLUGIN_COMPONENT_CLASS_ENTRY_EPILOGUE
+
+#define BT_PLUGIN_COMPONENT_CLASS_FILTER_ENTRY(_name, _description, _init_func)        \
+               component_class = bt_component_class_create(                    \
+                       BT_COMPONENT_TYPE_FILTER, _name,                        \
+                       _description, _init_func);                              \
+               __BT_PLUGIN_COMPONENT_CLASS_ENTRY_EPILOGUE
+
+#define BT_PLUGIN_COMPONENT_CLASSES_END                                                \
+       end:                                                                    \
+               return status;                                                  \
+       }                                                                       \
+                                                                               \
+       static enum bt_plugin_status __bt_plugin_nop_exit(void) {               \
+               return BT_PLUGIN_STATUS_OK;                                     \
+       }                                                                       \
+                                                                               \
+       BT_PLUGIN_INIT(__bt_plugin_init_add_component_classes);                 \
+       BT_PLUGIN_EXIT(__bt_plugin_nop_exit);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* BABELTRACE_PLUGIN_PLUGIN_DEV_H */

diff --git a/include/babeltrace/plugin/plugin-internal.h b/include/babeltrace/plugin/plugin-internal.h
index b33eb2e37dd5fb5eb0cc6d92fc0348ed995373ac..0509be4485dd32d844459c4f3e861a3cff9f3666 100644 (file)
--- a/include/babeltrace/plugin/plugin-internal.h
+++ b/include/babeltrace/plugin/plugin-internal.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_PLUGIN_INTERNAL_H
-#define BABELTRACE_PLUGIN_INTERNAL_H
+#ifndef BABELTRACE_PLUGIN_PLUGIN_INTERNAL_H
+#define BABELTRACE_PLUGIN_PLUGIN_INTERNAL_H
 
 /*
  * BabelTrace - Plug-in Internal
@@ -28,41 +28,35 @@
  */
 
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/ref-internal.h>
-#include <babeltrace/plugin/component.h>
-#include <babeltrace/plugin/plugin-system.h>
+#include <babeltrace/plugin/plugin-dev.h>
 #include <babeltrace/object-internal.h>
+#include <stdbool.h>
 #include <gmodule.h>
 
-/**
- * Plug-ins are owned by bt_component_factory and the bt_component_class-es
- * it provides. This means that its lifetime bound by either the component
- * factory's, or the concrete components' lifetime which may be in use and which
- * have hold a reference to their bt_component_class which, in turn, have a
- * reference to their plugin.
- *
- * This ensures that a plugin's library is not closed while it is being used
- * even if the bt_component_factory, which created its components, is destroyed.
- */
-struct bt_plugin {
+struct bt_plugin_shared_lib_handle {
        struct bt_object base;
+       GString *path;
+       GModule *module;
+       bool init_called;
+
+       /* The members below belong to the shared library */
        const char *name;
        const char *author;
        const char *license;
        const char *description;
-       GString *path;
-       bt_plugin_register_func _register;
-       GModule *module;
+       bt_plugin_init_func init;
+       bt_plugin_exit_func exit;
 };
 
-BT_HIDDEN
-struct bt_plugin *bt_plugin_create_from_module(GModule *module, const char *path);
+struct bt_plugin {
+       struct bt_object base;
+       bool frozen;
 
-BT_HIDDEN
-struct bt_plugin *bt_plugin_create_from_static(size_t i);
+       /* Owned by this */
+       struct bt_plugin_shared_lib_handle *shared_lib_handle;
 
-BT_HIDDEN
-enum bt_component_status bt_plugin_register_component_classes(
-               struct bt_plugin *plugin, struct bt_component_factory *factory);
+       /* Array of pointers to bt_component_class (owned by this) */
+       GPtrArray *comp_classes;
+};
 
-#endif /* BABELTRACE_PLUGIN_INTERNAL_H */
+#endif /* BABELTRACE_PLUGIN_PLUGIN_INTERNAL_H */

diff --git a/include/babeltrace/plugin/plugin-macros.h b/include/babeltrace/plugin/plugin-macros.h
deleted file mode 100644 (file)
index f94c357..0000000
--- a/include/babeltrace/plugin/plugin-macros.h
+++ /dev/null
@@ -1,80 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_MACROS_H
-#define BABELTRACE_PLUGIN_MACROS_H
-
-/*
- * BabelTrace - Babeltrace Plug-in Helper Macros
- *
- * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- * Copyright 2015 Philippe Proulx <pproulx@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/plugin/component-factory.h>
-#include <babeltrace/plugin/component.h>
-#include <babeltrace/plugin/plugin.h>
-
-#ifndef BT_BUILT_IN_PLUGINS
-
-#define BT_PLUGIN_REGISTER(_x)         bt_plugin_register_func __bt_plugin_register = (_x)
-#define BT_PLUGIN_NAME(_x)             const char __bt_plugin_name[] = (_x)
-#define BT_PLUGIN_AUTHOR(_x)           const char __bt_plugin_author[] = (_x)
-#define BT_PLUGIN_LICENSE(_x)          const char __bt_plugin_license[] = (_x)
-#define BT_PLUGIN_DESCRIPTION(_x)      const char __bt_plugin_description[] = (_x)
-
-#else /* BT_BUILT_IN_PLUGINS */
-
-/*
- * Statically-linked plug-in symbol types are stored in separate sections and
- * which are read using the bt_component_factory interface.
- */
-#define BT_PLUGIN_REGISTER(_x)         static bt_plugin_register_func __attribute__((section("__plugin_register_funcs"), used)) __plugin_register = (_x)
-#define BT_PLUGIN_NAME(_x)             static const char *__plugin_name __attribute__((section("__plugin_names"), used)) = (_x)
-#define BT_PLUGIN_AUTHOR(_x)           static const char *__plugin_author __attribute__((section("__plugin_authors"), used)) = (_x)
-#define BT_PLUGIN_LICENSE(_x)          static const char *__plugin_license __attribute__((section("__plugin_licenses"), used)) = (_x)
-#define BT_PLUGIN_DESCRIPTION(_x)      static const char *__plugin_description __attribute__((section("__plugin_descriptions"), used)) = (_x)
-
-#endif /* BT_BUILT_IN_PLUGINS */
-
-#define BT_PLUGIN_COMPONENT_CLASSES_BEGIN                                      \
-       static enum bt_component_status __bt_plugin_register_component_classes( \
-               struct bt_component_factory *factory)                           \
-       {
-
-#define BT_PLUGIN_SOURCE_COMPONENT_CLASS_ENTRY(_name, description, _init)      \
-       bt_component_factory_register_source_component_class(factory,           \
-                       _name, description, _init);
-
-#define BT_PLUGIN_SINK_COMPONENT_CLASS_ENTRY(_name, _description, _init)       \
-       bt_component_factory_register_sink_component_class(factory,             \
-                       _name, _description, _init);
-
-#define BT_PLUGIN_FILTER_COMPONENT_CLASS_ENTRY(_name, _description, _init)     \
-       bt_component_factory_register_filter_component_class(factory,           \
-                       _name, _description, _init);
-
-#define BT_PLUGIN_COMPONENT_CLASSES_END                                                \
-       return BT_COMPONENT_STATUS_OK;                                          \
-}                                                                              \
-                                                                               \
-       BT_PLUGIN_REGISTER(__bt_plugin_register_component_classes);             \
-
-#endif /* BABELTRACE_PLUGIN_MACROS_H */

diff --git a/include/babeltrace/plugin/plugin-system.h b/include/babeltrace/plugin/plugin-system.h
deleted file mode 100644 (file)
index 1ec7a08..0000000
--- a/include/babeltrace/plugin/plugin-system.h
+++ /dev/null
@@ -1,358 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_SYSTEM_H
-#define BABELTRACE_PLUGIN_SYSTEM_H
-
-/*
- * BabelTrace - Babeltrace Plug-in System Interface
- *
- * This interface is provided for plug-ins to use the Babeltrace
- * plug-in system facilities.
- *
- * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/plugin/notification/notification.h>
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct bt_notification;
-struct bt_notification_iterator;
-struct bt_component;
-struct bt_component_factory;
-struct bt_value;
-
-typedef enum bt_component_status (*bt_plugin_register_func)(
-               struct bt_component_factory *factory);
-
-/**
- * Component private data deallocation function type.
- *
- * @param component    Component instance
- */
-typedef void (*bt_component_destroy_cb)(struct bt_component *component);
-
-/**
- * Component initialization function type.
- *
- * A component's private data and required callbacks must be set by this
- * function.
- *
- * @param component    Component instance
- * @param params       A dictionary of component parameters
- * @returns            One of #bt_component_status values
- */
-typedef enum bt_component_status (*bt_component_init_cb)(
-               struct bt_component *component, struct bt_value *params);
-
-/**
- * Get a component's private data.
- *
- * @param component    Component of which to get the private data
- * @returns            Component's private data
- */
-extern void *bt_component_get_private_data(struct bt_component *component);
-
-/**
- * Set a component's private data.
- *
- * @param component    Component of which to set the private data
- * @param data         Component private data
- * @returns            One of #bt_component_status values
- */
-extern enum bt_component_status bt_component_set_private_data(
-               struct bt_component *component, void *data);
-
-/**
- * Set a component's private data cleanup function.
- *
- * @param component    Component of which to set the private data destruction
- *                     function
- * @param data         Component private data clean-up function
- * @returns            One of #bt_component_status values
- */
-extern enum bt_component_status bt_component_set_destroy_cb(
-               struct bt_component *component,
-               bt_component_destroy_cb destroy);
-
-/** bt_component_souce */
-/**
- * Iterator initialization function type.
- *
- * A notification iterator's private data, deinitialization, next, and get
- * callbacks must be set by this function.
- *
- * @param source       Source component instance
- * @param iterator     Notification iterator instance
- */
-typedef enum bt_component_status (*bt_component_source_init_iterator_cb)(
-               struct bt_component *, struct bt_notification_iterator *);
-
-/**
- * Set a source component's iterator initialization function.
- *
- * @param source       Source component instance
- * @param init_iterator        Notification iterator initialization callback
- */
-extern enum bt_component_status
-bt_component_source_set_iterator_init_cb(struct bt_component *source,
-               bt_component_source_init_iterator_cb init_iterator);
-
-/** bt_component_sink */
-/**
- * Notification consumption function type.
- *
- * @param sink         Sink component instance
- * @returns            One of #bt_component_status values
- */
-typedef enum bt_component_status (*bt_component_sink_consume_cb)(
-               struct bt_component *);
-
-/**
- * Iterator addition function type.
- *
- * A sink component may choose to refuse the addition of an iterator
- * by not returning BT_COMPONENT_STATUS_OK.
- *
- * @param sink         Sink component instance
- * @returns            One of #bt_component_status values
- */
-typedef enum bt_component_status (*bt_component_sink_add_iterator_cb)(
-               struct bt_component *, struct bt_notification_iterator *);
-
-/**
- * Set a sink component's consumption callback.
- *
- * @param sink         Sink component instance
- * @param consume      Consumption callback
- * @returns            One of #bt_component_status values
- */
-extern enum bt_component_status
-bt_component_sink_set_consume_cb(struct bt_component *sink,
-               bt_component_sink_consume_cb consume);
-
-/**
- * Set a sink component's iterator addition callback.
- *
- * @param sink         Sink component instance
- * @param add_iterator Iterator addition callback
- * @returns            One of #bt_component_status values
- */
-extern enum bt_component_status
-bt_component_sink_set_add_iterator_cb(struct bt_component *sink,
-               bt_component_sink_add_iterator_cb add_iterator);
-
-/* Defaults to 1. */
-extern enum bt_component_status
-bt_component_sink_set_minimum_input_count(struct bt_component *sink,
-               unsigned int minimum);
-
-/* Defaults to 1. */
-extern enum bt_component_status
-bt_component_sink_set_maximum_input_count(struct bt_component *sink,
-               unsigned int maximum);
-
-extern enum bt_component_status
-bt_component_sink_get_input_count(struct bt_component *sink,
-               unsigned int *count);
-
-/* May return NULL after an interator has reached its end. */
-extern enum bt_component_status
-bt_component_sink_get_input_iterator(struct bt_component *sink,
-               unsigned int input, struct bt_notification_iterator **iterator);
-
-/** bt_component_filter */
-/**
- * Iterator initialization function type.
- *
- * A notification iterator's private data, deinitialization, next, and get
- * callbacks must be set by this function.
- *
- * @param filter       Filter component instance
- * @param iterator     Notification iterator instance
- */
-typedef enum bt_component_status (*bt_component_filter_init_iterator_cb)(
-               struct bt_component *, struct bt_notification_iterator *);
-
-/**
- * Iterator addition function type.
- *
- * A filter component may choose to refuse the addition of an iterator
- * by not returning BT_COMPONENT_STATUS_OK.
- *
- * @param filter       Filter component instance
- * @returns            One of #bt_component_status values
- */
-typedef enum bt_component_status (*bt_component_filter_add_iterator_cb)(
-               struct bt_component *, struct bt_notification_iterator *);
-
-/**
- * Set a filter component's iterator initialization function.
- *
- * @param filter       Filter component instance
- * @param init_iterator        Notification iterator initialization callback
- */
-extern enum bt_component_status
-bt_component_filter_set_iterator_init_cb(struct bt_component *filter,
-               bt_component_filter_init_iterator_cb init_iterator);
-
-/**
- * Set a filter component's iterator addition callback.
- *
- * @param filter       Filter component instance
- * @param add_iterator Iterator addition callback
- * @returns            One of #bt_component_status values
- */
-extern enum bt_component_status
-bt_component_filter_set_add_iterator_cb(struct bt_component *filter,
-               bt_component_filter_add_iterator_cb add_iterator);
-
-/* Defaults to 1. */
-extern enum bt_component_status
-bt_component_filter_set_minimum_input_count(struct bt_component *filter,
-               unsigned int minimum);
-
-/* Defaults to 1. */
-extern enum bt_component_status
-bt_component_filter_set_maximum_input_count(struct bt_component *filter,
-               unsigned int maximum);
-
-extern enum bt_component_status
-bt_component_filter_get_input_count(struct bt_component *filter,
-               unsigned int *count);
-
-/* May return NULL after an interator has reached its end. */
-extern enum bt_component_status
-bt_component_filter_get_input_iterator(struct bt_component *filter,
-               unsigned int input, struct bt_notification_iterator **iterator);
-
-/** bt_notification_iterator */
-/**
- * Function returning an iterator's current notification.
- *
- * @param iterator     Notification iterator instance
- * @returns            A notification instance
- */
-typedef struct bt_notification *(*bt_notification_iterator_get_cb)(
-               struct bt_notification_iterator *iterator);
-
-/**
- * Function advancing an iterator's position of one element.
- *
- * @param iterator     Notification iterator instance
- * @returns            One of #bt_notification_iterator_status values
- */
-typedef enum bt_notification_iterator_status (*bt_notification_iterator_next_cb)(
-               struct bt_notification_iterator *iterator);
-
-/**
- * Function advancing an iterator's position to a given time (relative to Epoch).
- *
- * @param iterator     Notification iterator instance
- * @param time         Time at which to seek, expressed in ns since Epoch
- * @returns            One of #bt_notification_iterator_status values
- */
-typedef enum bt_notification_iterator_status
-               (*bt_notification_iterator_seek_time_cb)(
-               struct bt_notification_iterator *iterator, int64_t time);
-
-/**
- * Function cleaning-up an iterator's private data on destruction.
- *
- * @param iterator     Notification iterator instance
- */
-typedef void (*bt_notification_iterator_destroy_cb)(
-               struct bt_notification_iterator *iterator);
-
-/**
- * Set an iterator's "get" callback which return the current notification.
- *
- * @param iterator     Notification iterator instance
- * @param get          Notification return callback
- * @returns            One of #bt_notification_iterator_status values
- */
-extern enum bt_notification_iterator_status
-bt_notification_iterator_set_get_cb(struct bt_notification_iterator *iterator,
-               bt_notification_iterator_get_cb get);
-
-/**
- * Set an iterator's "next" callback which advances the iterator's position.
- *
- * @param iterator     Notification iterator instance
- * @param next         Iterator "next" callback
- * @returns            One of #bt_notification_iterator_status values
- */
-extern enum bt_notification_iterator_status
-bt_notification_iterator_set_next_cb(struct bt_notification_iterator *iterator,
-               bt_notification_iterator_next_cb next);
-
-/**
- * Set an iterator's "seek_time" callback which sets the iterator's position to
- *     provided time (in ns since Epoch).
- *
- * @param iterator     Notification iterator instance
- * @param seek_timetime        Iterator "seek_time" callback
- * @returns            One of #bt_notification_iterator_status values
- */
-extern enum bt_notification_iterator_status
-bt_notification_iterator_set_seek_time_cb(struct bt_notification_iterator *iterator,
-               bt_notification_iterator_seek_time_cb seek_time);
-
-/**
- * Set an iterator's "destroy" callback.
- *
- * @param iterator     Notification iterator instance
- * @param next         Iterator destruction callback
- * @returns            One of #bt_notification_iterator_status values
- */
-extern enum bt_notification_iterator_status
-bt_notification_iterator_set_destroy_cb(
-               struct bt_notification_iterator *iterator,
-               bt_notification_iterator_destroy_cb destroy);
-
-/**
- * Set an iterator's private data.
- *
- * @param iterator     Notification iterator instance
- * @param data         Iterator private data
- * @returns            One of #bt_notification_iterator_status values
- */
-extern enum bt_notification_iterator_status
-bt_notification_iterator_set_private_data(
-               struct bt_notification_iterator *iterator, void *data);
-
-/**
- * Get an iterator's private data.
- *
- * @param iterator     Notification iterator instance
- * @returns            Iterator instance private data
- */
-extern void *bt_notification_iterator_get_private_data(
-               struct bt_notification_iterator *iterator);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BABELTRACE_PLUGIN_SYSTEM_H */

diff --git a/include/babeltrace/plugin/plugin.h b/include/babeltrace/plugin/plugin.h
index 8eec84e552e4fb92e456cd6befa33b8865efb6f7..10581984f9519cc69ad08a054a0840a67d492396 100644 (file)
--- a/include/babeltrace/plugin/plugin.h
+++ b/include/babeltrace/plugin/plugin.h
@@ -1,10 +1,11 @@
-#ifndef BABELTRACE_PLUGIN_H
-#define BABELTRACE_PLUGIN_H
+#ifndef BABELTRACE_PLUGIN_PLUGIN_H
+#define BABELTRACE_PLUGIN_PLUGIN_H
 
 /*
  * BabelTrace - Babeltrace Plug-in Interface
  *
  * 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>
  *
@@ -27,11 +28,35 @@
  * SOFTWARE.
  */
 
+#include <stddef.h>
+#include <stdbool.h>
+#include <babeltrace/component/component-class.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 struct bt_plugin;
+struct bt_component_class;
+
+/**
+ * Status code. Errors are always negative.
+ */
+enum bt_plugin_status {
+       /** No error, okay. */
+       BT_PLUGIN_STATUS_OK =           0,
+       /** General error. */
+       BT_PLUGIN_STATUS_ERROR =        -1,
+       /** Memory allocation failure. */
+       BT_PLUGIN_STATUS_NOMEM =        -4,
+};
+
+extern struct bt_plugin *bt_plugin_create_from_file(const char *path);
+
+extern struct bt_plugin **bt_plugin_create_all_from_dir(const char *path,
+               bool recurse);
+
+extern struct bt_plugin **bt_plugin_create_all_from_static(void);
 
 /**
  * Get the name of a plug-in.
@@ -73,8 +98,18 @@ extern const char *bt_plugin_get_description(struct bt_plugin *plugin);
  */
 extern const char *bt_plugin_get_path(struct bt_plugin *plugin);
 
+extern int bt_plugin_get_component_class_count(struct bt_plugin *plugin);
+
+extern struct bt_component_class *bt_plugin_get_component_class(
+               struct bt_plugin *plugin, size_t index);
+
+extern
+struct bt_component_class *bt_plugin_get_component_class_by_name_and_type(
+               struct bt_plugin *plugin, const char *name,
+               enum bt_component_type type);
+
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* BABELTRACE_PLUGIN_H */
+#endif /* BABELTRACE_PLUGIN_PLUGIN_H */

diff --git a/include/babeltrace/plugin/sink-internal.h b/include/babeltrace/plugin/sink-internal.h
deleted file mode 100644 (file)
index 5d0588a..0000000
--- a/include/babeltrace/plugin/sink-internal.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_SINK_INTERNAL_H
-#define BABELTRACE_PLUGIN_SINK_INTERNAL_H
-
-/*
- * BabelTrace - Sink Component internal
- *
- * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/plugin/component-internal.h>
-#include <babeltrace/plugin/component-class-internal.h>
-#include <babeltrace/plugin/plugin-system.h>
-#include <babeltrace/plugin/input.h>
-
-struct bt_value;
-
-struct bt_component_sink_class {
-       struct bt_component_class parent;
-};
-
-//typedef uint32_t notification_mask_t;
-
-struct bt_component_sink {
-       struct bt_component parent;
-       bt_component_sink_consume_cb consume;
-       bt_component_sink_add_iterator_cb add_iterator;
-       struct component_input input;
-/*     notification_mask_t registered_notifications_mask;*/
-};
-
-/**
- * Allocate a sink component.
- *
- * @param class                        Component class
- * @param params               A dictionary of component parameters
- * @returns                    A sink component instance
- */
-BT_HIDDEN
-struct bt_component *bt_component_sink_create(
-               struct bt_component_class *class, struct bt_value *params);
-
-/**
- * Validate a sink component.
- *
- * @param component            Sink component instance to validate
- * @returns                    One of #bt_component_status
- */
-BT_HIDDEN
-enum bt_component_status bt_component_sink_validate(
-               struct bt_component *component);
-
-#endif /* BABELTRACE_PLUGIN_SINK_INTERNAL_H */

diff --git a/include/babeltrace/plugin/sink.h b/include/babeltrace/plugin/sink.h
deleted file mode 100644 (file)
index c61d752..0000000
--- a/include/babeltrace/plugin/sink.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_COMPONENT_SINK_H
-#define BABELTRACE_PLUGIN_COMPONENT_SINK_H
-
-/*
- * BabelTrace - Sink Component Interface
- *
- * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/plugin/component.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct bt_component;
-struct bt_notification;
-
-/**
- * Add a notification iterator to a sink component.
- *
- * @param component    Component instance
- * @param iterator     Notification iterator to add
- * @returns            One of #bt_component_status values
- */
-extern
-enum bt_component_status bt_component_sink_add_iterator(
-               struct bt_component *component,
-               struct bt_notification_iterator *iterator);
-
-/**
- * Process one event, consuming from sources as needed.
- *
- * @param component    Component instance
- * @returns            One of #bt_component_status values
- */
-extern
-enum bt_component_status bt_component_sink_consume(
-               struct bt_component *component);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BABELTRACE_PLUGIN_COMPONENT_SINK_H */

diff --git a/include/babeltrace/plugin/source-internal.h b/include/babeltrace/plugin/source-internal.h
deleted file mode 100644 (file)
index 90e57dd..0000000
--- a/include/babeltrace/plugin/source-internal.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_SOURCE_INTERNAL_H
-#define BABELTRACE_PLUGIN_SOURCE_INTERNAL_H
-
-/*
- * BabelTrace - Source Component internal
- *
- * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/plugin/component-internal.h>
-#include <babeltrace/plugin/component-class-internal.h>
-#include <babeltrace/plugin/plugin-system.h>
-
-struct bt_value;
-
-struct bt_component_source_class {
-       struct bt_component_class parent;
-};
-
-struct bt_component_source {
-       struct bt_component parent;
-       bt_component_source_init_iterator_cb init_iterator;
-};
-
-/**
- * Allocate a source component.
- *
- * @param class                        Component class
- * @param params               A dictionary of component parameters
- * @returns                    A source component instance
- */
-BT_HIDDEN
-struct bt_component *bt_component_source_create(
-               struct bt_component_class *class, struct bt_value *params);
-
-/**
- * Validate a source component.
- *
- * @param component            Source component instance to validate
- * @returns                    One of #bt_component_status
- */
-BT_HIDDEN
-enum bt_component_status bt_component_source_validate(
-               struct bt_component *component);
-
-#endif /* BABELTRACE_PLUGIN_SOURCE_INTERNAL_H */

diff --git a/include/babeltrace/plugin/source.h b/include/babeltrace/plugin/source.h
deleted file mode 100644 (file)
index 8b71ed2..0000000
--- a/include/babeltrace/plugin/source.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef BABELTRACE_PLUGIN_SOURCE_H
-#define BABELTRACE_PLUGIN_SOURCE_H
-
-/*
- * BabelTrace - Source Plug-in Interface
- *
- * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <stdint.h>
-#include <babeltrace/plugin/component.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct bt_component;
-struct bt_notification_iterator;
-
-/**
- * Create an iterator on a component instance.
- *
- * @param component    Component instance
- * @returns            Notification iterator instance
- */
-extern
-struct bt_notification_iterator *bt_component_source_create_iterator(
-               struct bt_component *component);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BABELTRACE_PLUGIN_SOURCE_H */

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9e14ea515ef4818e608dfce5c28a13ddee20c0a8..71af87a5640f25750b981db5af7e94ce215fd743 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = prio_heap plugin-system .
+SUBDIRS = prio_heap plugin component .
 
 AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
 
@@ -31,4 +31,5 @@ libbabeltrace_la_LIBADD = \
        prio_heap/libprio_heap.la \
        $(top_builddir)/types/libbabeltrace_types.la \
        $(top_builddir)/compat/libcompat.la \
-       plugin-system/libplugin-system.la
+       component/libcomponent.la \
+       plugin/libplugin.la

diff --git a/lib/component/Makefile.am b/lib/component/Makefile.am
new file mode 100644 (file)
index 0000000..4af458c
--- /dev/null
+++ b/lib/component/Makefile.am
@@ -0,0 +1,19 @@
+AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
+
+SUBDIRS = notification
+
+noinst_LTLIBRARIES = libcomponent.la
+
+# Plug-in system library
+libcomponent_la_SOURCES = \
+       component.c \
+       component-class.c \
+       component-graph.c \
+       source.c \
+       sink.c \
+       filter.c \
+       iterator.c \
+       input.c
+
+libcomponent_la_LIBADD = \
+       notification/libcomponent-notification.la

diff --git a/lib/component/component-class.c b/lib/component/component-class.c
new file mode 100644 (file)
index 0000000..1e1e838
--- /dev/null
+++ b/lib/component/component-class.c
@@ -0,0 +1,133 @@
+/*
+ * component-class.c
+ *
+ * Babeltrace Plugin Component Class
+ *
+ * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/compiler.h>
+#include <babeltrace/component/component-class-internal.h>
+#include <babeltrace/ref.h>
+#include <glib.h>
+
+static
+void bt_component_class_destroy(struct bt_object *obj)
+{
+       struct bt_component_class *class;
+       int i;
+
+       assert(obj);
+       class = container_of(obj, struct bt_component_class, base);
+
+       /* Call destroy listeners in reverse registration order */
+       for (i = class->destroy_listeners->len - 1; i >= 0; i--) {
+               struct bt_component_class_destroyer_listener *listener =
+                       &g_array_index(class->destroy_listeners,
+                               struct bt_component_class_destroyer_listener,
+                               i);
+
+               listener->func(class, listener->data);
+       }
+
+       if (class->name) {
+               g_string_free(class->name, TRUE);
+       }
+       if (class->description) {
+               g_string_free(class->description, TRUE);
+       }
+       if (class->destroy_listeners) {
+               g_array_free(class->destroy_listeners, TRUE);
+       }
+
+       g_free(class);
+}
+
+struct bt_component_class *bt_component_class_create(
+               enum bt_component_type type, const char *name,
+               const char *description, bt_component_init_cb init)
+{
+       struct bt_component_class *class;
+
+       class = g_new0(struct bt_component_class, 1);
+       if (!class) {
+               goto end;
+       }
+
+       bt_object_init(class, bt_component_class_destroy);
+       class->type = type;
+       class->init = init;
+       class->name = g_string_new(name);
+       class->description = g_string_new(description);
+       if (!class->name || !class->description) {
+               BT_PUT(class);
+               goto end;
+       }
+       class->destroy_listeners = g_array_new(FALSE, TRUE,
+               sizeof(struct bt_component_class_destroyer_listener));
+       if (!class->destroy_listeners) {
+               BT_PUT(class);
+               goto end;
+       }
+end:
+       return class;
+}
+
+const char *bt_component_class_get_name(
+               struct bt_component_class *component_class)
+{
+       return component_class ? component_class->name->str : NULL;
+}
+
+enum bt_component_type bt_component_class_get_type(
+               struct bt_component_class *component_class)
+{
+       return component_class ? component_class->type :
+                       BT_COMPONENT_TYPE_UNKNOWN;
+}
+
+const char *bt_component_class_get_description(
+               struct bt_component_class *component_class)
+{
+       return component_class ? component_class->description->str : NULL;
+}
+
+BT_HIDDEN
+int bt_component_class_add_destroy_listener(struct bt_component_class *class,
+               bt_component_class_destroy_listener_func func, void *data)
+{
+       int ret = 0;
+       struct bt_component_class_destroyer_listener listener;
+
+       if (!class || !func) {
+               ret = -1;
+               goto end;
+       }
+
+       listener.func = func;
+       listener.data = data;
+       g_array_append_val(class->destroy_listeners, listener);
+
+end:
+       return ret;
+}

diff --git a/lib/component/component-graph.c b/lib/component/component-graph.c
new file mode 100644 (file)
index 0000000..c058998
--- /dev/null
+++ b/lib/component/component-graph.c
@@ -0,0 +1,98 @@
+/*
+ * component-graph.c
+ *
+ * Babeltrace Plugin Component Graph
+ *
+ * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/component/component-graph-internal.h>
+#include <babeltrace/compiler.h>
+
+static void bt_component_graph_destroy(struct bt_object *obj)
+{
+       struct bt_component_graph *graph = container_of(obj,
+                       struct bt_component_graph, base);
+
+       if (graph->connections) {
+               g_ptr_array_free(graph->connections, TRUE);
+       }
+       if (graph->sinks) {
+               g_ptr_array_free(graph->sinks, TRUE);
+       }
+       g_free(graph);
+}
+
+struct bt_component_graph *bt_component_graph_create(void)
+{
+       struct bt_component_graph *graph;
+
+       graph = g_new0(struct bt_component_graph, 1);
+       if (!graph) {
+               goto end;
+       }
+
+       bt_object_init(graph, bt_component_graph_destroy);
+
+       graph->connections = g_ptr_array_new_with_free_func(bt_put);
+       if (!graph->connections) {
+               goto error;
+       }
+       graph->sinks = g_ptr_array_new_with_free_func(bt_put);
+       if (!graph->sinks) {
+               goto error;
+       }
+end:
+       return graph;
+error:
+       BT_PUT(graph);
+       goto end;
+}
+
+enum bt_component_graph_status bt_component_graph_connect(
+               struct bt_component_graph *graph, struct bt_component *upstream,
+               struct bt_component *downstream)
+{
+       return BT_COMPONENT_GRAPH_STATUS_OK;
+}
+
+enum bt_component_graph_status bt_component_graph_add_component(
+               struct bt_component_graph *graph,
+               struct bt_component *component)
+{
+       return BT_COMPONENT_GRAPH_STATUS_OK;
+}
+
+enum bt_component_graph_status bt_component_graph_add_component_as_sibling(
+               struct bt_component_graph *graph, struct bt_component *origin,
+               struct bt_component *new_component)
+{
+       return BT_COMPONENT_GRAPH_STATUS_OK;
+}
+
+enum bt_component_graph_status bt_component_graph_run(
+               struct bt_component_graph *graph)
+{
+       return BT_COMPONENT_GRAPH_STATUS_OK;
+}
+

diff --git a/lib/component/component.c b/lib/component/component.c
new file mode 100644 (file)
index 0000000..4ad897c
--- /dev/null
+++ b/lib/component/component.c
@@ -0,0 +1,290 @@
+/*
+ * component.c
+ *
+ * Babeltrace Plugin Component
+ *
+ * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/component/component.h>
+#include <babeltrace/component/component-internal.h>
+#include <babeltrace/component/source-internal.h>
+#include <babeltrace/component/filter-internal.h>
+#include <babeltrace/component/notification/iterator-internal.h>
+#include <babeltrace/component/sink-internal.h>
+#include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/compiler.h>
+#include <babeltrace/ref.h>
+
+static
+struct bt_component * (* const component_create_funcs[])(
+               struct bt_component_class *, struct bt_value *) = {
+       [BT_COMPONENT_TYPE_SOURCE] = bt_component_source_create,
+       [BT_COMPONENT_TYPE_SINK] = bt_component_sink_create,
+       [BT_COMPONENT_TYPE_FILTER] = bt_component_filter_create,
+};
+
+static
+enum bt_component_status (* const component_validation_funcs[])(
+               struct bt_component *) = {
+       [BT_COMPONENT_TYPE_SOURCE] = bt_component_source_validate,
+       [BT_COMPONENT_TYPE_SINK] = bt_component_sink_validate,
+       [BT_COMPONENT_TYPE_FILTER] = bt_component_filter_validate,
+};
+
+static
+void bt_component_destroy(struct bt_object *obj)
+{
+       struct bt_component *component = NULL;
+       struct bt_component_class *component_class = NULL;
+
+       if (!obj) {
+               return;
+       }
+
+       component = container_of(obj, struct bt_component, base);
+       component_class = component->class;
+
+       /*
+        * User data is destroyed first, followed by the concrete component
+        * instance.
+        */
+       if (component->user_destroy) {
+               component->user_destroy(component);
+       }
+
+       if (component->destroy) {
+               component->destroy(component);
+       }
+
+       g_string_free(component->name, TRUE);
+       bt_put(component_class);
+       g_free(component);
+}
+
+BT_HIDDEN
+enum bt_component_status bt_component_init(struct bt_component *component,
+               bt_component_destroy_cb destroy)
+{
+       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+
+       if (!component) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       component->destroy = destroy;
+end:
+       return ret;
+}
+
+BT_HIDDEN
+enum bt_component_type bt_component_get_type(struct bt_component *component)
+{
+       return component ? component->class->type : BT_COMPONENT_TYPE_UNKNOWN;
+}
+
+BT_HIDDEN
+struct bt_notification_iterator *bt_component_create_iterator(
+               struct bt_component *component)
+{
+       enum bt_notification_iterator_status ret_iterator;
+       enum bt_component_type component_type;
+       struct bt_notification_iterator *iterator = NULL;
+
+       if (!component) {
+               goto error;
+       }
+
+       component_type = bt_component_get_type(component);
+       if (component_type != BT_COMPONENT_TYPE_SOURCE &&
+                       component_type != BT_COMPONENT_TYPE_FILTER) {
+               /* Unsupported operation. */
+               goto error;
+       }
+
+       iterator = bt_notification_iterator_create(component);
+       if (!iterator) {
+               goto error;
+       }
+
+       switch (component_type) {
+       case BT_COMPONENT_TYPE_SOURCE:
+       {
+               struct bt_component_source *source;
+               enum bt_component_status ret_component;
+
+               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;
+               }
+               break;
+
+               break;
+       }
+       case BT_COMPONENT_TYPE_FILTER:
+       {
+               struct bt_component_filter *filter;
+               enum bt_component_status ret_component;
+
+               filter = container_of(component, struct bt_component_filter, parent);
+               assert(filter->init_iterator);
+               ret_component = filter->init_iterator(component, iterator);
+               if (ret_component != BT_COMPONENT_STATUS_OK) {
+                       goto error;
+               }
+               break;
+       }
+       default:
+               /* Unreachable. */
+               assert(0);
+       }
+
+       ret_iterator = bt_notification_iterator_validate(iterator);
+       if (ret_iterator != BT_NOTIFICATION_ITERATOR_STATUS_OK) {
+               goto error;
+       }
+
+       return iterator;
+error:
+       BT_PUT(iterator);
+       return iterator;
+}
+
+struct bt_component *bt_component_create(
+               struct bt_component_class *component_class, const char *name,
+               struct bt_value *params)
+{
+       int ret;
+       struct bt_component *component = NULL;
+       enum bt_component_type type;
+
+       if (!component_class) {
+               goto end;
+       }
+
+       type = bt_component_class_get_type(component_class);
+       if (type <= BT_COMPONENT_TYPE_UNKNOWN ||
+                       type > BT_COMPONENT_TYPE_FILTER) {
+               goto end;
+       }
+
+       component = component_create_funcs[type](component_class, params);
+       if (!component) {
+               goto end;
+       }
+
+       bt_object_init(component, bt_component_destroy);
+       component->name = g_string_new(name);
+       if (!component->name) {
+               BT_PUT(component);
+               goto end;
+       }
+
+       component->initializing = true;
+       ret = component_class->init(component, params);
+       component->initializing = false;
+       if (ret != BT_COMPONENT_STATUS_OK) {
+               BT_PUT(component);
+               goto end;
+       }
+       ret = component_validation_funcs[type](component);
+       if (ret != BT_COMPONENT_STATUS_OK) {
+               BT_PUT(component);
+               goto end;
+       }
+end:
+       return component;
+}
+
+const char *bt_component_get_name(struct bt_component *component)
+{
+       const char *ret = NULL;
+
+       if (!component) {
+               goto end;
+       }
+
+       ret = component->name->str;
+end:
+       return ret;
+}
+
+enum bt_component_status bt_component_set_name(struct bt_component *component,
+               const char *name)
+{
+       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+
+       if (!component || !name || name[0] == '\0') {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       g_string_assign(component->name, name);
+end:
+       return ret;
+}
+
+struct bt_component_class *bt_component_get_class(
+               struct bt_component *component)
+{
+       return component ? bt_get(component->class) : NULL;
+}
+
+void *bt_component_get_private_data(struct bt_component *component)
+{
+       return component ? component->user_data : NULL;
+}
+
+enum bt_component_status
+bt_component_set_private_data(struct bt_component *component,
+               void *data)
+{
+       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+
+       if (!component || !component->initializing) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       component->user_data = data;
+end:
+       return ret;
+}
+
+enum bt_component_status bt_component_set_destroy_cb(
+               struct bt_component *component, bt_component_destroy_cb destroy)
+{
+       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+
+       if (!component || !component->initializing) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       component->user_destroy = destroy;
+end:
+       return ret;
+}

diff --git a/lib/component/filter.c b/lib/component/filter.c
new file mode 100644 (file)
index 0000000..2c9fb47
--- /dev/null
+++ b/lib/component/filter.c
@@ -0,0 +1,304 @@
+/*
+ * filter.c
+ *
+ * Babeltrace Filter Component
+ *
+ * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/compiler.h>
+#include <babeltrace/values.h>
+#include <babeltrace/component/input.h>
+#include <babeltrace/component/filter-internal.h>
+#include <babeltrace/component/component-internal.h>
+#include <babeltrace/component/notification/notification.h>
+#include <babeltrace/component/notification/iterator-internal.h>
+
+enum bt_component_status bt_component_filter_set_iterator_init_cb(
+               struct bt_component *component,
+               bt_component_filter_init_iterator_cb init_iterator)
+{
+       struct bt_component_filter *filter;
+       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+
+       if (component->class->type != BT_COMPONENT_TYPE_FILTER ||
+                       !component->initializing) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       filter = container_of(component, struct bt_component_filter, parent);
+       filter->init_iterator = init_iterator;
+end:
+       return ret;
+}
+
+enum bt_component_status bt_component_filter_set_add_iterator_cb(
+               struct bt_component *component,
+               bt_component_filter_add_iterator_cb add_iterator)
+{
+       struct bt_component_filter *filter;
+       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+
+       if (!component) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_FILTER) {
+               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
+               goto end;
+       }
+
+       if (!component->initializing) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       filter = container_of(component, struct bt_component_filter, parent);
+       filter->add_iterator = add_iterator;
+end:
+       return ret;
+}
+
+enum bt_component_status bt_component_filter_set_minimum_input_count(
+               struct bt_component *component,
+               unsigned int minimum)
+{
+       struct bt_component_filter *filter;
+       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+
+       if (!component) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_FILTER) {
+               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
+               goto end;
+       }
+
+       if (!component->initializing) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       filter = container_of(component, struct bt_component_filter, parent);
+       filter->input.min_count = minimum;
+end:
+       return ret;
+}
+
+enum bt_component_status bt_component_filter_set_maximum_input_count(
+               struct bt_component *component,
+               unsigned int maximum)
+{
+       struct bt_component_filter *filter;
+       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+
+       if (!component) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_FILTER) {
+               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
+               goto end;
+       }
+
+       if (!component->initializing) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       filter = container_of(component, struct bt_component_filter, parent);
+       filter->input.max_count = maximum;
+end:
+       return ret;
+}
+
+enum bt_component_status
+bt_component_filter_get_input_count(struct bt_component *component,
+               unsigned int *count)
+{
+       struct bt_component_filter *filter;
+       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+
+       if (!component || !count) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_FILTER) {
+               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
+               goto end;
+       }
+
+       filter = container_of(component, struct bt_component_filter, parent);
+       *count = (unsigned int) filter->input.iterators->len;
+end:
+       return ret;
+}
+
+enum bt_component_status
+bt_component_filter_get_input_iterator(struct bt_component *component,
+               unsigned int input, struct bt_notification_iterator **iterator)
+{
+       struct bt_component_filter *filter;
+       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+
+       if (!component || !iterator) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_FILTER) {
+               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
+               goto end;
+       }
+
+       filter = container_of(component, struct bt_component_filter, parent);
+       if (input >= (unsigned int) filter->input.iterators->len) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       *iterator = bt_get(g_ptr_array_index(filter->input.iterators, input));
+end:
+       return ret;
+}
+
+enum bt_component_status bt_component_filter_add_iterator(
+               struct bt_component *component,
+               struct bt_notification_iterator *iterator)
+{
+       struct bt_component_filter *filter;
+       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+
+       if (!component || !iterator) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_FILTER) {
+               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
+               goto end;
+       }
+
+       filter = container_of(component, struct bt_component_filter, parent);
+       if (filter->input.iterators->len == filter->input.max_count) {
+               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
+               goto end;
+       }
+
+       if (filter->add_iterator) {
+               ret = filter->add_iterator(component, iterator);
+               if (ret != BT_COMPONENT_STATUS_OK) {
+                       goto end;
+               }
+       }
+
+       g_ptr_array_add(filter->input.iterators, bt_get(iterator));
+end:
+       return ret;
+}
+
+struct bt_notification_iterator *bt_component_filter_create_iterator(
+               struct bt_component *component)
+{
+       return bt_component_create_iterator(component);
+}
+
+static
+void bt_component_filter_destroy(struct bt_component *component)
+{
+       struct bt_component_filter *filter = container_of(component,
+                       struct bt_component_filter, parent);
+
+       component_input_fini(&filter->input);
+}
+
+BT_HIDDEN
+struct bt_component *bt_component_filter_create(
+               struct bt_component_class *class, struct bt_value *params)
+{
+       struct bt_component_filter *filter = NULL;
+       enum bt_component_status ret;
+
+       filter = g_new0(struct bt_component_filter, 1);
+       if (!filter) {
+               goto end;
+       }
+
+       filter->parent.class = bt_get(class);
+       ret = bt_component_init(&filter->parent, bt_component_filter_destroy);
+       if (ret != BT_COMPONENT_STATUS_OK) {
+               goto error;
+       }
+
+       if (component_input_init(&filter->input)) {
+               goto error;
+       }
+end:
+       return filter ? &filter->parent : NULL;
+error:
+       BT_PUT(filter);
+       goto end;
+}
+
+BT_HIDDEN
+enum bt_component_status bt_component_filter_validate(
+               struct bt_component *component)
+{
+       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+       struct bt_component_filter *filter;
+
+       if (!component) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       if (!component->class) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       if (component->class->type != BT_COMPONENT_TYPE_FILTER) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       filter = container_of(component, struct bt_component_filter, parent);
+       if (!filter->init_iterator) {
+               printf_error("Invalid filter component; no iterator initialization callback defined.");
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       ret = component_input_validate(&filter->input);
+       if (ret) {
+               goto end;
+       }
+end:
+       return ret;
+}

diff --git a/lib/component/input.c b/lib/component/input.c
new file mode 100644 (file)
index 0000000..663454b
--- /dev/null
+++ b/lib/component/input.c
@@ -0,0 +1,58 @@
+/*
+ * input.c
+ *
+ * Babeltrace Component Input
+ *
+ * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/component/input.h>
+#include <babeltrace/ref.h>
+
+BT_HIDDEN
+int component_input_init(struct component_input *input)
+{
+       input->min_count = 1;
+       input->max_count = 1;
+       input->iterators = g_ptr_array_new_with_free_func(bt_put);
+       if (!input->iterators) {
+               return 1;
+       }
+       return 0;
+}
+
+BT_HIDDEN
+int component_input_validate(struct component_input *input)
+{
+       if (input->min_count > input->max_count) {
+               printf_error("Invalid component configuration; minimum input count > maximum input count.");
+               return 1;
+       }
+       return 0;
+}
+
+BT_HIDDEN
+void component_input_fini(struct component_input *input)
+{
+       g_ptr_array_free(input->iterators, TRUE);
+}

diff --git a/lib/component/iterator.c b/lib/component/iterator.c
new file mode 100644 (file)
index 0000000..188095c
--- /dev/null
+++ b/lib/component/iterator.c
@@ -0,0 +1,221 @@
+/*
+ * iterator.c
+ *
+ * Babeltrace Notification Iterator
+ *
+ * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/compiler.h>
+#include <babeltrace/ref.h>
+#include <babeltrace/component/component.h>
+#include <babeltrace/component/source-internal.h>
+#include <babeltrace/component/notification/iterator.h>
+#include <babeltrace/component/notification/iterator-internal.h>
+
+static
+void bt_notification_iterator_destroy(struct bt_object *obj)
+{
+       struct bt_notification_iterator *iterator;
+
+       assert(obj);
+       iterator = container_of(obj, struct bt_notification_iterator,
+                       base);
+       assert(iterator->user_destroy || !iterator->user_data);
+       if (iterator->user_destroy) {
+               iterator->user_destroy(iterator);
+       }
+       BT_PUT(iterator->component);
+       g_free(iterator);
+}
+
+BT_HIDDEN
+struct bt_notification_iterator *bt_notification_iterator_create(
+               struct bt_component *component)
+{
+       enum bt_component_type type;
+       struct bt_notification_iterator *iterator = NULL;
+
+       if (!component) {
+               goto end;
+       }
+
+       type = bt_component_get_type(component);
+       switch (type) {
+       case BT_COMPONENT_TYPE_SOURCE:
+       case BT_COMPONENT_TYPE_FILTER:
+               break;
+       default:
+               goto end;
+       }
+
+       iterator = g_new0(struct bt_notification_iterator, 1);
+       if (!iterator) {
+               goto end;
+       }
+
+       iterator->component = bt_get(component);
+       bt_object_init(iterator, bt_notification_iterator_destroy);
+end:
+       return iterator;
+}
+
+BT_HIDDEN
+enum bt_notification_iterator_status bt_notification_iterator_validate(
+               struct bt_notification_iterator *iterator)
+{
+       enum bt_notification_iterator_status ret =
+                       BT_NOTIFICATION_ITERATOR_STATUS_OK;
+
+       if (!iterator || !iterator->get || !iterator->next) {
+               ret = BT_NOTIFICATION_ITERATOR_STATUS_INVAL;
+               goto end;
+       }
+end:
+       return ret;
+}
+
+enum bt_notification_iterator_status bt_notification_iterator_set_get_cb(
+               struct bt_notification_iterator *iterator,
+               bt_notification_iterator_get_cb get)
+{
+       enum bt_notification_iterator_status ret =
+                       BT_NOTIFICATION_ITERATOR_STATUS_OK;
+
+       if (!iterator || !get) {
+               ret = BT_NOTIFICATION_ITERATOR_STATUS_INVAL;
+               goto end;
+       }
+
+       iterator->get = get;
+end:
+       return ret;
+}
+
+enum bt_notification_iterator_status
+bt_notification_iterator_set_next_cb(struct bt_notification_iterator *iterator,
+               bt_notification_iterator_next_cb next)
+{
+       enum bt_notification_iterator_status ret =
+                       BT_NOTIFICATION_ITERATOR_STATUS_OK;
+
+       if (!iterator || !next) {
+               ret = BT_NOTIFICATION_ITERATOR_STATUS_INVAL;
+               goto end;
+       }
+
+       iterator->next = next;
+end:
+       return ret;
+}
+
+enum bt_notification_iterator_status
+bt_notification_iterator_set_seek_time_cb(
+               struct bt_notification_iterator *iterator,
+               bt_notification_iterator_seek_time_cb seek_time)
+{
+       enum bt_notification_iterator_status ret =
+                       BT_NOTIFICATION_ITERATOR_STATUS_OK;
+
+       if (!iterator || !seek_time) {
+               ret = BT_NOTIFICATION_ITERATOR_STATUS_INVAL;
+               goto end;
+       }
+
+       iterator->seek_time = seek_time;
+end:
+       return ret;
+}
+
+enum bt_notification_iterator_status
+bt_notification_iterator_set_destroy_cb(
+               struct bt_notification_iterator *iterator,
+               bt_notification_iterator_destroy_cb destroy)
+{
+       enum bt_notification_iterator_status ret =
+                       BT_NOTIFICATION_ITERATOR_STATUS_OK;
+
+       if (!iterator || !destroy) {
+               ret = BT_NOTIFICATION_ITERATOR_STATUS_INVAL;
+               goto end;
+       }
+
+       iterator->user_destroy = destroy;
+end:
+       return ret;
+}
+
+void *bt_notification_iterator_get_private_data(
+               struct bt_notification_iterator *iterator)
+{
+       return iterator ? iterator->user_data : NULL;
+}
+
+enum bt_notification_iterator_status
+bt_notification_iterator_set_private_data(
+               struct bt_notification_iterator *iterator, void *data)
+{
+       enum bt_notification_iterator_status ret =
+                       BT_NOTIFICATION_ITERATOR_STATUS_OK;
+
+       if (!iterator || !data) {
+               ret = BT_NOTIFICATION_ITERATOR_STATUS_INVAL;
+               goto end;
+       }
+
+       iterator->user_data = data;
+end:
+       return ret;
+}
+
+struct bt_notification *bt_notification_iterator_get_notification(
+               struct bt_notification_iterator *iterator)
+{
+       assert(iterator);
+       assert(iterator->get);
+       return iterator->get(iterator);
+}
+
+enum bt_notification_iterator_status
+bt_notification_iterator_next(struct bt_notification_iterator *iterator)
+{
+       assert(iterator);
+       assert(iterator->next);
+       return iterator->next(iterator);
+}
+
+struct bt_component *bt_notification_iterator_get_component(
+               struct bt_notification_iterator *iterator)
+{
+       return bt_get(iterator->component);
+}
+
+enum bt_notification_iterator_status bt_notification_iterator_seek_time(
+               struct bt_notification_iterator *iterator,
+               enum bt_notification_iterator_seek_origin seek_origin,
+               int64_t time)
+{
+       enum bt_notification_iterator_status ret =
+                       BT_NOTIFICATION_ITERATOR_STATUS_UNSUPPORTED;
+       return ret;
+}

diff --git a/lib/component/notification/Makefile.am b/lib/component/notification/Makefile.am
new file mode 100644 (file)
index 0000000..9cf1735
--- /dev/null
+++ b/lib/component/notification/Makefile.am
@@ -0,0 +1,11 @@
+AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
+
+noinst_LTLIBRARIES = libcomponent-notification.la
+
+# Plug-in system library
+libcomponent_notification_la_SOURCES = \
+       notification.c \
+       packet.c \
+       event.c \
+       stream.c \
+       heap.c

diff --git a/lib/component/notification/event.c b/lib/component/notification/event.c
new file mode 100644 (file)
index 0000000..93833a2
--- /dev/null
+++ b/lib/component/notification/event.c
@@ -0,0 +1,78 @@
+/*
+ * Babeltrace Plug-in Event Notification
+ *
+ * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/compiler.h>
+#include <babeltrace/component/notification/event-internal.h>
+
+static
+void bt_notification_event_destroy(struct bt_object *obj)
+{
+       struct bt_notification_event *notification =
+                       (struct bt_notification_event *) obj;
+
+       BT_PUT(notification->event);
+       g_free(notification);
+}
+
+struct bt_notification *bt_notification_event_create(struct bt_ctf_event *event)
+{
+       struct bt_notification_event *notification;
+
+       if (!event) {
+               goto error;
+       }
+
+       // FIXME - Validate that the event is associated to a packet
+       //         and freeze the event.
+       notification = g_new0(struct bt_notification_event, 1);
+       if (!notification) {
+               goto error;
+       }
+       bt_notification_init(&notification->parent,
+                       BT_NOTIFICATION_TYPE_EVENT,
+                       bt_notification_event_destroy);
+       notification->event = bt_get(event);
+       return &notification->parent;
+error:
+       return NULL;
+}
+
+struct bt_ctf_event *bt_notification_event_get_event(
+               struct bt_notification *notification)
+{
+       struct bt_ctf_event *event = NULL;
+       struct bt_notification_event *event_notification;
+
+       if (bt_notification_get_type(notification) !=
+                       BT_NOTIFICATION_TYPE_EVENT) {
+               goto end;
+       }
+       event_notification = container_of(notification,
+                       struct bt_notification_event, parent);
+       event = bt_get(event_notification->event);
+end:
+       return event;
+}

diff --git a/lib/component/notification/heap.c b/lib/component/notification/heap.c
new file mode 100644 (file)
index 0000000..b58480f
--- /dev/null
+++ b/lib/component/notification/heap.c
@@ -0,0 +1,264 @@
+/*
+ * Babeltrace - CTF notification priority heap
+ *
+ * Static-sized priority heap containing pointers. Based on CLRS,
+ * chapter 6.
+ *
+ * Copyright (c) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (c) 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <assert.h>
+#include <stddef.h>
+#include <babeltrace/compiler.h>
+#include <babeltrace/component/notification/heap-internal.h>
+
+#ifdef DEBUG_HEAP
+static
+void check_heap(struct bt_notification_heap *heap)
+{
+       size_t i;
+
+       if (!heap->count) {
+               return;
+       }
+
+       for (i = 1; i < heap->count; i++) {
+               assert(!heap->compare(g_ptr_array_index(heap->ptrs, i),
+                               g_ptr_array_index(heap->ptrs, 0),
+                               heap->compare_data));
+       }
+}
+#else
+void check_heap(struct bt_notification_heap *heap)
+{
+}
+#endif
+
+static
+size_t parent(size_t i)
+{
+       return (i - 1) >> 1;
+}
+
+static
+size_t left(size_t i)
+{
+       return (i << 1) + 1;
+}
+
+static
+size_t right(size_t i)
+{
+       return (i << 1) + 2;
+}
+
+/*
+ * Copy of heap->ptrs pointer is invalid after heap_grow.
+ */
+static
+int heap_grow(struct bt_notification_heap *heap, size_t new_len)
+{
+       size_t alloc_len;
+
+       if (likely(heap->ptrs->len >= new_len)) {
+               goto end;
+       }
+
+        alloc_len = max_t(size_t, new_len, heap->ptrs->len << 1);
+       g_ptr_array_set_size(heap->ptrs, alloc_len);
+end:
+       return 0;
+}
+
+static
+int heap_set_count(struct bt_notification_heap *heap, size_t new_count)
+{
+       int ret = 0;
+
+       ret = heap_grow(heap, new_count);
+       if (unlikely(ret)) {
+               goto end;
+       }
+       heap->count = new_count;
+end:
+       return ret;
+}
+
+static
+void heapify(struct bt_notification_heap *heap, size_t i)
+{
+       struct bt_notification **ptrs =
+                       (struct bt_notification **) heap->ptrs->pdata;
+
+       for (;;) {
+               void *tmp;
+               size_t l, r, largest;
+
+               l = left(i);
+               r = right(i);
+               if (l < heap->count && heap->compare(ptrs[l], ptrs[i],
+                               heap->compare_data)) {
+                       largest = l;
+               } else {
+                       largest = i;
+               }
+               if (r < heap->count && heap->compare(ptrs[r], ptrs[largest],
+                               heap->compare_data)) {
+                       largest = r;
+               }
+               if (unlikely(largest == i)) {
+                       break;
+               }
+               tmp = ptrs[i];
+               ptrs[i] = ptrs[largest];
+               ptrs[largest] = tmp;
+               i = largest;
+       }
+       check_heap(heap);
+}
+
+static
+struct bt_notification *heap_replace_max(struct bt_notification_heap *heap,
+               struct bt_notification *notification)
+{
+       struct bt_notification *res = NULL;
+
+       if (unlikely(!heap->count)) {
+               (void) heap_set_count(heap, 1);
+               g_ptr_array_index(heap->ptrs, 0) = notification;
+               check_heap(heap);
+               goto end;
+       }
+
+       /* Replace the current max and heapify. */
+       res = g_ptr_array_index(heap->ptrs, 0);
+       g_ptr_array_index(heap->ptrs, 0) = notification;
+       heapify(heap, 0);
+end:
+       return res;
+}
+
+static
+void bt_notification_heap_destroy(struct bt_object *obj)
+{
+       struct bt_notification_heap *heap = container_of(obj,
+                       struct bt_notification_heap, base);
+
+       if (heap->ptrs) {
+               size_t i;
+
+               for (i = 0; i < heap->count; i++) {
+                       bt_put(g_ptr_array_index(heap->ptrs, i));
+               }
+               g_ptr_array_free(heap->ptrs, TRUE);
+       }
+       g_free(heap);
+}
+
+struct bt_notification_heap *bt_notification_heap_create(
+               bt_notification_time_compare_func comparator, void *user_data)
+{
+       struct bt_notification_heap *heap = NULL;
+
+       if (!comparator) {
+               goto end;
+       }
+
+       heap = g_new0(struct bt_notification_heap, 1);
+       if (!heap) {
+               goto end;
+       }
+
+       bt_object_init(&heap->base, bt_notification_heap_destroy);
+       heap->ptrs = g_ptr_array_new();
+       if (!heap->ptrs) {
+               BT_PUT(heap);
+               goto end;
+       }
+
+       heap->compare = comparator;
+       heap->compare_data = user_data;
+end:
+       return heap;
+}
+
+struct bt_notification *bt_notification_heap_peek(
+               struct bt_notification_heap *heap)
+{
+       check_heap(heap);
+       return bt_get(likely(heap->count) ?
+                       g_ptr_array_index(heap->ptrs, 0) : NULL);
+}
+
+int bt_notification_heap_insert(struct bt_notification_heap *heap,
+               struct bt_notification *notification)
+{
+       int ret;
+       size_t pos;
+        struct bt_notification **ptrs;
+
+       ret = heap_set_count(heap, heap->count + 1);
+       if (unlikely(ret)) {
+               goto end;
+       }
+
+       ptrs = (struct bt_notification **) heap->ptrs->pdata;
+       pos = heap->count - 1;
+       while (pos > 0 && heap->compare(notification, ptrs[parent(pos)],
+                       heap->compare_data)) {
+               /* Move parent down until we find the right spot. */
+               ptrs[pos] = ptrs[parent(pos)];
+               pos = parent(pos);
+       }
+       ptrs[pos] = bt_get(notification);
+       check_heap(heap);
+end:
+       return ret;
+}
+
+struct bt_notification *bt_notification_heap_pop(
+               struct bt_notification_heap *heap)
+{
+        struct bt_notification *ret = NULL;
+
+       switch (heap->count) {
+       case 0:
+               goto end;
+       case 1:
+               (void) heap_set_count(heap, 0);
+               ret = g_ptr_array_index(heap->ptrs, 0);
+               goto end;
+       }
+       /*
+        * Shrink, replace the current max by previous last entry and heapify.
+        */
+       heap_set_count(heap, heap->count - 1);
+       /* count changed. previous last entry is at heap->count. */
+       ret = heap_replace_max(heap, g_ptr_array_index(heap->ptrs,
+                       heap->count));
+end:
+       /*
+        * Not taking a supplementary reference since we are relinquishing our
+        * own to the caller.
+        */
+       return ret;
+}

diff --git a/lib/component/notification/notification.c b/lib/component/notification/notification.c
new file mode 100644 (file)
index 0000000..3b2ffb3
--- /dev/null
+++ b/lib/component/notification/notification.c
@@ -0,0 +1,58 @@
+/*
+ * Babeltrace Plug-in Notification
+ *
+ * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/component/notification/notification-internal.h>
+
+BT_HIDDEN
+void bt_notification_init(struct bt_notification *notification,
+               enum bt_notification_type type,
+               bt_object_release_func release)
+{
+       assert(type > BT_NOTIFICATION_TYPE_ALL &&
+                       type < BT_NOTIFICATION_TYPE_NR);
+       notification->type = type;
+       bt_object_init(&notification->base, release);
+}
+
+enum bt_notification_type bt_notification_get_type(
+               struct bt_notification *notification)
+{
+       return notification ? notification->type : BT_NOTIFICATION_TYPE_UNKNOWN;
+}
+
+struct bt_ctf_stream *bt_notification_get_stream(
+               struct bt_notification *notification)
+{
+       struct bt_ctf_stream *stream = NULL;
+
+       if (!notification || !notification->get_stream) {
+               goto end;
+       }
+
+       stream = notification->get_stream(notification);
+end:
+       return stream;
+}

diff --git a/lib/component/notification/packet.c b/lib/component/notification/packet.c
new file mode 100644 (file)
index 0000000..587b850
--- /dev/null
+++ b/lib/component/notification/packet.c
@@ -0,0 +1,120 @@
+/*
+ * Babeltrace Plug-in Packet-related Notifications
+ *
+ * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/compiler.h>
+#include <babeltrace/component/notification/packet-internal.h>
+
+static
+void bt_notification_packet_begin_destroy(struct bt_object *obj)
+{
+       struct bt_notification_packet_begin *notification =
+                       (struct bt_notification_packet_begin *) obj;
+
+       BT_PUT(notification->packet);
+       g_free(notification);
+}
+
+static
+void bt_notification_packet_end_destroy(struct bt_object *obj)
+{
+       struct bt_notification_packet_end *notification =
+                       (struct bt_notification_packet_end *) obj;
+
+       BT_PUT(notification->packet);
+       g_free(notification);
+}
+
+struct bt_notification *bt_notification_packet_begin_create(
+               struct bt_ctf_packet *packet)
+{
+       struct bt_notification_packet_begin *notification;
+
+       if (!packet) {
+               goto error;
+       }
+
+       notification = g_new0(struct bt_notification_packet_begin, 1);
+       bt_notification_init(&notification->parent,
+                       BT_NOTIFICATION_TYPE_PACKET_BEGIN,
+                       bt_notification_packet_begin_destroy);
+       notification->packet = bt_get(packet);
+       return &notification->parent;
+error:
+       return NULL;
+}
+
+struct bt_ctf_packet *bt_notification_packet_begin_get_packet(
+               struct bt_notification *notification)
+{
+       struct bt_ctf_packet *ret = NULL;
+       struct bt_notification_packet_begin *packet_begin;
+
+       if (notification->type != BT_NOTIFICATION_TYPE_PACKET_BEGIN) {
+               goto end;
+       }
+
+       packet_begin = container_of(notification,
+                       struct bt_notification_packet_begin, parent);
+       ret = bt_get(packet_begin->packet);
+end:
+       return ret;
+}
+
+struct bt_notification *bt_notification_packet_end_create(
+               struct bt_ctf_packet *packet)
+{
+       struct bt_notification_packet_end *notification;
+
+       if (!packet) {
+               goto error;
+       }
+
+       notification = g_new0(struct bt_notification_packet_end, 1);
+       bt_notification_init(&notification->parent,
+                       BT_NOTIFICATION_TYPE_PACKET_END,
+                       bt_notification_packet_end_destroy);
+       notification->packet = bt_get(packet);
+       return &notification->parent;
+error:
+       return NULL;
+}
+
+struct bt_ctf_packet *bt_notification_packet_end_get_packet(
+               struct bt_notification *notification)
+{
+       struct bt_ctf_packet *ret = NULL;
+       struct bt_notification_packet_end *packet_end;
+
+       if (notification->type != BT_NOTIFICATION_TYPE_PACKET_END) {
+               goto end;
+       }
+
+       packet_end = container_of(notification,
+                       struct bt_notification_packet_end, parent);
+       ret = bt_get(packet_end->packet);
+end:
+       return ret;
+}

diff --git a/lib/component/notification/stream.c b/lib/component/notification/stream.c
new file mode 100644 (file)
index 0000000..1fd096c
--- /dev/null
+++ b/lib/component/notification/stream.c
@@ -0,0 +1,67 @@
+/*
+ * Babeltrace Plug-in Stream-related Notifications
+ *
+ * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/compiler.h>
+#include <babeltrace/component/notification/stream-internal.h>
+
+static
+void bt_notification_stream_end_destroy(struct bt_object *obj)
+{
+       struct bt_notification_stream_end *notification =
+                       (struct bt_notification_stream_end *) obj;
+
+       BT_PUT(notification->stream);
+       g_free(notification);
+}
+
+struct bt_notification *bt_notification_stream_end_create(
+               struct bt_ctf_stream *stream)
+{
+       struct bt_notification_stream_end *notification;
+
+       if (!stream) {
+               goto error;
+       }
+
+       notification = g_new0(struct bt_notification_stream_end, 1);
+       bt_notification_init(&notification->parent,
+                       BT_NOTIFICATION_TYPE_STREAM_END,
+                       bt_notification_stream_end_destroy);
+       notification->stream = bt_get(stream);
+       return &notification->parent;
+error:
+       return NULL;
+}
+
+struct bt_ctf_packet *bt_notification_stream_end_get_stream(
+               struct bt_notification *notification)
+{
+       struct bt_notification_stream_end *stream_end;
+
+       stream_end = container_of(notification,
+                       struct bt_notification_stream_end, parent);
+       return bt_get(stream_end->stream);
+}

diff --git a/lib/component/sink.c b/lib/component/sink.c
new file mode 100644 (file)
index 0000000..509ea89
--- /dev/null
+++ b/lib/component/sink.c
@@ -0,0 +1,389 @@
+/*
+ * sink.c
+ *
+ * Babeltrace Sink Component
+ *
+ * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/compiler.h>
+#include <babeltrace/values.h>
+#include <babeltrace/component/sink-internal.h>
+#include <babeltrace/component/component-internal.h>
+#include <babeltrace/component/notification/notification.h>
+
+BT_HIDDEN
+enum bt_component_status bt_component_sink_validate(
+               struct bt_component *component)
+{
+       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+       struct bt_component_sink *sink;
+
+       if (!component) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       if (!component->class) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       if (component->class->type != BT_COMPONENT_TYPE_SINK) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       sink = container_of(component, struct bt_component_sink, parent);
+       if (!sink->consume) {
+               printf_error("Invalid sink component; no notification consumption callback defined.");
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       ret = component_input_validate(&sink->input);
+       if (ret) {
+               goto end;
+       }
+end:
+       return ret;
+}
+
+static
+void bt_component_sink_destroy(struct bt_component *component)
+{
+       struct bt_component_sink *sink = container_of(component,
+                       struct bt_component_sink, parent);
+
+       component_input_fini(&sink->input);
+}
+
+BT_HIDDEN
+struct bt_component *bt_component_sink_create(
+               struct bt_component_class *class, struct bt_value *params)
+{
+       struct bt_component_sink *sink = NULL;
+       enum bt_component_status ret;
+
+       sink = g_new0(struct bt_component_sink, 1);
+       if (!sink) {
+               goto end;
+       }
+
+       sink->parent.class = bt_get(class);
+       ret = bt_component_init(&sink->parent, bt_component_sink_destroy);
+       if (ret != BT_COMPONENT_STATUS_OK) {
+               goto error;
+       }
+
+/*
+       ret = bt_component_sink_register_notification_type(&sink->parent,
+               BT_NOTIFICATION_TYPE_EVENT);
+       if (ret != BT_COMPONENT_STATUS_OK) {
+               goto error;
+       }
+*/
+       if (component_input_init(&sink->input)) {
+               goto error;
+       }
+end:
+       return sink ? &sink->parent : NULL;
+error:
+       BT_PUT(sink);
+       return NULL;
+}
+
+static
+enum bt_component_status validate_inputs(struct bt_component_sink *sink)
+{
+       size_t array_size = sink->input.iterators->len;
+
+       if (array_size < sink->input.min_count ||
+                       array_size > sink->input.max_count) {
+               return BT_COMPONENT_STATUS_INVALID;
+       }
+
+       return BT_COMPONENT_STATUS_OK;
+}
+
+enum bt_component_status bt_component_sink_consume(
+               struct bt_component *component)
+{
+       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+       struct bt_component_sink *sink = NULL;
+
+       if (!component) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_SINK) {
+               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
+               goto end;
+       }
+
+       sink = container_of(component, struct bt_component_sink, parent);
+       if (!sink->input.validated) {
+               ret = validate_inputs(sink);
+               if (ret != BT_COMPONENT_STATUS_OK) {
+                       goto end;
+               }
+               sink->input.validated = true;
+       }
+
+       assert(sink->consume);
+       ret = sink->consume(component);
+end:
+       return ret;
+}
+/*
+static
+enum bt_component_status bt_component_sink_register_notification_type(
+               struct bt_component *component, enum bt_notification_type type)
+{
+       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+       struct bt_component_sink *sink = NULL;
+
+       if (!component) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_SINK) {
+               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
+               goto end;
+       }
+
+       if (type <= BT_NOTIFICATION_TYPE_UNKNOWN ||
+               type >= BT_NOTIFICATION_TYPE_NR) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+       sink = container_of(component, struct bt_component_sink, parent);
+       if (type == BT_NOTIFICATION_TYPE_ALL) {
+               sink->registered_notifications_mask = ~(notification_mask_t) 0;
+       } else {
+               sink->registered_notifications_mask |=
+                       (notification_mask_t) 1 << type;
+       }
+end:
+       return ret;
+}
+*/
+enum bt_component_status bt_component_sink_set_consume_cb(
+               struct bt_component *component,
+               bt_component_sink_consume_cb consume)
+{
+       struct bt_component_sink *sink;
+       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+
+       if (!component) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_SINK) {
+               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
+               goto end;
+       }
+
+       if (!component->initializing) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       sink = container_of(component, struct bt_component_sink, parent);
+       sink->consume = consume;
+end:
+       return ret;
+}
+
+enum bt_component_status bt_component_sink_set_add_iterator_cb(
+               struct bt_component *component,
+               bt_component_sink_add_iterator_cb add_iterator)
+{
+       struct bt_component_sink *sink;
+       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+
+       if (!component) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_SINK) {
+               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
+               goto end;
+       }
+
+       if (!component->initializing) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       sink = container_of(component, struct bt_component_sink, parent);
+       sink->add_iterator = add_iterator;
+end:
+       return ret;
+}
+
+enum bt_component_status bt_component_sink_set_minimum_input_count(
+               struct bt_component *component,
+               unsigned int minimum)
+{
+       struct bt_component_sink *sink;
+       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+
+       if (!component) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_SINK) {
+               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
+               goto end;
+       }
+
+       if (!component->initializing) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       sink = container_of(component, struct bt_component_sink, parent);
+       sink->input.min_count = minimum;
+end:
+       return ret;
+}
+
+enum bt_component_status bt_component_sink_set_maximum_input_count(
+               struct bt_component *component,
+               unsigned int maximum)
+{
+       struct bt_component_sink *sink;
+       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+
+       if (!component) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_SINK) {
+               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
+               goto end;
+       }
+
+       if (!component->initializing) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       sink = container_of(component, struct bt_component_sink, parent);
+       sink->input.max_count = maximum;
+end:
+       return ret;
+}
+
+enum bt_component_status
+bt_component_sink_get_input_count(struct bt_component *component,
+               unsigned int *count)
+{
+       struct bt_component_sink *sink;
+       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+
+       if (!component || !count) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_SINK) {
+               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
+               goto end;
+       }
+
+       sink = container_of(component, struct bt_component_sink, parent);
+       *count = (unsigned int) sink->input.iterators->len;
+end:
+       return ret;
+}
+
+enum bt_component_status
+bt_component_sink_get_input_iterator(struct bt_component *component,
+               unsigned int input, struct bt_notification_iterator **iterator)
+{
+       struct bt_component_sink *sink;
+       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+
+       if (!component || !iterator) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_SINK) {
+               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
+               goto end;
+       }
+
+       sink = container_of(component, struct bt_component_sink, parent);
+       if (input >= (unsigned int) sink->input.iterators->len) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       *iterator = bt_get(g_ptr_array_index(sink->input.iterators, input));
+end:
+       return ret;
+}
+
+enum bt_component_status
+bt_component_sink_add_iterator(struct bt_component *component,
+               struct bt_notification_iterator *iterator)
+{
+       struct bt_component_sink *sink;
+       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+
+       if (!component || !iterator) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_SINK) {
+               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
+               goto end;
+       }
+
+       sink = container_of(component, struct bt_component_sink, parent);
+       if (sink->input.iterators->len == sink->input.max_count) {
+               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
+               goto end;
+       }
+
+       if (sink->add_iterator) {
+               ret = sink->add_iterator(component, iterator);
+               if (ret != BT_COMPONENT_STATUS_OK) {
+                       goto end;
+               }
+       }
+
+       g_ptr_array_add(sink->input.iterators, bt_get(iterator));
+end:
+       return ret;
+}

diff --git a/lib/component/source.c b/lib/component/source.c
new file mode 100644 (file)
index 0000000..a0a21d1
--- /dev/null
+++ b/lib/component/source.c
@@ -0,0 +1,112 @@
+/*
+ * source.c
+ *
+ * Babeltrace Source Component
+ *
+ * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/ref.h>
+#include <babeltrace/compiler.h>
+#include <babeltrace/component/source-internal.h>
+#include <babeltrace/component/component-internal.h>
+#include <babeltrace/component/notification/iterator.h>
+#include <babeltrace/component/notification/iterator-internal.h>
+
+BT_HIDDEN
+enum bt_component_status bt_component_source_validate(
+               struct bt_component *component)
+{
+       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+       struct bt_component_source *source;
+
+       if (!component) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       if (!component->class) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       if (component->class->type != BT_COMPONENT_TYPE_SOURCE) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       source = container_of(component, struct bt_component_source, parent);
+       if (!source->init_iterator) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+end:
+       return ret;
+}
+
+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->parent.class = bt_get(class);
+       ret = bt_component_init(&source->parent, NULL);
+       if (ret != BT_COMPONENT_STATUS_OK) {
+               BT_PUT(source);
+               goto end;
+       }
+end:
+       return source ? &source->parent : NULL;
+}
+
+enum bt_component_status
+bt_component_source_set_iterator_init_cb(struct bt_component *component,
+               bt_component_source_init_iterator_cb init_iterator)
+{
+       struct bt_component_source *source;
+       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+
+       if (component->class->type != BT_COMPONENT_TYPE_SOURCE ||
+                       !component->initializing) {
+               ret = BT_COMPONENT_STATUS_INVALID;
+               goto end;
+       }
+
+       source = container_of(component, struct bt_component_source, parent);
+       source->init_iterator = init_iterator;
+end:
+       return ret;
+}
+
+struct bt_notification_iterator *bt_component_source_create_iterator(
+               struct bt_component *component)
+{
+       return bt_component_create_iterator(component);
+}

diff --git a/lib/plugin-system/Makefile.am b/lib/plugin-system/Makefile.am
deleted file mode 100644 (file)
index 45f11d8..0000000
--- a/lib/plugin-system/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
-
-SUBDIRS = notification
-
-noinst_LTLIBRARIES = libplugin-system.la
-
-# Plug-in system library
-libplugin_system_la_SOURCES = \
-       component.c \
-       component-class.c \
-       component-factory.c \
-       component-graph.c \
-       plugin.c \
-       source.c \
-       sink.c \
-       filter.c \
-       iterator.c \
-       input.c
-
-libplugin_system_la_LIBADD = \
-       notification/libplugin-system-notification.la

diff --git a/lib/plugin-system/component-class.c b/lib/plugin-system/component-class.c
deleted file mode 100644 (file)
index 84e33bd..0000000
--- a/lib/plugin-system/component-class.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * component-class.c
- *
- * Babeltrace Plugin Component Class
- * 
- * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/compiler.h>
-#include <babeltrace/plugin/component-class-internal.h>
-#include <babeltrace/ref.h>
-#include <glib.h>
-
-static
-void bt_component_class_destroy(struct bt_object *obj)
-{
-       struct bt_component_class *class;
-
-       assert(obj);
-       class = container_of(obj, struct bt_component_class, base);
-       if (class->name) {
-               g_string_free(class->name, TRUE);
-       }
-       if (class->description) {
-               g_string_free(class->description, TRUE);
-       }
-
-       bt_put(class->plugin);
-       g_free(class);
-}
-
-BT_HIDDEN
-struct bt_component_class *bt_component_class_create(
-               enum bt_component_type type, const char *name,
-               const char *description, bt_component_init_cb init,
-               struct bt_plugin *plugin)
-{
-       struct bt_component_class *class;
-
-       class = g_new0(struct bt_component_class, 1);
-       if (!class) {
-               goto end;
-       }
-
-       bt_object_init(class, bt_component_class_destroy);
-       class->type = type;
-       class->init = init;
-       class->name = g_string_new(name);
-       class->description = g_string_new(description);
-       if (!class->name || !class->description) {
-               BT_PUT(class);
-               goto end;
-       }
-
-       class->plugin = bt_get(plugin);
-end:
-       return class;
-}
-
-const char *bt_component_class_get_name(
-               struct bt_component_class *component_class)
-{
-       return component_class ? component_class->name->str : NULL;
-}
-
-enum bt_component_type bt_component_class_get_type(
-               struct bt_component_class *component_class)
-{
-       return component_class ? component_class->type :
-                       BT_COMPONENT_TYPE_UNKNOWN;
-}
-
-struct bt_plugin *bt_component_class_get_plugin(
-               struct bt_component_class *component_class)
-{
-       return component_class ? bt_get(component_class->plugin) :
-                       NULL;
-}
-
-const char *bt_component_class_get_description(
-               struct bt_component_class *component_class)
-{
-       return component_class ? component_class->description->str : NULL;
-}

diff --git a/lib/plugin-system/component-factory.c b/lib/plugin-system/component-factory.c
deleted file mode 100644 (file)
index 14454f5..0000000
--- a/lib/plugin-system/component-factory.c
+++ /dev/null
@@ -1,511 +0,0 @@
-/*
- * component-factory.c
- *
- * Babeltrace Plugin Component Factory
- *
- * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/plugin/component-factory.h>
-#include <babeltrace/plugin/component-factory-internal.h>
-#include <babeltrace/plugin/component-class-internal.h>
-#include <babeltrace/plugin/source-internal.h>
-#include <babeltrace/plugin/sink-internal.h>
-#include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/compiler.h>
-#include <babeltrace/ref.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <gmodule.h>
-#include <stdbool.h>
-#include <dirent.h>
-
-#define NATIVE_PLUGIN_SUFFIX ".so"
-#define NATIVE_PLUGIN_SUFFIX_LEN sizeof(NATIVE_PLUGIN_SUFFIX)
-#define LIBTOOL_PLUGIN_SUFFIX ".la"
-#define LIBTOOL_PLUGIN_SUFFIX_LEN sizeof(LIBTOOL_PLUGIN_SUFFIX)
-#define PLUGIN_SUFFIX_LEN max_t(size_t, sizeof(NATIVE_PLUGIN_SUFFIX), \
-               sizeof(LIBTOOL_PLUGIN_SUFFIX))
-
-DECLARE_PLUG_IN_SECTIONS;
-
-/* Allocate dirent as recommended by READDIR(3), NOTES on readdir_r */
-static
-struct dirent *alloc_dirent(const char *path)
-{
-       size_t len;
-       long name_max;
-       struct dirent *entry;
-
-       name_max = pathconf(path, _PC_NAME_MAX);
-       if (name_max == -1) {
-               name_max = PATH_MAX;
-       }
-       len = offsetof(struct dirent, d_name) + name_max + 1;
-       entry = zmalloc(len);
-       return entry;
-}
-
-static
-enum bt_component_factory_status init_plugin(
-               struct bt_component_factory *factory, struct bt_plugin *plugin)
-{
-       enum bt_component_status component_status;
-       enum bt_component_factory_status ret = BT_COMPONENT_FACTORY_STATUS_OK;
-
-       BT_MOVE(factory->current_plugin, plugin);
-       component_status = bt_plugin_register_component_classes(
-                       factory->current_plugin, factory);
-       BT_PUT(factory->current_plugin);
-       if (component_status != BT_COMPONENT_STATUS_OK) {
-               switch (component_status) {
-               case BT_COMPONENT_STATUS_NOMEM:
-                       ret = BT_COMPONENT_FACTORY_STATUS_NOMEM;
-                       break;
-               default:
-                       ret = BT_COMPONENT_FACTORY_STATUS_ERROR;
-                       break;
-               }
-       }
-       return ret;
-}
-
-static
-enum bt_component_factory_status
-bt_component_factory_load_file(struct bt_component_factory *factory,
-               const char *path)
-{
-       enum bt_component_factory_status ret = BT_COMPONENT_FACTORY_STATUS_OK;
-       size_t path_len;
-       GModule *module;
-       struct bt_plugin *plugin;
-       bool is_libtool_wrapper = false, is_shared_object = false;
-
-       if (!factory || !path) {
-               ret = BT_COMPONENT_FACTORY_STATUS_INVAL;
-               goto end;
-       }
-
-       path_len = strlen(path);
-       if (path_len <= PLUGIN_SUFFIX_LEN) {
-               ret = BT_COMPONENT_FACTORY_STATUS_INVAL;
-               goto end;
-       }
-
-       path_len++;
-       /*
-        * Check if the file ends with a known plugin file type suffix (i.e. .so
-        * or .la on Linux).
-        */
-       is_libtool_wrapper = !strncmp(LIBTOOL_PLUGIN_SUFFIX,
-                       path + path_len - LIBTOOL_PLUGIN_SUFFIX_LEN,
-                       LIBTOOL_PLUGIN_SUFFIX_LEN);
-       is_shared_object = !strncmp(NATIVE_PLUGIN_SUFFIX,
-                       path + path_len - NATIVE_PLUGIN_SUFFIX_LEN,
-                       NATIVE_PLUGIN_SUFFIX_LEN);
-       if (!is_shared_object && !is_libtool_wrapper) {
-               /* Name indicates that this is not a plugin file. */
-               ret = BT_COMPONENT_FACTORY_STATUS_INVAL;
-               goto end;
-       }
-
-       module = g_module_open(path, 0);
-       if (!module) {
-               printf_verbose("Module open error: %s\n", g_module_error());
-               ret = BT_COMPONENT_FACTORY_STATUS_ERROR;
-               goto end;
-       }
-
-       /* Load plugin and make sure it defines the required entry points. */
-       plugin = bt_plugin_create_from_module(module, path);
-       if (!plugin) {
-               ret = BT_COMPONENT_FACTORY_STATUS_INVAL_PLUGIN;
-               if (!g_module_close(module)) {
-                       printf_error("Module close error: %s\n",
-                               g_module_error());
-               }
-               goto end;
-       }
-       ret = init_plugin(factory, plugin);
-end:
-       return ret;
-}
-
-static
-enum bt_component_factory_status
-bt_component_factory_load_dir(struct bt_component_factory *factory,
-               const char *path, bool recurse)
-{
-       DIR *directory = NULL;
-       struct dirent *entry = NULL, *result = NULL;
-       char *file_path = NULL;
-       size_t path_len = strlen(path);
-       enum bt_component_factory_status ret = BT_COMPONENT_FACTORY_STATUS_OK;
-
-       if (path_len >= PATH_MAX) {
-               ret = BT_COMPONENT_FACTORY_STATUS_INVAL;
-               goto end;
-       }
-
-       entry = alloc_dirent(path);
-       if (!entry) {
-               ret = BT_COMPONENT_FACTORY_STATUS_NOMEM;
-               goto end;
-       }
-
-       file_path = zmalloc(PATH_MAX);
-       if (!file_path) {
-               ret = BT_COMPONENT_FACTORY_STATUS_NOMEM;
-               goto end;
-       }
-
-       strncpy(file_path, path, path_len);
-       /* Append a trailing '/' to the path */
-       if (file_path[path_len - 1] != '/') {
-               file_path[path_len++] = '/';
-       }
-
-       directory = opendir(file_path);
-       if (!directory) {
-               perror("Failed to open plug-in directory");
-               ret = BT_COMPONENT_FACTORY_STATUS_ERROR;
-               goto end;
-       }
-
-       /* Recursively walk directory */
-       while (!readdir_r(directory, entry, &result) && result) {
-               struct stat st;
-               int stat_ret;
-               size_t file_name_len;
-
-               if (result->d_name[0] == '.') {
-                       /* Skip hidden files, . and .. */
-                       continue;
-               }
-
-               file_name_len = strlen(result->d_name);
-
-               if (path_len + file_name_len >= PATH_MAX) {
-                       continue;
-               }
-
-               strncpy(file_path + path_len, result->d_name, file_name_len);
-               file_path[path_len + file_name_len] = '\0';
-
-               stat_ret = stat(file_path, &st);
-               if (stat_ret < 0) {
-                       /* Continue to next file / directory. */
-                       printf_perror("Failed to stat() plugin file\n");
-                       continue;
-               }
-
-               if (S_ISDIR(st.st_mode) && recurse) {
-                       ret = bt_component_factory_load_dir(factory,
-                               file_path, true);
-                       if (ret != BT_COMPONENT_FACTORY_STATUS_OK) {
-                               goto end;
-                       }
-               } else if (S_ISREG(st.st_mode)) {
-                       bt_component_factory_load_file(factory, file_path);
-               }
-       }
-end:
-       if (directory) {
-               if (closedir(directory)) {
-                       /*
-                        * We don't want to override the error since there is
-                        * nothing could do.
-                        */
-                       perror("Failed to close plug-in directory");
-               }
-       }
-       free(entry);
-       free(file_path);
-       return ret;
-}
-
-static
-void bt_component_factory_destroy(struct bt_object *obj)
-{
-       struct bt_component_factory *factory = NULL;
-
-       assert(obj);
-       factory = container_of(obj, struct bt_component_factory, base);
-
-       if (factory->component_classes) {
-               g_ptr_array_free(factory->component_classes, TRUE);
-       }
-       g_free(factory);
-}
-
-struct bt_component_factory *bt_component_factory_create(void)
-{
-       struct bt_component_factory *factory;
-
-       factory = g_new0(struct bt_component_factory, 1);
-       if (!factory) {
-               goto end;
-       }
-
-       bt_object_init(factory, bt_component_factory_destroy);
-       factory->component_classes = g_ptr_array_new_with_free_func(
-               (GDestroyNotify) bt_put);
-       if (!factory->component_classes) {
-               goto error;
-       }
-end:
-       return factory;
-error:
-        BT_PUT(factory);
-       return factory;
-}
-
-int bt_component_factory_get_component_class_count(
-               struct bt_component_factory *factory)
-{
-       return factory ? factory->component_classes->len : -1;
-}
-
-struct bt_component_class *bt_component_factory_get_component_class_index(
-               struct bt_component_factory *factory, int index)
-{
-       struct bt_component_class *component_class = NULL;
-
-       if (!factory || index < 0 || index >= factory->component_classes->len) {
-               goto end;
-       }
-
-       component_class = bt_get(g_ptr_array_index(
-                       factory->component_classes, index));
-end:
-       return component_class;
-}
-
-struct bt_component_class *bt_component_factory_get_component_class(
-               struct bt_component_factory *factory,
-               const char *plugin_name, enum bt_component_type type,
-               const char *component_name)
-{
-       size_t i;
-       struct bt_component_class *component_class = NULL;
-
-       if (!factory || (!plugin_name && !component_name &&
-                       type == BT_COMPONENT_TYPE_UNKNOWN)) {
-               /* At least one criterion must be provided. */
-               goto no_match;
-       }
-
-       for (i = 0; i < factory->component_classes->len; i++) {
-               struct bt_plugin *plugin = NULL;
-
-               component_class = g_ptr_array_index(factory->component_classes,
-                               i);
-               plugin = bt_component_class_get_plugin(component_class);
-               assert(plugin);
-
-               if (type != BT_COMPONENT_TYPE_UNKNOWN) {
-                       if (type != bt_component_class_get_type(
-                                       component_class)) {
-                               bt_put(plugin);
-                               continue;
-                       }
-               }
-
-               if (plugin_name) {
-                       const char *cur_plugin_name = bt_plugin_get_name(
-                                       plugin);
-
-                       assert(cur_plugin_name);
-                       if (strcmp(plugin_name, cur_plugin_name)) {
-                               bt_put(plugin);
-                               continue;
-                       }
-               }
-
-               if (component_name) {
-                       const char *cur_cc_name = bt_component_class_get_name(
-                                       component_class);
-
-                       assert(cur_cc_name);
-                       if (strcmp(component_name, cur_cc_name)) {
-                               bt_put(plugin);
-                               continue;
-                       }
-               }
-
-               bt_put(plugin);
-               /* All criteria met. */
-               goto match;
-       }
-
-no_match:
-       return NULL;
-match:
-       return bt_get(component_class);
-}
-
-static
-enum bt_component_factory_status _bt_component_factory_load(
-               struct bt_component_factory *factory, const char *path,
-               bool recursive)
-{
-       enum bt_component_factory_status ret = BT_COMPONENT_FACTORY_STATUS_OK;
-
-       if (!factory || !path) {
-               ret = BT_COMPONENT_FACTORY_STATUS_INVAL;
-               goto end;
-       }
-
-       if (!g_file_test(path, G_FILE_TEST_EXISTS)) {
-               ret = BT_COMPONENT_FACTORY_STATUS_NOENT;
-               goto end;
-       }
-
-       if (g_file_test(path, G_FILE_TEST_IS_DIR)) {
-               ret = bt_component_factory_load_dir(factory, path, recursive);
-       } else if (g_file_test(path, G_FILE_TEST_IS_REGULAR) ||
-                       g_file_test(path, G_FILE_TEST_IS_SYMLINK)) {
-               ret = bt_component_factory_load_file(factory, path);
-       } else {
-               ret = BT_COMPONENT_FACTORY_STATUS_INVAL;
-               goto end;
-       }
-end:
-       return ret;
-}
-
-enum bt_component_factory_status bt_component_factory_load_recursive(
-               struct bt_component_factory *factory, const char *path)
-{
-       return _bt_component_factory_load(factory, path, true);
-}
-
-enum bt_component_factory_status bt_component_factory_load(
-               struct bt_component_factory *factory, const char *path)
-{
-       return _bt_component_factory_load(factory, path, false);
-}
-
-enum bt_component_factory_status bt_component_factory_load_static(
-               struct bt_component_factory *factory)
-{
-       size_t count, i;
-       enum bt_component_factory_status ret = BT_COMPONENT_FACTORY_STATUS_OK;
-
-       PRINT_PLUG_IN_SECTIONS(printf_verbose);
-
-       count = SECTION_ELEMENT_COUNT(__plugin_register_funcs);
-       if (SECTION_ELEMENT_COUNT(__plugin_register_funcs) != count ||
-                       SECTION_ELEMENT_COUNT(__plugin_names) != count ||
-                       SECTION_ELEMENT_COUNT(__plugin_authors) != count ||
-                       SECTION_ELEMENT_COUNT(__plugin_licenses) != count ||
-                       SECTION_ELEMENT_COUNT(__plugin_descriptions) != count) {
-               printf_error("Some statically-linked plug-ins do not define all mandatory symbols\n");
-               ret = BT_COMPONENT_FACTORY_STATUS_INVAL_PLUGIN;
-               goto end;
-       }
-       printf_verbose("Detected %zu statically-linked plug-ins\n", count);
-
-       for (i = 0; i < count; i++) {
-               struct bt_plugin *plugin = bt_plugin_create_from_static(i);
-
-               if (!plugin) {
-                       continue;
-               }
-
-               (void) init_plugin(factory, plugin);
-       }
-end:
-       return ret;
-}
-
-static
-enum bt_component_factory_status
-add_component_class(struct bt_component_factory *factory, const char *name,
-                   const char *description, bt_component_init_cb init,
-                   enum bt_component_type type)
-{
-       struct bt_component_class *component_class;
-       enum bt_component_factory_status ret = BT_COMPONENT_FACTORY_STATUS_OK;
-
-       if (!factory || !name || !init) {
-               ret = BT_COMPONENT_FACTORY_STATUS_INVAL;
-               goto end;
-       }
-       assert(factory->current_plugin);
-
-       /*
-        * Ensure this component class does not clash with a currently
-        * registered class.
-        */
-       component_class = bt_component_factory_get_component_class(factory,
-               bt_plugin_get_name(factory->current_plugin), type, name);
-       if (component_class) {
-               struct bt_plugin *plugin = bt_component_class_get_plugin(
-                       component_class);
-
-               printf_verbose("Duplicate component class registration attempted. Component class %s being registered by plugin %s (path: %s) conflicts with one already registered by plugin %s (path: %s)\n",
-                       name, bt_plugin_get_name(factory->current_plugin),
-                       bt_plugin_get_path(factory->current_plugin),
-                       bt_plugin_get_name(plugin),
-                       bt_plugin_get_path(plugin));
-               ret = BT_COMPONENT_FACTORY_STATUS_DUPLICATE;
-               BT_PUT(component_class);
-               bt_put(plugin);
-               goto end;
-       }
-
-       component_class = bt_component_class_create(type, name, description,
-                       init, factory->current_plugin);
-       g_ptr_array_add(factory->component_classes, component_class);
-end:
-       return ret;
-}
-
-enum bt_component_factory_status
-bt_component_factory_register_source_component_class(
-               struct bt_component_factory *factory, const char *name,
-               const char *description, bt_component_init_cb init)
-{
-       return add_component_class(factory, name, description, init,
-                       BT_COMPONENT_TYPE_SOURCE);
-}
-
-enum bt_component_factory_status
-bt_component_factory_register_sink_component_class(
-               struct bt_component_factory *factory, const char *name,
-               const char *description, bt_component_init_cb init)
-{
-       return add_component_class(factory, name, description, init,
-                       BT_COMPONENT_TYPE_SINK);
-}
-
-enum bt_component_factory_status
-bt_component_factory_register_filter_component_class(
-               struct bt_component_factory *factory, const char *name,
-               const char *description, bt_component_init_cb init)
-{
-       return add_component_class(factory, name, description, init,
-                       BT_COMPONENT_TYPE_FILTER);
-}

diff --git a/lib/plugin-system/component-graph.c b/lib/plugin-system/component-graph.c
deleted file mode 100644 (file)
index 551d2d4..0000000
--- a/lib/plugin-system/component-graph.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * component-graph.c
- *
- * Babeltrace Plugin Component Graph
- *
- * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/plugin/component-graph-internal.h>
-#include <babeltrace/compiler.h>
-
-static void bt_component_graph_destroy(struct bt_object *obj)
-{
-       struct bt_component_graph *graph = container_of(obj,
-                       struct bt_component_graph, base);
-
-       if (graph->connections) {
-               g_ptr_array_free(graph->connections, TRUE);
-       }
-       if (graph->sinks) {
-               g_ptr_array_free(graph->sinks, TRUE);
-       }
-       g_free(graph);
-}
-
-struct bt_component_graph *bt_component_graph_create(void)
-{
-       struct bt_component_graph *graph;
-
-       graph = g_new0(struct bt_component_graph, 1);
-       if (!graph) {
-               goto end;
-       }
-
-       bt_object_init(graph, bt_component_graph_destroy);
-
-       graph->connections = g_ptr_array_new_with_free_func(bt_put);
-       if (!graph->connections) {
-               goto error;
-       }
-       graph->sinks = g_ptr_array_new_with_free_func(bt_put);
-       if (!graph->sinks) {
-               goto error;
-       }
-end:
-       return graph;
-error:
-       BT_PUT(graph);
-       goto end;
-}
-
-enum bt_component_graph_status bt_component_graph_connect(
-               struct bt_component_graph *graph, struct bt_component *upstream,
-               struct bt_component *downstream)
-{
-       return BT_COMPONENT_GRAPH_STATUS_OK;
-}
-
-enum bt_component_graph_status bt_component_graph_add_component(
-               struct bt_component_graph *graph,
-               struct bt_component *component)
-{
-       return BT_COMPONENT_GRAPH_STATUS_OK;
-}
-
-enum bt_component_graph_status bt_component_graph_add_component_as_sibling(
-               struct bt_component_graph *graph, struct bt_component *origin,
-               struct bt_component *new_component)
-{
-       return BT_COMPONENT_GRAPH_STATUS_OK;
-}
-
-enum bt_component_graph_status bt_component_graph_run(
-               struct bt_component_graph *graph)
-{
-       return BT_COMPONENT_GRAPH_STATUS_OK;
-}
-

diff --git a/lib/plugin-system/component.c b/lib/plugin-system/component.c
deleted file mode 100644 (file)
index ec93907..0000000
--- a/lib/plugin-system/component.c
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * component.c
- *
- * Babeltrace Plugin Component
- *
- * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/plugin/component.h>
-#include <babeltrace/plugin/component-internal.h>
-#include <babeltrace/plugin/source-internal.h>
-#include <babeltrace/plugin/filter-internal.h>
-#include <babeltrace/plugin/notification/iterator-internal.h>
-#include <babeltrace/plugin/sink-internal.h>
-#include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/compiler.h>
-#include <babeltrace/ref.h>
-
-static
-struct bt_component * (* const component_create_funcs[])(
-               struct bt_component_class *, struct bt_value *) = {
-       [BT_COMPONENT_TYPE_SOURCE] = bt_component_source_create,
-       [BT_COMPONENT_TYPE_SINK] = bt_component_sink_create,
-       [BT_COMPONENT_TYPE_FILTER] = bt_component_filter_create,
-};
-
-static
-enum bt_component_status (* const component_validation_funcs[])(
-               struct bt_component *) = {
-       [BT_COMPONENT_TYPE_SOURCE] = bt_component_source_validate,
-       [BT_COMPONENT_TYPE_SINK] = bt_component_sink_validate,
-       [BT_COMPONENT_TYPE_FILTER] = bt_component_filter_validate,
-};
-
-static
-void bt_component_destroy(struct bt_object *obj)
-{
-       struct bt_component *component = NULL;
-       struct bt_component_class *component_class = NULL;
-
-       if (!obj) {
-               return;
-       }
-
-       component = container_of(obj, struct bt_component, base);
-       component_class = component->class;
-
-       /*
-        * User data is destroyed first, followed by the concrete component
-        * instance.
-        */
-       if (component->user_destroy) {
-               component->user_destroy(component);
-       }
-
-       if (component->destroy) {
-               component->destroy(component);
-       }
-
-       g_string_free(component->name, TRUE);
-       bt_put(component_class);
-       g_free(component);
-}
-
-BT_HIDDEN
-enum bt_component_status bt_component_init(struct bt_component *component,
-               bt_component_destroy_cb destroy)
-{
-       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-
-       if (!component) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       component->destroy = destroy;
-end:
-       return ret;
-}
-
-BT_HIDDEN
-enum bt_component_type bt_component_get_type(struct bt_component *component)
-{
-       return component ? component->class->type : BT_COMPONENT_TYPE_UNKNOWN;
-}
-
-BT_HIDDEN
-struct bt_notification_iterator *bt_component_create_iterator(
-               struct bt_component *component)
-{
-       enum bt_notification_iterator_status ret_iterator;
-       enum bt_component_type component_type;
-       struct bt_notification_iterator *iterator = NULL;
-
-       if (!component) {
-               goto error;
-       }
-
-       component_type = bt_component_get_type(component);
-       if (component_type != BT_COMPONENT_TYPE_SOURCE &&
-                       component_type != BT_COMPONENT_TYPE_FILTER) {
-               /* Unsupported operation. */
-               goto error;
-       }
-
-       iterator = bt_notification_iterator_create(component);
-       if (!iterator) {
-               goto error;
-       }
-
-       switch (component_type) {
-       case BT_COMPONENT_TYPE_SOURCE:
-       {
-               struct bt_component_source *source;
-               enum bt_component_status ret_component;
-
-               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;
-               }
-               break;
-
-               break;
-       }
-       case BT_COMPONENT_TYPE_FILTER:
-       {
-               struct bt_component_filter *filter;
-               enum bt_component_status ret_component;
-
-               filter = container_of(component, struct bt_component_filter, parent);
-               assert(filter->init_iterator);
-               ret_component = filter->init_iterator(component, iterator);
-               if (ret_component != BT_COMPONENT_STATUS_OK) {
-                       goto error;
-               }
-               break;
-       }
-       default:
-               /* Unreachable. */
-               assert(0);
-       }
-
-       ret_iterator = bt_notification_iterator_validate(iterator);
-       if (ret_iterator != BT_NOTIFICATION_ITERATOR_STATUS_OK) {
-               goto error;
-       }
-
-       return iterator;
-error:
-       BT_PUT(iterator);
-       return iterator;
-}
-
-struct bt_component *bt_component_create(
-               struct bt_component_class *component_class, const char *name,
-               struct bt_value *params)
-{
-       int ret;
-       struct bt_component *component = NULL;
-       enum bt_component_type type;
-
-       if (!component_class) {
-               goto end;
-       }
-
-       type = bt_component_class_get_type(component_class);
-       if (type <= BT_COMPONENT_TYPE_UNKNOWN ||
-                       type > BT_COMPONENT_TYPE_FILTER) {
-               goto end;
-       }
-
-       component = component_create_funcs[type](component_class, params);
-       if (!component) {
-               goto end;
-       }
-
-       bt_object_init(component, bt_component_destroy);
-       component->name = g_string_new(name);
-       if (!component->name) {
-               BT_PUT(component);
-               goto end;
-       }
-
-       component->initializing = true;
-       ret = component_class->init(component, params);
-       component->initializing = false;
-       if (ret != BT_COMPONENT_STATUS_OK) {
-               BT_PUT(component);
-               goto end;
-       }
-       ret = component_validation_funcs[type](component);
-       if (ret != BT_COMPONENT_STATUS_OK) {
-               BT_PUT(component);
-               goto end;
-       }
-end:
-       return component;
-}
-
-const char *bt_component_get_name(struct bt_component *component)
-{
-       const char *ret = NULL;
-
-       if (!component) {
-               goto end;
-       }
-
-       ret = component->name->str;
-end:
-       return ret;
-}
-
-enum bt_component_status bt_component_set_name(struct bt_component *component,
-               const char *name)
-{
-       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-
-       if (!component || !name || name[0] == '\0') {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       g_string_assign(component->name, name);
-end:
-       return ret;
-}
-
-struct bt_component_class *bt_component_get_class(
-               struct bt_component *component)
-{
-       return component ? bt_get(component->class) : NULL;
-}
-
-void *bt_component_get_private_data(struct bt_component *component)
-{
-       return component ? component->user_data : NULL;
-}
-
-enum bt_component_status
-bt_component_set_private_data(struct bt_component *component,
-               void *data)
-{
-       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-
-       if (!component || !component->initializing) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       component->user_data = data;
-end:
-       return ret;
-}
-
-enum bt_component_status bt_component_set_destroy_cb(
-               struct bt_component *component, bt_component_destroy_cb destroy)
-{
-       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-
-       if (!component || !component->initializing) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       component->user_destroy = destroy;
-end:
-       return ret;
-}

diff --git a/lib/plugin-system/filter.c b/lib/plugin-system/filter.c
deleted file mode 100644 (file)
index 2ba611d..0000000
--- a/lib/plugin-system/filter.c
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
- * filter.c
- *
- * Babeltrace Filter Component
- *
- * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/compiler.h>
-#include <babeltrace/values.h>
-#include <babeltrace/plugin/input.h>
-#include <babeltrace/plugin/filter-internal.h>
-#include <babeltrace/plugin/component-internal.h>
-#include <babeltrace/plugin/notification/notification.h>
-#include <babeltrace/plugin/notification/iterator-internal.h>
-
-enum bt_component_status bt_component_filter_set_iterator_init_cb(
-               struct bt_component *component,
-               bt_component_filter_init_iterator_cb init_iterator)
-{
-       struct bt_component_filter *filter;
-       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-
-       if (component->class->type != BT_COMPONENT_TYPE_FILTER ||
-                       !component->initializing) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       filter = container_of(component, struct bt_component_filter, parent);
-       filter->init_iterator = init_iterator;
-end:
-       return ret;
-}
-
-enum bt_component_status bt_component_filter_set_add_iterator_cb(
-               struct bt_component *component,
-               bt_component_filter_add_iterator_cb add_iterator)
-{
-       struct bt_component_filter *filter;
-       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-
-       if (!component) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_FILTER) {
-               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
-               goto end;
-       }
-
-       if (!component->initializing) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       filter = container_of(component, struct bt_component_filter, parent);
-       filter->add_iterator = add_iterator;
-end:
-       return ret;
-}
-
-enum bt_component_status bt_component_filter_set_minimum_input_count(
-               struct bt_component *component,
-               unsigned int minimum)
-{
-       struct bt_component_filter *filter;
-       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-
-       if (!component) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_FILTER) {
-               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
-               goto end;
-       }
-
-       if (!component->initializing) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       filter = container_of(component, struct bt_component_filter, parent);
-       filter->input.min_count = minimum;
-end:
-       return ret;
-}
-
-enum bt_component_status bt_component_filter_set_maximum_input_count(
-               struct bt_component *component,
-               unsigned int maximum)
-{
-       struct bt_component_filter *filter;
-       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-
-       if (!component) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_FILTER) {
-               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
-               goto end;
-       }
-
-       if (!component->initializing) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       filter = container_of(component, struct bt_component_filter, parent);
-       filter->input.max_count = maximum;
-end:
-       return ret;
-}
-
-enum bt_component_status
-bt_component_filter_get_input_count(struct bt_component *component,
-               unsigned int *count)
-{
-       struct bt_component_filter *filter;
-       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-
-       if (!component || !count) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_FILTER) {
-               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
-               goto end;
-       }
-
-       filter = container_of(component, struct bt_component_filter, parent);
-       *count = (unsigned int) filter->input.iterators->len;
-end:
-       return ret;
-}
-
-enum bt_component_status
-bt_component_filter_get_input_iterator(struct bt_component *component,
-               unsigned int input, struct bt_notification_iterator **iterator)
-{
-       struct bt_component_filter *filter;
-       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-
-       if (!component || !iterator) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_FILTER) {
-               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
-               goto end;
-       }
-
-       filter = container_of(component, struct bt_component_filter, parent);
-       if (input >= (unsigned int) filter->input.iterators->len) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       *iterator = bt_get(g_ptr_array_index(filter->input.iterators, input));
-end:
-       return ret;
-}
-
-enum bt_component_status bt_component_filter_add_iterator(
-               struct bt_component *component,
-               struct bt_notification_iterator *iterator)
-{
-       struct bt_component_filter *filter;
-       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-
-       if (!component || !iterator) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_FILTER) {
-               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
-               goto end;
-       }
-
-       filter = container_of(component, struct bt_component_filter, parent);
-       if (filter->input.iterators->len == filter->input.max_count) {
-               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
-               goto end;
-       }
-
-       if (filter->add_iterator) {
-               ret = filter->add_iterator(component, iterator);
-               if (ret != BT_COMPONENT_STATUS_OK) {
-                       goto end;
-               }
-       }
-
-       g_ptr_array_add(filter->input.iterators, bt_get(iterator));
-end:
-       return ret;
-}
-
-struct bt_notification_iterator *bt_component_filter_create_iterator(
-               struct bt_component *component)
-{
-       return bt_component_create_iterator(component);
-}
-
-static
-void bt_component_filter_destroy(struct bt_component *component)
-{
-       struct bt_component_filter *filter = container_of(component,
-                       struct bt_component_filter, parent);
-
-       component_input_fini(&filter->input);
-}
-
-BT_HIDDEN
-struct bt_component *bt_component_filter_create(
-               struct bt_component_class *class, struct bt_value *params)
-{
-       struct bt_component_filter *filter = NULL;
-       enum bt_component_status ret;
-
-       filter = g_new0(struct bt_component_filter, 1);
-       if (!filter) {
-               goto end;
-       }
-
-       filter->parent.class = bt_get(class);
-       ret = bt_component_init(&filter->parent, bt_component_filter_destroy);
-       if (ret != BT_COMPONENT_STATUS_OK) {
-               goto error;
-       }
-
-       if (component_input_init(&filter->input)) {
-               goto error;
-       }
-end:
-       return filter ? &filter->parent : NULL;
-error:
-       BT_PUT(filter);
-       goto end;
-}
-
-BT_HIDDEN
-enum bt_component_status bt_component_filter_validate(
-               struct bt_component *component)
-{
-       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-       struct bt_component_filter *filter;
-
-       if (!component) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       if (!component->class) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       if (component->class->type != BT_COMPONENT_TYPE_FILTER) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       filter = container_of(component, struct bt_component_filter, parent);
-       if (!filter->init_iterator) {
-               printf_error("Invalid filter component; no iterator initialization callback defined.");
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       ret = component_input_validate(&filter->input);
-       if (ret) {
-               goto end;
-       }
-end:
-       return ret;
-}

diff --git a/lib/plugin-system/input.c b/lib/plugin-system/input.c
deleted file mode 100644 (file)
index 26f0d33..0000000
--- a/lib/plugin-system/input.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * input.c
- *
- * Babeltrace Component Input
- *
- * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/plugin/input.h>
-#include <babeltrace/ref.h>
-
-BT_HIDDEN
-int component_input_init(struct component_input *input)
-{
-       input->min_count = 1;
-       input->max_count = 1;
-       input->iterators = g_ptr_array_new_with_free_func(bt_put);
-       if (!input->iterators) {
-               return 1;
-       }
-       return 0;
-}
-
-BT_HIDDEN
-int component_input_validate(struct component_input *input)
-{
-       if (input->min_count > input->max_count) {
-               printf_error("Invalid component configuration; minimum input count > maximum input count.");
-               return 1;
-       }
-       return 0;
-}
-
-BT_HIDDEN
-void component_input_fini(struct component_input *input)
-{
-       g_ptr_array_free(input->iterators, TRUE);
-}

diff --git a/lib/plugin-system/iterator.c b/lib/plugin-system/iterator.c
deleted file mode 100644 (file)
index 9976ad5..0000000
--- a/lib/plugin-system/iterator.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * iterator.c
- *
- * Babeltrace Notification Iterator
- *
- * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/compiler.h>
-#include <babeltrace/ref.h>
-#include <babeltrace/plugin/component.h>
-#include <babeltrace/plugin/source-internal.h>
-#include <babeltrace/plugin/notification/iterator.h>
-#include <babeltrace/plugin/notification/iterator-internal.h>
-
-static
-void bt_notification_iterator_destroy(struct bt_object *obj)
-{
-       struct bt_notification_iterator *iterator;
-
-       assert(obj);
-       iterator = container_of(obj, struct bt_notification_iterator,
-                       base);
-       assert(iterator->user_destroy || !iterator->user_data);
-       if (iterator->user_destroy) {
-               iterator->user_destroy(iterator);
-       }
-       BT_PUT(iterator->component);
-       g_free(iterator);
-}
-
-BT_HIDDEN
-struct bt_notification_iterator *bt_notification_iterator_create(
-               struct bt_component *component)
-{
-       enum bt_component_type type;
-       struct bt_notification_iterator *iterator = NULL;
-
-       if (!component) {
-               goto end;
-       }
-
-       type = bt_component_get_type(component);
-       switch (type) {
-       case BT_COMPONENT_TYPE_SOURCE:
-       case BT_COMPONENT_TYPE_FILTER:
-               break;
-       default:
-               goto end;
-       }
-
-       iterator = g_new0(struct bt_notification_iterator, 1);
-       if (!iterator) {
-               goto end;
-       }
-
-       iterator->component = bt_get(component);
-       bt_object_init(iterator, bt_notification_iterator_destroy);
-end:
-       return iterator;
-}
-
-BT_HIDDEN
-enum bt_notification_iterator_status bt_notification_iterator_validate(
-               struct bt_notification_iterator *iterator)
-{
-       enum bt_notification_iterator_status ret =
-                       BT_NOTIFICATION_ITERATOR_STATUS_OK;
-
-       if (!iterator || !iterator->get || !iterator->next) {
-               ret = BT_NOTIFICATION_ITERATOR_STATUS_INVAL;
-               goto end;
-       }
-end:
-       return ret;
-}
-
-enum bt_notification_iterator_status bt_notification_iterator_set_get_cb(
-               struct bt_notification_iterator *iterator,
-               bt_notification_iterator_get_cb get)
-{
-       enum bt_notification_iterator_status ret =
-                       BT_NOTIFICATION_ITERATOR_STATUS_OK;
-
-       if (!iterator || !get) {
-               ret = BT_NOTIFICATION_ITERATOR_STATUS_INVAL;
-               goto end;
-       }
-
-       iterator->get = get;
-end:
-       return ret;
-}
-
-enum bt_notification_iterator_status
-bt_notification_iterator_set_next_cb(struct bt_notification_iterator *iterator,
-               bt_notification_iterator_next_cb next)
-{
-       enum bt_notification_iterator_status ret =
-                       BT_NOTIFICATION_ITERATOR_STATUS_OK;
-
-       if (!iterator || !next) {
-               ret = BT_NOTIFICATION_ITERATOR_STATUS_INVAL;
-               goto end;
-       }
-
-       iterator->next = next;
-end:
-       return ret;
-}
-
-enum bt_notification_iterator_status
-bt_notification_iterator_set_seek_time_cb(
-               struct bt_notification_iterator *iterator,
-               bt_notification_iterator_seek_time_cb seek_time)
-{
-       enum bt_notification_iterator_status ret =
-                       BT_NOTIFICATION_ITERATOR_STATUS_OK;
-
-       if (!iterator || !seek_time) {
-               ret = BT_NOTIFICATION_ITERATOR_STATUS_INVAL;
-               goto end;
-       }
-
-       iterator->seek_time = seek_time;
-end:
-       return ret;
-}
-
-enum bt_notification_iterator_status
-bt_notification_iterator_set_destroy_cb(
-               struct bt_notification_iterator *iterator,
-               bt_notification_iterator_destroy_cb destroy)
-{
-       enum bt_notification_iterator_status ret =
-                       BT_NOTIFICATION_ITERATOR_STATUS_OK;
-
-       if (!iterator || !destroy) {
-               ret = BT_NOTIFICATION_ITERATOR_STATUS_INVAL;
-               goto end;
-       }
-
-       iterator->user_destroy = destroy;
-end:
-       return ret;
-}
-
-void *bt_notification_iterator_get_private_data(
-               struct bt_notification_iterator *iterator)
-{
-       return iterator ? iterator->user_data : NULL;
-}
-
-enum bt_notification_iterator_status
-bt_notification_iterator_set_private_data(
-               struct bt_notification_iterator *iterator, void *data)
-{
-       enum bt_notification_iterator_status ret =
-                       BT_NOTIFICATION_ITERATOR_STATUS_OK;
-
-       if (!iterator || !data) {
-               ret = BT_NOTIFICATION_ITERATOR_STATUS_INVAL;
-               goto end;
-       }
-
-       iterator->user_data = data;
-end:
-       return ret;
-}
-
-struct bt_notification *bt_notification_iterator_get_notification(
-               struct bt_notification_iterator *iterator)
-{
-       assert(iterator);
-       assert(iterator->get);
-       return iterator->get(iterator);
-}
-
-enum bt_notification_iterator_status
-bt_notification_iterator_next(struct bt_notification_iterator *iterator)
-{
-       assert(iterator);
-       assert(iterator->next);
-       return iterator->next(iterator);
-}
-
-struct bt_component *bt_notification_iterator_get_component(
-               struct bt_notification_iterator *iterator)
-{
-       return bt_get(iterator->component);
-}
-
-enum bt_notification_iterator_status bt_notification_iterator_seek_time(
-               struct bt_notification_iterator *iterator,
-               enum bt_notification_iterator_seek_origin seek_origin,
-               int64_t time)
-{
-       enum bt_notification_iterator_status ret =
-                       BT_NOTIFICATION_ITERATOR_STATUS_UNSUPPORTED;
-       return ret;
-}

diff --git a/lib/plugin-system/notification/Makefile.am b/lib/plugin-system/notification/Makefile.am
deleted file mode 100644 (file)
index dca588e..0000000
--- a/lib/plugin-system/notification/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
-
-noinst_LTLIBRARIES = libplugin-system-notification.la
-
-# Plug-in system library
-libplugin_system_notification_la_SOURCES = \
-       notification.c \
-       packet.c \
-       event.c \
-       stream.c \
-       heap.c

diff --git a/lib/plugin-system/notification/event.c b/lib/plugin-system/notification/event.c
deleted file mode 100644 (file)
index eb57090..0000000
--- a/lib/plugin-system/notification/event.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Babeltrace Plug-in Event Notification
- *
- * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/compiler.h>
-#include <babeltrace/plugin/notification/event-internal.h>
-
-static
-void bt_notification_event_destroy(struct bt_object *obj)
-{
-       struct bt_notification_event *notification =
-                       (struct bt_notification_event *) obj;
-
-       BT_PUT(notification->event);
-       g_free(notification);
-}
-
-struct bt_notification *bt_notification_event_create(struct bt_ctf_event *event)
-{
-       struct bt_notification_event *notification;
-
-       if (!event) {
-               goto error;
-       }
-
-       // FIXME - Validate that the event is associated to a packet
-       //         and freeze the event.
-       notification = g_new0(struct bt_notification_event, 1);
-       if (!notification) {
-               goto error;
-       }
-       bt_notification_init(&notification->parent,
-                       BT_NOTIFICATION_TYPE_EVENT,
-                       bt_notification_event_destroy);
-       notification->event = bt_get(event);
-       return &notification->parent;
-error:
-       return NULL;
-}
-
-struct bt_ctf_event *bt_notification_event_get_event(
-               struct bt_notification *notification)
-{
-       struct bt_ctf_event *event = NULL;
-       struct bt_notification_event *event_notification;
-
-       if (bt_notification_get_type(notification) !=
-                       BT_NOTIFICATION_TYPE_EVENT) {
-               goto end;
-       }
-       event_notification = container_of(notification,
-                       struct bt_notification_event, parent);
-       event = bt_get(event_notification->event);
-end:
-       return event;
-}

diff --git a/lib/plugin-system/notification/heap.c b/lib/plugin-system/notification/heap.c
deleted file mode 100644 (file)
index c1226c9..0000000
--- a/lib/plugin-system/notification/heap.c
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * Babeltrace - CTF notification priority heap
- *
- * Static-sized priority heap containing pointers. Based on CLRS,
- * chapter 6.
- *
- * Copyright (c) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- * Copyright (c) 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <assert.h>
-#include <stddef.h>
-#include <babeltrace/compiler.h>
-#include <babeltrace/plugin/notification/heap-internal.h>
-
-#ifdef DEBUG_HEAP
-static
-void check_heap(struct bt_notification_heap *heap)
-{
-       size_t i;
-
-       if (!heap->count) {
-               return;
-       }
-
-       for (i = 1; i < heap->count; i++) {
-               assert(!heap->compare(g_ptr_array_index(heap->ptrs, i),
-                               g_ptr_array_index(heap->ptrs, 0),
-                               heap->compare_data));
-       }
-}
-#else
-void check_heap(struct bt_notification_heap *heap)
-{
-}
-#endif
-
-static
-size_t parent(size_t i)
-{
-       return (i - 1) >> 1;
-}
-
-static
-size_t left(size_t i)
-{
-       return (i << 1) + 1;
-}
-
-static
-size_t right(size_t i)
-{
-       return (i << 1) + 2;
-}
-
-/*
- * Copy of heap->ptrs pointer is invalid after heap_grow.
- */
-static
-int heap_grow(struct bt_notification_heap *heap, size_t new_len)
-{
-       size_t alloc_len;
-
-       if (likely(heap->ptrs->len >= new_len)) {
-               goto end;
-       }
-
-        alloc_len = max_t(size_t, new_len, heap->ptrs->len << 1);
-       g_ptr_array_set_size(heap->ptrs, alloc_len);
-end:
-       return 0;
-}
-
-static
-int heap_set_count(struct bt_notification_heap *heap, size_t new_count)
-{
-       int ret = 0;
-
-       ret = heap_grow(heap, new_count);
-       if (unlikely(ret)) {
-               goto end;
-       }
-       heap->count = new_count;
-end:
-       return ret;
-}
-
-static
-void heapify(struct bt_notification_heap *heap, size_t i)
-{
-       struct bt_notification **ptrs =
-                       (struct bt_notification **) heap->ptrs->pdata;
-
-       for (;;) {
-               void *tmp;
-               size_t l, r, largest;
-
-               l = left(i);
-               r = right(i);
-               if (l < heap->count && heap->compare(ptrs[l], ptrs[i],
-                               heap->compare_data)) {
-                       largest = l;
-               } else {
-                       largest = i;
-               }
-               if (r < heap->count && heap->compare(ptrs[r], ptrs[largest],
-                               heap->compare_data)) {
-                       largest = r;
-               }
-               if (unlikely(largest == i)) {
-                       break;
-               }
-               tmp = ptrs[i];
-               ptrs[i] = ptrs[largest];
-               ptrs[largest] = tmp;
-               i = largest;
-       }
-       check_heap(heap);
-}
-
-static
-struct bt_notification *heap_replace_max(struct bt_notification_heap *heap,
-               struct bt_notification *notification)
-{
-       struct bt_notification *res = NULL;
-
-       if (unlikely(!heap->count)) {
-               (void) heap_set_count(heap, 1);
-               g_ptr_array_index(heap->ptrs, 0) = notification;
-               check_heap(heap);
-               goto end;
-       }
-
-       /* Replace the current max and heapify. */
-       res = g_ptr_array_index(heap->ptrs, 0);
-       g_ptr_array_index(heap->ptrs, 0) = notification;
-       heapify(heap, 0);
-end:
-       return res;
-}
-
-static
-void bt_notification_heap_destroy(struct bt_object *obj)
-{
-       struct bt_notification_heap *heap = container_of(obj,
-                       struct bt_notification_heap, base);
-
-       if (heap->ptrs) {
-               size_t i;
-
-               for (i = 0; i < heap->count; i++) {
-                       bt_put(g_ptr_array_index(heap->ptrs, i));
-               }
-               g_ptr_array_free(heap->ptrs, TRUE);
-       }
-       g_free(heap);
-}
-
-struct bt_notification_heap *bt_notification_heap_create(
-               bt_notification_time_compare_func comparator, void *user_data)
-{
-       struct bt_notification_heap *heap = NULL;
-
-       if (!comparator) {
-               goto end;
-       }
-
-       heap = g_new0(struct bt_notification_heap, 1);
-       if (!heap) {
-               goto end;
-       }
-
-       bt_object_init(&heap->base, bt_notification_heap_destroy);
-       heap->ptrs = g_ptr_array_new();
-       if (!heap->ptrs) {
-               BT_PUT(heap);
-               goto end;
-       }
-
-       heap->compare = comparator;
-       heap->compare_data = user_data;
-end:
-       return heap;
-}
-
-struct bt_notification *bt_notification_heap_peek(
-               struct bt_notification_heap *heap)
-{
-       check_heap(heap);
-       return bt_get(likely(heap->count) ?
-                       g_ptr_array_index(heap->ptrs, 0) : NULL);
-}
-
-int bt_notification_heap_insert(struct bt_notification_heap *heap,
-               struct bt_notification *notification)
-{
-       int ret;
-       size_t pos;
-        struct bt_notification **ptrs;
-
-       ret = heap_set_count(heap, heap->count + 1);
-       if (unlikely(ret)) {
-               goto end;
-       }
-
-       ptrs = (struct bt_notification **) heap->ptrs->pdata;
-       pos = heap->count - 1;
-       while (pos > 0 && heap->compare(notification, ptrs[parent(pos)],
-                       heap->compare_data)) {
-               /* Move parent down until we find the right spot. */
-               ptrs[pos] = ptrs[parent(pos)];
-               pos = parent(pos);
-       }
-       ptrs[pos] = bt_get(notification);
-       check_heap(heap);
-end:
-       return ret;
-}
-
-struct bt_notification *bt_notification_heap_pop(
-               struct bt_notification_heap *heap)
-{
-        struct bt_notification *ret = NULL;
-
-       switch (heap->count) {
-       case 0:
-               goto end;
-       case 1:
-               (void) heap_set_count(heap, 0);
-               ret = g_ptr_array_index(heap->ptrs, 0);
-               goto end;
-       }
-       /*
-        * Shrink, replace the current max by previous last entry and heapify.
-        */
-       heap_set_count(heap, heap->count - 1);
-       /* count changed. previous last entry is at heap->count. */
-       ret = heap_replace_max(heap, g_ptr_array_index(heap->ptrs,
-                       heap->count));
-end:
-       /*
-        * Not taking a supplementary reference since we are relinquishing our
-        * own to the caller.
-        */
-       return ret;
-}

diff --git a/lib/plugin-system/notification/notification.c b/lib/plugin-system/notification/notification.c
deleted file mode 100644 (file)
index 139caed..0000000
--- a/lib/plugin-system/notification/notification.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Babeltrace Plug-in Notification
- *
- * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/plugin/notification/notification-internal.h>
-
-BT_HIDDEN
-void bt_notification_init(struct bt_notification *notification,
-               enum bt_notification_type type,
-               bt_object_release_func release)
-{
-       assert(type > BT_NOTIFICATION_TYPE_ALL &&
-                       type < BT_NOTIFICATION_TYPE_NR);
-       notification->type = type;
-       bt_object_init(&notification->base, release);
-}
-
-enum bt_notification_type bt_notification_get_type(
-               struct bt_notification *notification)
-{
-       return notification ? notification->type : BT_NOTIFICATION_TYPE_UNKNOWN;
-}
-
-struct bt_ctf_stream *bt_notification_get_stream(
-               struct bt_notification *notification)
-{
-       struct bt_ctf_stream *stream = NULL;
-
-       if (!notification || !notification->get_stream) {
-               goto end;
-       }
-
-       stream = notification->get_stream(notification);
-end:
-       return stream;
-}

diff --git a/lib/plugin-system/notification/packet.c b/lib/plugin-system/notification/packet.c
deleted file mode 100644 (file)
index a57310f..0000000
--- a/lib/plugin-system/notification/packet.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Babeltrace Plug-in Packet-related Notifications
- *
- * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/compiler.h>
-#include <babeltrace/plugin/notification/packet-internal.h>
-
-static
-void bt_notification_packet_begin_destroy(struct bt_object *obj)
-{
-       struct bt_notification_packet_begin *notification =
-                       (struct bt_notification_packet_begin *) obj;
-
-       BT_PUT(notification->packet);
-       g_free(notification);
-}
-
-static
-void bt_notification_packet_end_destroy(struct bt_object *obj)
-{
-       struct bt_notification_packet_end *notification =
-                       (struct bt_notification_packet_end *) obj;
-
-       BT_PUT(notification->packet);
-       g_free(notification);
-}
-
-struct bt_notification *bt_notification_packet_begin_create(
-               struct bt_ctf_packet *packet)
-{
-       struct bt_notification_packet_begin *notification;
-
-       if (!packet) {
-               goto error;
-       }
-
-       notification = g_new0(struct bt_notification_packet_begin, 1);
-       bt_notification_init(&notification->parent,
-                       BT_NOTIFICATION_TYPE_PACKET_BEGIN,
-                       bt_notification_packet_begin_destroy);
-       notification->packet = bt_get(packet);
-       return &notification->parent;
-error:
-       return NULL;
-}
-
-struct bt_ctf_packet *bt_notification_packet_begin_get_packet(
-               struct bt_notification *notification)
-{
-       struct bt_ctf_packet *ret = NULL;
-       struct bt_notification_packet_begin *packet_begin;
-
-       if (notification->type != BT_NOTIFICATION_TYPE_PACKET_BEGIN) {
-               goto end;
-       }
-
-       packet_begin = container_of(notification,
-                       struct bt_notification_packet_begin, parent);
-       ret = bt_get(packet_begin->packet);
-end:
-       return ret;
-}
-
-struct bt_notification *bt_notification_packet_end_create(
-               struct bt_ctf_packet *packet)
-{
-       struct bt_notification_packet_end *notification;
-
-       if (!packet) {
-               goto error;
-       }
-
-       notification = g_new0(struct bt_notification_packet_end, 1);
-       bt_notification_init(&notification->parent,
-                       BT_NOTIFICATION_TYPE_PACKET_END,
-                       bt_notification_packet_end_destroy);
-       notification->packet = bt_get(packet);
-       return &notification->parent;
-error:
-       return NULL;
-}
-
-struct bt_ctf_packet *bt_notification_packet_end_get_packet(
-               struct bt_notification *notification)
-{
-       struct bt_ctf_packet *ret = NULL;
-       struct bt_notification_packet_end *packet_end;
-
-       if (notification->type != BT_NOTIFICATION_TYPE_PACKET_END) {
-               goto end;
-       }
-
-       packet_end = container_of(notification,
-                       struct bt_notification_packet_end, parent);
-       ret = bt_get(packet_end->packet);
-end:
-       return ret;
-}

diff --git a/lib/plugin-system/notification/stream.c b/lib/plugin-system/notification/stream.c
deleted file mode 100644 (file)
index bc0b1b7..0000000
--- a/lib/plugin-system/notification/stream.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Babeltrace Plug-in Stream-related Notifications
- *
- * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/compiler.h>
-#include <babeltrace/plugin/notification/stream-internal.h>
-
-static
-void bt_notification_stream_end_destroy(struct bt_object *obj)
-{
-       struct bt_notification_stream_end *notification =
-                       (struct bt_notification_stream_end *) obj;
-
-       BT_PUT(notification->stream);
-       g_free(notification);
-}
-
-struct bt_notification *bt_notification_stream_end_create(
-               struct bt_ctf_stream *stream)
-{
-       struct bt_notification_stream_end *notification;
-
-       if (!stream) {
-               goto error;
-       }
-
-       notification = g_new0(struct bt_notification_stream_end, 1);
-       bt_notification_init(&notification->parent,
-                       BT_NOTIFICATION_TYPE_STREAM_END,
-                       bt_notification_stream_end_destroy);
-       notification->stream = bt_get(stream);
-       return &notification->parent;
-error:
-       return NULL;
-}
-
-struct bt_ctf_packet *bt_notification_stream_end_get_stream(
-               struct bt_notification *notification)
-{
-       struct bt_notification_stream_end *stream_end;
-
-       stream_end = container_of(notification,
-                       struct bt_notification_stream_end, parent);
-       return bt_get(stream_end->stream);
-}

diff --git a/lib/plugin-system/plugin.c b/lib/plugin-system/plugin.c
deleted file mode 100644 (file)
index 295140c..0000000
--- a/lib/plugin-system/plugin.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * plugin.c
- *
- * Babeltrace Plugin
- * 
- * Copyright 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/compiler.h>
-#include <babeltrace/ref.h>
-#include <babeltrace/plugin/plugin-internal.h>
-#include <babeltrace/plugin/component-factory-internal.h>
-#include <glib.h>
-
-#define PLUGIN_SYMBOL_NAME             "__bt_plugin_name"
-#define PLUGIN_SYMBOL_AUTHOR           "__bt_plugin_author"
-#define PLUGIN_SYMBOL_LICENSE          "__bt_plugin_license"
-#define PLUGIN_SYMBOL_REGISTER         "__bt_plugin_register"
-#define PLUGIN_SYMBOL_DESCRIPTION      "__bt_plugin_description"
-
-DECLARE_PLUG_IN_SECTIONS;
-
-static
-void bt_plugin_destroy(struct bt_object *obj)
-{
-       struct bt_plugin *plugin;
-
-       assert(obj);
-       plugin = container_of(obj, struct bt_plugin, base);
-
-       if (plugin->module) {
-               if (!g_module_close(plugin->module)) {
-                       printf_error("Module close error: %s\n",
-                                       g_module_error());
-               }
-       }
-
-       if (plugin->path) {
-               g_string_free(plugin->path, TRUE);
-       }
-       g_free(plugin);
-}
-
-BT_HIDDEN
-struct bt_plugin *bt_plugin_create_from_module(GModule *module,
-               const char *path)
-{
-       struct bt_plugin *plugin = NULL;
-       gpointer symbol = NULL;
-
-       if (!module || !path) {
-               goto error;
-       }
-
-       plugin = g_new0(struct bt_plugin, 1);
-       if (!plugin) {
-               goto error;
-       }
-
-       bt_object_init(plugin, bt_plugin_destroy);
-       plugin->path = g_string_new(path);
-       if (!plugin->path) {
-               goto error;
-       }
-
-       if (!g_module_symbol(module, PLUGIN_SYMBOL_NAME,
-                       (gpointer *) &plugin->name)) {
-               printf_verbose("Unable to resolve plugin symbol %s from %s\n",
-                               PLUGIN_SYMBOL_NAME, g_module_name(module));
-               goto error;
-       }
-
-       if (!g_module_symbol(module, PLUGIN_SYMBOL_LICENSE,
-                       (gpointer *) &plugin->license)) {
-               printf_verbose("Unable to resolve plugin symbol %s from %s\n",
-                               PLUGIN_SYMBOL_LICENSE, g_module_name(module));
-               goto error;
-       }
-       if (!g_module_symbol(module, PLUGIN_SYMBOL_AUTHOR,
-                       (gpointer *) &plugin->author)) {
-               printf_verbose("Unable to resolve plugin symbol %s from %s\n",
-                               PLUGIN_SYMBOL_AUTHOR, g_module_name(module));
-               goto error;
-       }
-       if (!g_module_symbol(module, PLUGIN_SYMBOL_DESCRIPTION,
-                       (gpointer *) &plugin->description)) {
-               printf_verbose("Unable to resolve plugin symbol %s from %s\n",
-                               PLUGIN_SYMBOL_DESCRIPTION,
-                               g_module_name(module));
-               goto error;
-       }
-       if (!g_module_symbol(module, PLUGIN_SYMBOL_REGISTER, &symbol)) {
-               printf_verbose("Unable to resolve plugin symbol %s from %s\n",
-                               PLUGIN_SYMBOL_REGISTER, g_module_name(module));
-               goto error;
-       } else {
-               plugin->_register = *((bt_plugin_register_func *) symbol);
-               if (!plugin->_register) {
-                       printf_verbose("NULL %s symbol target\n",
-                                       PLUGIN_SYMBOL_REGISTER);
-                       goto error;
-               }
-       }
-
-       return plugin;
-error:
-       BT_PUT(plugin);
-       return plugin;
-}
-
-BT_HIDDEN
-struct bt_plugin *bt_plugin_create_from_static(size_t i)
-{
-       struct bt_plugin *plugin = NULL;
-
-       plugin = g_new0(struct bt_plugin, 1);
-       if (!plugin) {
-               goto error;
-       }
-
-       bt_object_init(plugin, bt_plugin_destroy);
-       plugin->_register = (SECTION_BEGIN(__plugin_register_funcs))[i];
-       if (!plugin->_register) {
-               goto error;
-       }
-       plugin->name = (SECTION_BEGIN(__plugin_names))[i];
-       plugin->author = (SECTION_BEGIN(__plugin_authors))[i];
-       plugin->license = (SECTION_BEGIN(__plugin_licenses))[i];
-       plugin->description = (SECTION_BEGIN(__plugin_descriptions))[i];
-       return plugin;
-error:
-       BT_PUT(plugin);
-       return plugin;
-}
-
-BT_HIDDEN
-enum bt_component_status bt_plugin_register_component_classes(
-               struct bt_plugin *plugin, struct bt_component_factory *factory)
-{
-       assert(plugin && factory);
-       return plugin->_register(factory);
-}
-
-const char *bt_plugin_get_name(struct bt_plugin *plugin)
-{
-       return plugin ? plugin->name : NULL;
-}
-
-const char *bt_plugin_get_author(struct bt_plugin *plugin)
-{
-       return plugin ? plugin->author : NULL;
-}
-
-const char *bt_plugin_get_license(struct bt_plugin *plugin)
-{
-       return plugin ? plugin->license : NULL;
-}
-
-const char *bt_plugin_get_path(struct bt_plugin *plugin)
-{
-       return (plugin && plugin->path) ? plugin->path->str : NULL;
-}
-
-const char *bt_plugin_get_description(struct bt_plugin *plugin)
-{
-       return plugin ? plugin->description : NULL;
-}

diff --git a/lib/plugin-system/sink.c b/lib/plugin-system/sink.c
deleted file mode 100644 (file)
index f49f93c..0000000
--- a/lib/plugin-system/sink.c
+++ /dev/null
@@ -1,389 +0,0 @@
-/*
- * sink.c
- *
- * Babeltrace Sink Component
- *
- * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/compiler.h>
-#include <babeltrace/values.h>
-#include <babeltrace/plugin/sink-internal.h>
-#include <babeltrace/plugin/component-internal.h>
-#include <babeltrace/plugin/notification/notification.h>
-
-BT_HIDDEN
-enum bt_component_status bt_component_sink_validate(
-               struct bt_component *component)
-{
-       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-       struct bt_component_sink *sink;
-
-       if (!component) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       if (!component->class) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       if (component->class->type != BT_COMPONENT_TYPE_SINK) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       sink = container_of(component, struct bt_component_sink, parent);
-       if (!sink->consume) {
-               printf_error("Invalid sink component; no notification consumption callback defined.");
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       ret = component_input_validate(&sink->input);
-       if (ret) {
-               goto end;
-       }
-end:
-       return ret;
-}
-
-static
-void bt_component_sink_destroy(struct bt_component *component)
-{
-       struct bt_component_sink *sink = container_of(component,
-                       struct bt_component_sink, parent);
-
-       component_input_fini(&sink->input);
-}
-
-BT_HIDDEN
-struct bt_component *bt_component_sink_create(
-               struct bt_component_class *class, struct bt_value *params)
-{
-       struct bt_component_sink *sink = NULL;
-       enum bt_component_status ret;
-
-       sink = g_new0(struct bt_component_sink, 1);
-       if (!sink) {
-               goto end;
-       }
-
-       sink->parent.class = bt_get(class);
-       ret = bt_component_init(&sink->parent, bt_component_sink_destroy);
-       if (ret != BT_COMPONENT_STATUS_OK) {
-               goto error;
-       }
-
-/*
-       ret = bt_component_sink_register_notification_type(&sink->parent,
-               BT_NOTIFICATION_TYPE_EVENT);
-       if (ret != BT_COMPONENT_STATUS_OK) {
-               goto error;
-       }
-*/
-       if (component_input_init(&sink->input)) {
-               goto error;
-       }
-end:
-       return sink ? &sink->parent : NULL;
-error:
-       BT_PUT(sink);
-       return NULL;
-}
-
-static
-enum bt_component_status validate_inputs(struct bt_component_sink *sink)
-{
-       size_t array_size = sink->input.iterators->len;
-
-       if (array_size < sink->input.min_count ||
-                       array_size > sink->input.max_count) {
-               return BT_COMPONENT_STATUS_INVALID;
-       }
-
-       return BT_COMPONENT_STATUS_OK;
-}
-
-enum bt_component_status bt_component_sink_consume(
-               struct bt_component *component)
-{
-       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-       struct bt_component_sink *sink = NULL;
-
-       if (!component) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_SINK) {
-               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
-               goto end;
-       }
-
-       sink = container_of(component, struct bt_component_sink, parent);
-       if (!sink->input.validated) {
-               ret = validate_inputs(sink);
-               if (ret != BT_COMPONENT_STATUS_OK) {
-                       goto end;
-               }
-               sink->input.validated = true;
-       }
-
-       assert(sink->consume);
-       ret = sink->consume(component);
-end:
-       return ret;
-}
-/*
-static
-enum bt_component_status bt_component_sink_register_notification_type(
-               struct bt_component *component, enum bt_notification_type type)
-{
-       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-       struct bt_component_sink *sink = NULL;
-
-       if (!component) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_SINK) {
-               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
-               goto end;
-       }
-
-       if (type <= BT_NOTIFICATION_TYPE_UNKNOWN ||
-               type >= BT_NOTIFICATION_TYPE_NR) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-       sink = container_of(component, struct bt_component_sink, parent);
-       if (type == BT_NOTIFICATION_TYPE_ALL) {
-               sink->registered_notifications_mask = ~(notification_mask_t) 0;
-       } else {
-               sink->registered_notifications_mask |=
-                       (notification_mask_t) 1 << type;
-       }
-end:
-       return ret;
-}
-*/
-enum bt_component_status bt_component_sink_set_consume_cb(
-               struct bt_component *component,
-               bt_component_sink_consume_cb consume)
-{
-       struct bt_component_sink *sink;
-       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-
-       if (!component) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_SINK) {
-               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
-               goto end;
-       }
-
-       if (!component->initializing) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       sink = container_of(component, struct bt_component_sink, parent);
-       sink->consume = consume;
-end:
-       return ret;
-}
-
-enum bt_component_status bt_component_sink_set_add_iterator_cb(
-               struct bt_component *component,
-               bt_component_sink_add_iterator_cb add_iterator)
-{
-       struct bt_component_sink *sink;
-       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-
-       if (!component) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_SINK) {
-               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
-               goto end;
-       }
-
-       if (!component->initializing) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       sink = container_of(component, struct bt_component_sink, parent);
-       sink->add_iterator = add_iterator;
-end:
-       return ret;
-}
-
-enum bt_component_status bt_component_sink_set_minimum_input_count(
-               struct bt_component *component,
-               unsigned int minimum)
-{
-       struct bt_component_sink *sink;
-       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-
-       if (!component) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_SINK) {
-               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
-               goto end;
-       }
-
-       if (!component->initializing) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       sink = container_of(component, struct bt_component_sink, parent);
-       sink->input.min_count = minimum;
-end:
-       return ret;
-}
-
-enum bt_component_status bt_component_sink_set_maximum_input_count(
-               struct bt_component *component,
-               unsigned int maximum)
-{
-       struct bt_component_sink *sink;
-       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-
-       if (!component) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_SINK) {
-               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
-               goto end;
-       }
-
-       if (!component->initializing) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       sink = container_of(component, struct bt_component_sink, parent);
-       sink->input.max_count = maximum;
-end:
-       return ret;
-}
-
-enum bt_component_status
-bt_component_sink_get_input_count(struct bt_component *component,
-               unsigned int *count)
-{
-       struct bt_component_sink *sink;
-       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-
-       if (!component || !count) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_SINK) {
-               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
-               goto end;
-       }
-
-       sink = container_of(component, struct bt_component_sink, parent);
-       *count = (unsigned int) sink->input.iterators->len;
-end:
-       return ret;
-}
-
-enum bt_component_status
-bt_component_sink_get_input_iterator(struct bt_component *component,
-               unsigned int input, struct bt_notification_iterator **iterator)
-{
-       struct bt_component_sink *sink;
-       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-
-       if (!component || !iterator) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_SINK) {
-               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
-               goto end;
-       }
-
-       sink = container_of(component, struct bt_component_sink, parent);
-       if (input >= (unsigned int) sink->input.iterators->len) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       *iterator = bt_get(g_ptr_array_index(sink->input.iterators, input));
-end:
-       return ret;
-}
-
-enum bt_component_status
-bt_component_sink_add_iterator(struct bt_component *component,
-               struct bt_notification_iterator *iterator)
-{
-       struct bt_component_sink *sink;
-       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-
-       if (!component || !iterator) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       if (bt_component_get_type(component) != BT_COMPONENT_TYPE_SINK) {
-               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
-               goto end;
-       }
-
-       sink = container_of(component, struct bt_component_sink, parent);
-       if (sink->input.iterators->len == sink->input.max_count) {
-               ret = BT_COMPONENT_STATUS_UNSUPPORTED;
-               goto end;
-       }
-
-       if (sink->add_iterator) {
-               ret = sink->add_iterator(component, iterator);
-               if (ret != BT_COMPONENT_STATUS_OK) {
-                       goto end;
-               }
-       }
-
-       g_ptr_array_add(sink->input.iterators, bt_get(iterator));
-end:
-       return ret;
-}

diff --git a/lib/plugin-system/source.c b/lib/plugin-system/source.c
deleted file mode 100644 (file)
index 7a19bc5..0000000
--- a/lib/plugin-system/source.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * source.c
- *
- * Babeltrace Source Component
- *
- * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <babeltrace/ref.h>
-#include <babeltrace/compiler.h>
-#include <babeltrace/plugin/source-internal.h>
-#include <babeltrace/plugin/component-internal.h>
-#include <babeltrace/plugin/notification/iterator.h>
-#include <babeltrace/plugin/notification/iterator-internal.h>
-
-BT_HIDDEN
-enum bt_component_status bt_component_source_validate(
-               struct bt_component *component)
-{
-       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-       struct bt_component_source *source;
-
-       if (!component) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       if (!component->class) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       if (component->class->type != BT_COMPONENT_TYPE_SOURCE) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       source = container_of(component, struct bt_component_source, parent);
-       if (!source->init_iterator) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-end:
-       return ret;
-}
-
-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->parent.class = bt_get(class);
-       ret = bt_component_init(&source->parent, NULL);
-       if (ret != BT_COMPONENT_STATUS_OK) {
-               BT_PUT(source);
-               goto end;
-       }
-end:
-       return source ? &source->parent : NULL;
-}
-
-enum bt_component_status
-bt_component_source_set_iterator_init_cb(struct bt_component *component,
-               bt_component_source_init_iterator_cb init_iterator)
-{
-       struct bt_component_source *source;
-       enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-
-       if (component->class->type != BT_COMPONENT_TYPE_SOURCE ||
-                       !component->initializing) {
-               ret = BT_COMPONENT_STATUS_INVALID;
-               goto end;
-       }
-
-       source = container_of(component, struct bt_component_source, parent);
-       source->init_iterator = init_iterator;
-end:
-       return ret;
-}
-
-struct bt_notification_iterator *bt_component_source_create_iterator(
-               struct bt_component *component)
-{
-       return bt_component_create_iterator(component);
-}

diff --git a/lib/plugin/Makefile.am b/lib/plugin/Makefile.am
new file mode 100644 (file)
index 0000000..6a5e4a1
--- /dev/null
+++ b/lib/plugin/Makefile.am
@@ -0,0 +1,7 @@
+AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
+
+noinst_LTLIBRARIES = libplugin.la
+
+# Plug-in system library
+libplugin_la_SOURCES = \
+       plugin.c

diff --git a/lib/plugin/plugin.c b/lib/plugin/plugin.c
new file mode 100644 (file)
index 0000000..e1e0387
--- /dev/null
+++ b/lib/plugin/plugin.c
@@ -0,0 +1,807 @@
+/*
+ * plugin.c
+ *
+ * Babeltrace Plugin
+ *
+ * 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>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <babeltrace/compiler.h>
+#include <babeltrace/ref.h>
+#include <babeltrace/plugin/plugin-dev.h>
+#include <babeltrace/plugin/plugin-internal.h>
+#include <babeltrace/component/component-class-internal.h>
+#include <string.h>
+#include <stdbool.h>
+#include <glib.h>
+#include <gmodule.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <dirent.h>
+
+#define PLUGIN_SYMBOL_NAME             "__bt_plugin_name"
+#define PLUGIN_SYMBOL_AUTHOR           "__bt_plugin_author"
+#define PLUGIN_SYMBOL_LICENSE          "__bt_plugin_license"
+#define PLUGIN_SYMBOL_INIT             "__bt_plugin_init"
+#define PLUGIN_SYMBOL_EXIT             "__bt_plugin_exit"
+#define PLUGIN_SYMBOL_DESCRIPTION      "__bt_plugin_description"
+#define NATIVE_PLUGIN_SUFFIX           ".so"
+#define NATIVE_PLUGIN_SUFFIX_LEN       sizeof(NATIVE_PLUGIN_SUFFIX)
+#define LIBTOOL_PLUGIN_SUFFIX          ".la"
+#define LIBTOOL_PLUGIN_SUFFIX_LEN      sizeof(LIBTOOL_PLUGIN_SUFFIX)
+
+#define PLUGIN_SUFFIX_LEN      max_t(size_t, sizeof(NATIVE_PLUGIN_SUFFIX), \
+                                       sizeof(LIBTOOL_PLUGIN_SUFFIX))
+
+#define SECTION_BEGIN(_name)           &__start_##_name
+#define SECTION_END(_name)             &__stop_##_name
+#define SECTION_ELEMENT_COUNT(_name) (SECTION_END(_name) - SECTION_BEGIN(_name))
+
+#define DECLARE_SECTION(_type, _name)                          \
+       extern _type const __start_##_name __attribute((weak)); \
+       extern _type const __stop_##_name __attribute((weak))
+
+DECLARE_SECTION(bt_plugin_init_func, __bt_plugin_init_funcs);
+DECLARE_SECTION(bt_plugin_exit_func, __bt_plugin_exit_funcs);
+DECLARE_SECTION(const char *, __bt_plugin_names);
+DECLARE_SECTION(const char *, __bt_plugin_authors);
+DECLARE_SECTION(const char *, __bt_plugin_licenses);
+DECLARE_SECTION(const char *, __bt_plugin_descriptions);
+
+#define PRINT_SECTION(_printer, _name)                                         \
+       do {                                                                    \
+               _printer("Section " #_name " [%p - %p], (%zu elements)\n",      \
+                       SECTION_BEGIN(_name), SECTION_END(_name),               \
+                       SECTION_ELEMENT_COUNT(_name));                          \
+       } while (0)
+
+#define PRINT_PLUG_IN_SECTIONS(_printer)                               \
+       do {                                                            \
+               PRINT_SECTION(_printer, __bt_plugin_init_funcs);        \
+               PRINT_SECTION(_printer, __bt_plugin_exit_funcs);        \
+               PRINT_SECTION(_printer, __bt_plugin_names);             \
+               PRINT_SECTION(_printer, __bt_plugin_authors);           \
+               PRINT_SECTION(_printer, __bt_plugin_licenses);          \
+               PRINT_SECTION(_printer, __bt_plugin_descriptions);      \
+       } while (0)
+
+/*
+ * This hash table, global to the library, maps component class pointers
+ * to shared library handles.
+ *
+ * The keys (component classes) are NOT owned by this hash table, whereas
+ * the values (shared library handles) are owned by this hash table.
+ *
+ * The keys are the component classes created with
+ * bt_plugin_add_component_class(). They keep the shared library handle
+ * object created by their plugin alive so that the plugin's code is
+ * not discarded when it could still be in use by living components
+ * created from those component classes:
+ *
+ *     [component] --ref-> [component class] --through this HT-> [shlib handle]
+ *
+ * This hash table exists for two reasons:
+ *
+ * 1. To allow this application:
+ *
+ *        my_plugin = bt_plugin_create_from_file("/path/to/my-plugin.so");
+ *        // instantiate components from the plugin's component classes
+ *        BT_PUT(my_plugin);
+ *        // user code of instantiated components still exists
+ *
+ * 2. To decouple the plugin subsystem from the component subsystem:
+ *    while plugins objects need to know component class objects, the
+ *    opposite is not necessary, thus it makes no sense for a component
+ *    class to keep a reference to the plugin object from which it was
+ *    created.
+ *
+ * An entry is removed from this HT when a component class is destroyed
+ * thanks to a custom destroy listener. When the entry is removed, the
+ * GLib function calls the value destroy notifier of the HT, which is
+ * bt_put(). This decreases the reference count of the mapped shared
+ * library handle. Assuming the original plugin object which contained
+ * some component classes is put first, when the last component class is
+ * removed from this HT, the shared library handle object's reference
+ * count falls to zero and the shared library is finally closed.
+ */
+static
+GHashTable *comp_classes_to_shlib_handles;
+
+__attribute__((constructor)) static
+void init_comp_classes_to_shlib_handles(void) {
+       comp_classes_to_shlib_handles = g_hash_table_new_full(g_direct_hash,
+               g_direct_equal, NULL, bt_put);
+       assert(comp_classes_to_shlib_handles);
+}
+
+__attribute__((destructor)) static
+void fini_comp_classes_to_shlib_handles(void) {
+       if (comp_classes_to_shlib_handles) {
+               g_hash_table_destroy(comp_classes_to_shlib_handles);
+       }
+}
+
+static
+void bt_plugin_shared_lib_handle_destroy(struct bt_object *obj)
+{
+       struct bt_plugin_shared_lib_handle *shared_lib_handle;
+
+       assert(obj);
+       shared_lib_handle = container_of(obj,
+               struct bt_plugin_shared_lib_handle, base);
+
+       if (shared_lib_handle->init_called && shared_lib_handle->exit) {
+               enum bt_plugin_status status = shared_lib_handle->exit();
+
+               if (status < 0) {
+                       printf_verbose("Plugin `%s` exited with error %d\n",
+                               shared_lib_handle->name, status);
+               }
+       }
+
+       if (shared_lib_handle->module) {
+               if (!g_module_close(shared_lib_handle->module)) {
+                       printf_error("Module close error: %s\n",
+                                       g_module_error());
+               }
+       }
+
+       if (shared_lib_handle->path) {
+               g_string_free(shared_lib_handle->path, TRUE);
+       }
+
+       g_free(shared_lib_handle);
+}
+
+static
+struct bt_plugin_shared_lib_handle *bt_plugin_shared_lib_handle_create(
+               const char *path)
+{
+       struct bt_plugin_shared_lib_handle *shared_lib_handle = NULL;
+       gpointer symbol = NULL;
+
+       shared_lib_handle = g_new0(struct bt_plugin_shared_lib_handle, 1);
+       if (!shared_lib_handle) {
+               goto error;
+       }
+
+       bt_object_init(shared_lib_handle, bt_plugin_shared_lib_handle_destroy);
+
+       if (!path) {
+               goto end;
+       }
+
+       shared_lib_handle->path = g_string_new(path);
+       if (!shared_lib_handle->path) {
+               goto error;
+       }
+
+       shared_lib_handle->module = g_module_open(path, 0);
+       if (!shared_lib_handle->module) {
+               printf_verbose("Module open error: %s\n", g_module_error());
+               goto error;
+       }
+
+       if (!g_module_symbol(shared_lib_handle->module, PLUGIN_SYMBOL_NAME,
+                       (gpointer *) &shared_lib_handle->name)) {
+               printf_verbose("Unable to resolve plugin symbol %s from %s\n",
+                       PLUGIN_SYMBOL_NAME,
+                       g_module_name(shared_lib_handle->module));
+               goto error;
+       }
+
+       if (!g_module_symbol(shared_lib_handle->module, PLUGIN_SYMBOL_LICENSE,
+                       (gpointer *) &shared_lib_handle->license)) {
+               printf_verbose("Unable to resolve plugin symbol %s from %s\n",
+                       PLUGIN_SYMBOL_LICENSE,
+                       g_module_name(shared_lib_handle->module));
+               goto error;
+       }
+
+       if (!g_module_symbol(shared_lib_handle->module, PLUGIN_SYMBOL_AUTHOR,
+                       (gpointer *) &shared_lib_handle->author)) {
+               printf_verbose("Unable to resolve plugin symbol %s from %s\n",
+                       PLUGIN_SYMBOL_AUTHOR,
+                       g_module_name(shared_lib_handle->module));
+               goto error;
+       }
+
+       if (!g_module_symbol(shared_lib_handle->module, PLUGIN_SYMBOL_DESCRIPTION,
+                       (gpointer *) &shared_lib_handle->description)) {
+               printf_verbose("Unable to resolve plugin symbol %s from %s\n",
+                       PLUGIN_SYMBOL_DESCRIPTION,
+                       g_module_name(shared_lib_handle->module));
+               goto error;
+       }
+
+       if (!g_module_symbol(shared_lib_handle->module, PLUGIN_SYMBOL_INIT,
+                       &symbol)) {
+               printf_verbose("Unable to resolve plugin symbol %s from %s\n",
+                       PLUGIN_SYMBOL_INIT,
+                       g_module_name(shared_lib_handle->module));
+               goto error;
+       } else {
+               shared_lib_handle->init = *((bt_plugin_init_func *) symbol);
+               if (!shared_lib_handle->init) {
+                       printf_verbose("NULL %s symbol target\n",
+                               PLUGIN_SYMBOL_INIT);
+                       goto error;
+               }
+       }
+
+       if (!g_module_symbol(shared_lib_handle->module, PLUGIN_SYMBOL_EXIT,
+                       &symbol)) {
+               printf_verbose("Unable to resolve plugin symbol %s from %s\n",
+                       PLUGIN_SYMBOL_EXIT,
+                       g_module_name(shared_lib_handle->module));
+               goto error;
+       } else {
+               shared_lib_handle->exit = *((bt_plugin_exit_func *) symbol);
+               if (!shared_lib_handle->exit) {
+                       printf_verbose("NULL %s symbol target\n",
+                               PLUGIN_SYMBOL_EXIT);
+                       goto error;
+               }
+       }
+
+       goto end;
+
+error:
+       BT_PUT(shared_lib_handle);
+
+end:
+       return shared_lib_handle;
+}
+
+static
+void bt_plugin_destroy(struct bt_object *obj)
+{
+       struct bt_plugin *plugin;
+
+       assert(obj);
+       plugin = container_of(obj, struct bt_plugin, base);
+
+       BT_PUT(plugin->shared_lib_handle);
+
+       if (plugin->comp_classes) {
+               g_ptr_array_free(plugin->comp_classes, TRUE);
+       }
+
+       g_free(plugin);
+}
+
+static
+enum bt_plugin_status init_plugin(struct bt_plugin *plugin)
+{
+       enum bt_plugin_status status = BT_PLUGIN_STATUS_OK;
+
+       if (plugin->shared_lib_handle->init) {
+               status = plugin->shared_lib_handle->init(plugin);
+
+               if (status < 0) {
+                       printf_verbose("Plugin `%s` initialization error: %d\n",
+                               plugin->shared_lib_handle->name, status);
+                       goto end;
+               }
+       }
+
+       plugin->shared_lib_handle->init_called = true;
+
+       /*
+        * The initialization function should have added the component
+        * classes at this point. We freeze the plugin so that it's not
+        * possible to add component classes to this plugin object after
+        * this stage (plugin object becomes immutable).
+        */
+       plugin->frozen = true;
+
+end:
+       return status;
+}
+
+struct bt_plugin *bt_plugin_create_from_file(const char *path)
+{
+       size_t path_len;
+       struct bt_plugin *plugin = NULL;
+       bool is_libtool_wrapper = false, is_shared_object = false;
+
+       if (!path) {
+               goto error;
+       }
+
+       path_len = strlen(path);
+       if (path_len <= PLUGIN_SUFFIX_LEN) {
+               goto error;
+       }
+
+       path_len++;
+       /*
+        * Check if the file ends with a known plugin file type suffix (i.e. .so
+        * or .la on Linux).
+        */
+       is_libtool_wrapper = !strncmp(LIBTOOL_PLUGIN_SUFFIX,
+               path + path_len - LIBTOOL_PLUGIN_SUFFIX_LEN,
+               LIBTOOL_PLUGIN_SUFFIX_LEN);
+       is_shared_object = !strncmp(NATIVE_PLUGIN_SUFFIX,
+               path + path_len - NATIVE_PLUGIN_SUFFIX_LEN,
+               NATIVE_PLUGIN_SUFFIX_LEN);
+       if (!is_shared_object && !is_libtool_wrapper) {
+               /* Name indicates that this is not a plugin file. */
+               goto error;
+       }
+
+       plugin = g_new0(struct bt_plugin, 1);
+       if (!plugin) {
+               goto error;
+       }
+
+       bt_object_init(plugin, bt_plugin_destroy);
+
+       /* Create shared lib handle */
+       plugin->shared_lib_handle = bt_plugin_shared_lib_handle_create(path);
+       if (!plugin->shared_lib_handle) {
+               printf_verbose("Failed to create a shared library handle (path `%s`)\n",
+                       path);
+               goto error;
+       }
+
+       /* Create empty array of component classes */
+       plugin->comp_classes =
+               g_ptr_array_new_with_free_func((GDestroyNotify) bt_put);
+       if (!plugin->comp_classes) {
+               goto error;
+       }
+
+       /* Initialize plugin */
+       if (init_plugin(plugin) < 0) {
+               goto error;
+       }
+
+       goto end;
+
+error:
+       BT_PUT(plugin);
+
+end:
+       return plugin;
+}
+
+/* Allocate dirent as recommended by READDIR(3), NOTES on readdir_r */
+static
+struct dirent *alloc_dirent(const char *path)
+{
+       size_t len;
+       long name_max;
+       struct dirent *entry;
+
+       name_max = pathconf(path, _PC_NAME_MAX);
+       if (name_max == -1) {
+               name_max = PATH_MAX;
+       }
+       len = offsetof(struct dirent, d_name) + name_max + 1;
+       entry = zmalloc(len);
+       return entry;
+}
+
+static
+enum bt_plugin_status bt_plugin_create_append_all_from_dir(
+               GPtrArray *plugins, const char *path, bool recurse)
+{
+       DIR *directory = NULL;
+       struct dirent *entry = NULL, *result = NULL;
+       char *file_path = NULL;
+       size_t path_len = strlen(path);
+       enum bt_plugin_status ret = BT_PLUGIN_STATUS_OK;
+
+       if (path_len >= PATH_MAX) {
+               ret = BT_PLUGIN_STATUS_ERROR;
+               goto end;
+       }
+
+       entry = alloc_dirent(path);
+       if (!entry) {
+               ret = BT_PLUGIN_STATUS_ERROR;
+               goto end;
+       }
+
+       file_path = zmalloc(PATH_MAX);
+       if (!file_path) {
+               ret = BT_PLUGIN_STATUS_NOMEM;
+               goto end;
+       }
+
+       strncpy(file_path, path, path_len);
+       /* Append a trailing '/' to the path */
+       if (file_path[path_len - 1] != '/') {
+               file_path[path_len++] = '/';
+       }
+
+       directory = opendir(file_path);
+       if (!directory) {
+               perror("Failed to open plug-in directory");
+               ret = BT_PLUGIN_STATUS_ERROR;
+               goto end;
+       }
+
+       /* Recursively walk directory */
+       while (!readdir_r(directory, entry, &result) && result) {
+               struct stat st;
+               int stat_ret;
+               size_t file_name_len;
+
+               if (result->d_name[0] == '.') {
+                       /* Skip hidden files, . and .. */
+                       continue;
+               }
+
+               file_name_len = strlen(result->d_name);
+
+               if (path_len + file_name_len >= PATH_MAX) {
+                       continue;
+               }
+
+               strncpy(file_path + path_len, result->d_name, file_name_len);
+               file_path[path_len + file_name_len] = '\0';
+
+               stat_ret = stat(file_path, &st);
+               if (stat_ret < 0) {
+                       /* Continue to next file / directory. */
+                       printf_perror("Failed to stat() plugin file\n");
+                       continue;
+               }
+
+               if (S_ISDIR(st.st_mode) && recurse) {
+                       ret = bt_plugin_create_append_all_from_dir(plugins,
+                               file_path, true);
+                       if (ret < 0) {
+                               goto end;
+                       }
+               } else if (S_ISREG(st.st_mode)) {
+                       struct bt_plugin *plugin = bt_plugin_create_from_file(file_path);
+
+                       if (plugin) {
+                               /* Transfer ownership to array */
+                               g_ptr_array_add(plugins, plugin);
+                       }
+               }
+       }
+end:
+       if (directory) {
+               if (closedir(directory)) {
+                       /*
+                        * We don't want to override the error since there is
+                        * nothing could do.
+                        */
+                       perror("Failed to close plug-in directory");
+               }
+       }
+       free(entry);
+       free(file_path);
+       return ret;
+}
+
+struct bt_plugin **bt_plugin_create_all_from_dir(const char *path,
+               bool recurse)
+{
+       GPtrArray *plugins_array = NULL;
+       struct bt_plugin **plugins = NULL;
+       enum bt_plugin_status status;
+
+       if (!path) {
+               goto error;
+       }
+
+       plugins_array = g_ptr_array_new();
+       if (!plugins_array) {
+               goto error;
+       }
+
+       /* Append found plugins to array */
+       status = bt_plugin_create_append_all_from_dir(plugins_array, path,
+               recurse);
+       if (status < 0) {
+               goto error;
+       }
+
+       /* Add sentinel to array */
+       g_ptr_array_add(plugins_array, NULL);
+       plugins = (struct bt_plugin **) plugins_array->pdata;
+       goto end;
+
+error:
+       if (plugins_array) {
+               g_ptr_array_free(plugins_array, TRUE);
+               plugins_array = NULL;
+       }
+
+end:
+       if (plugins_array) {
+               g_ptr_array_free(plugins_array, FALSE);
+       }
+
+       return plugins;
+}
+
+static
+struct bt_plugin *bt_plugin_create_from_static_at_index(size_t i)
+{
+       struct bt_plugin *plugin = NULL;
+
+       plugin = g_new0(struct bt_plugin, 1);
+       if (!plugin) {
+               goto error;
+       }
+
+       bt_object_init(plugin, bt_plugin_destroy);
+
+       /* Create shared lib handle */
+       plugin->shared_lib_handle = bt_plugin_shared_lib_handle_create(NULL);
+       if (!plugin->shared_lib_handle) {
+               goto error;
+       }
+
+       /* Fill shared lib handle */
+       plugin->shared_lib_handle->init =
+               (SECTION_BEGIN(__bt_plugin_init_funcs))[i];
+       if (!plugin->shared_lib_handle->init) {
+               goto error;
+       }
+
+       plugin->shared_lib_handle->exit =
+               (SECTION_BEGIN(__bt_plugin_exit_funcs))[i];
+       if (!plugin->shared_lib_handle->exit) {
+               goto error;
+       }
+
+       plugin->shared_lib_handle->name = (SECTION_BEGIN(__bt_plugin_names))[i];
+       plugin->shared_lib_handle->author =
+               (SECTION_BEGIN(__bt_plugin_authors))[i];
+       plugin->shared_lib_handle->license =
+               (SECTION_BEGIN(__bt_plugin_licenses))[i];
+       plugin->shared_lib_handle->description =
+               (SECTION_BEGIN(__bt_plugin_descriptions))[i];
+
+       /* Create empty array of component classes */
+       plugin->comp_classes =
+               g_ptr_array_new_with_free_func((GDestroyNotify) bt_put);
+       if (!plugin->comp_classes) {
+               goto error;
+       }
+
+       /* Initialize plugin */
+       if (init_plugin(plugin) < 0) {
+               goto error;
+       }
+
+       goto end;
+
+error:
+       BT_PUT(plugin);
+
+end:
+       return plugin;
+}
+
+struct bt_plugin **bt_plugin_create_all_from_static(void)
+{
+       size_t count, i;
+       struct bt_plugin **plugins = NULL;
+
+       PRINT_PLUG_IN_SECTIONS(printf_verbose);
+       count = SECTION_ELEMENT_COUNT(__bt_plugin_init_funcs);
+       if (SECTION_ELEMENT_COUNT(__bt_plugin_exit_funcs) != count ||
+                       SECTION_ELEMENT_COUNT(__bt_plugin_names) != count ||
+                       SECTION_ELEMENT_COUNT(__bt_plugin_authors) != count ||
+                       SECTION_ELEMENT_COUNT(__bt_plugin_licenses) != count ||
+                       SECTION_ELEMENT_COUNT(__bt_plugin_descriptions) != count) {
+               printf_error("Some statically-linked plug-ins do not define all the mandatory symbols\n");
+               goto error;
+       }
+
+       printf_verbose("Detected %zu statically-linked plug-ins\n", count);
+       plugins = g_new0(struct bt_plugin *, count + 1);
+       if (!plugins) {
+               goto error;
+       }
+
+       for (i = 0; i < count; i++) {
+               struct bt_plugin *plugin =
+                       bt_plugin_create_from_static_at_index(i);
+
+               if (!plugin) {
+                       printf_error("Cannot create statically-linked plug-in at index %zu\n",
+                               i);
+                       goto error;
+               }
+
+               /* Transfer ownership to the array */
+               plugins[i] = plugin;
+       }
+
+       goto end;
+
+error:
+       g_free(plugins);
+
+end:
+       return plugins;
+}
+
+const char *bt_plugin_get_name(struct bt_plugin *plugin)
+{
+       return plugin ? plugin->shared_lib_handle->name : NULL;
+}
+
+const char *bt_plugin_get_author(struct bt_plugin *plugin)
+{
+       return plugin ? plugin->shared_lib_handle->author : NULL;
+}
+
+const char *bt_plugin_get_license(struct bt_plugin *plugin)
+{
+       return plugin ? plugin->shared_lib_handle->license : NULL;
+}
+
+const char *bt_plugin_get_path(struct bt_plugin *plugin)
+{
+       return (plugin && plugin->shared_lib_handle->path) ?
+               plugin->shared_lib_handle->path->str : NULL;
+}
+
+const char *bt_plugin_get_description(struct bt_plugin *plugin)
+{
+       return plugin ? plugin->shared_lib_handle->description : NULL;
+}
+
+int bt_plugin_get_component_class_count(struct bt_plugin *plugin)
+{
+       return plugin ? plugin->comp_classes->len : -1;
+}
+
+struct bt_component_class *bt_plugin_get_component_class(
+               struct bt_plugin *plugin, size_t index)
+{
+       struct bt_component_class *comp_class = NULL;
+
+       if (!plugin || index >= plugin->comp_classes->len) {
+               goto error;
+       }
+
+       comp_class = g_ptr_array_index(plugin->comp_classes, index);
+       bt_get(comp_class);
+       goto end;
+
+error:
+       BT_PUT(comp_class);
+
+end:
+       return comp_class;
+}
+
+struct bt_component_class *bt_plugin_get_component_class_by_name_and_type(
+               struct bt_plugin *plugin, const char *name,
+               enum bt_component_type type)
+{
+       struct bt_component_class *comp_class = NULL;
+       size_t i;
+
+       if (!plugin || !name) {
+               goto error;
+       }
+
+       for (i = 0; i < plugin->comp_classes->len; i++) {
+               struct bt_component_class *comp_class_candidate =
+                       g_ptr_array_index(plugin->comp_classes, i);
+               const char *comp_class_cand_name =
+                       bt_component_class_get_name(comp_class_candidate);
+               enum bt_component_type comp_class_cand_type =
+                       bt_component_class_get_type(comp_class_candidate);
+
+               assert(comp_class_cand_name);
+               assert(comp_class_cand_type >= 0);
+
+               if (strcmp(name, comp_class_cand_name) == 0 &&
+                               comp_class_cand_type == type) {
+                       comp_class = bt_get(comp_class_candidate);
+                       break;
+               }
+       }
+
+       goto end;
+
+error:
+       BT_PUT(comp_class);
+
+end:
+       return comp_class;
+}
+
+static
+void plugin_comp_class_destroy_listener(struct bt_component_class *comp_class,
+               void *data)
+{
+       gboolean exists = g_hash_table_remove(comp_classes_to_shlib_handles,
+               comp_class);
+       assert(exists);
+}
+
+enum bt_plugin_status bt_plugin_add_component_class(
+       struct bt_plugin *plugin, struct bt_component_class *comp_class)
+{
+       enum bt_plugin_status status = BT_PLUGIN_STATUS_OK;
+       struct bt_component_class *comp_class_dup = NULL;
+       int ret;
+       int comp_class_index = -1;
+
+       if (!plugin || !comp_class || plugin->frozen) {
+               goto error;
+       }
+
+       /* Check for duplicate */
+       comp_class_dup = bt_plugin_get_component_class_by_name_and_type(plugin,
+               bt_component_class_get_name(comp_class),
+               bt_component_class_get_type(comp_class));
+       if (comp_class_dup) {
+               printf_verbose("Plugin `%s`: adding component class with existing name `%s` and type %d\n",
+                       plugin->shared_lib_handle->name,
+                       bt_component_class_get_name(comp_class),
+                       bt_component_class_get_type(comp_class));
+               goto error;
+       }
+
+       /* Add new component class */
+       comp_class_index = plugin->comp_classes->len;
+       g_ptr_array_add(plugin->comp_classes, bt_get(comp_class));
+
+       /* Map component class pointer to shared lib handle in global HT */
+       g_hash_table_insert(comp_classes_to_shlib_handles, comp_class,
+               bt_get(plugin->shared_lib_handle));
+
+       /* Add our custom destroy listener */
+       ret = bt_component_class_add_destroy_listener(comp_class,
+               plugin_comp_class_destroy_listener, NULL);
+       if (ret) {
+               goto error;
+       }
+
+       goto end;
+
+error:
+       /* Remove entry from global hash table (if exists) */
+       g_hash_table_remove(comp_classes_to_shlib_handles,
+               comp_class);
+
+       /* Remove entry from plugin's component classes (if added) */
+       if (comp_class_index >= 0) {
+               g_ptr_array_remove_index(plugin->comp_classes,
+                       comp_class_index);
+       }
+
+       status = BT_PLUGIN_STATUS_ERROR;
+
+end:
+       bt_put(comp_class_dup);
+       return status;
+}

diff --git a/plugins/ctf/common/notif-iter/notif-iter.c b/plugins/ctf/common/notif-iter/notif-iter.c
index 823a753ff29fcff4539ebeff616410fe1204f969..44663f7bc38a6a5673a98cc4f98d1b8a76dff798 100644 (file)
--- a/plugins/ctf/common/notif-iter/notif-iter.c
+++ b/plugins/ctf/common/notif-iter/notif-iter.c
@@ -38,9 +38,9 @@
 #include <babeltrace/ctf-ir/stream.h>
 #include <babeltrace/ctf-ir/clock-class.h>
 #include <babeltrace/ctf-ir/event-class.h>
-#include <babeltrace/plugin/notification/packet.h>
-#include <babeltrace/plugin/notification/event.h>
-#include <babeltrace/plugin/notification/stream.h>
+#include <babeltrace/component/notification/packet.h>
+#include <babeltrace/component/notification/event.h>
+#include <babeltrace/component/notification/stream.h>
 #include <babeltrace/ref.h>
 #include <glib.h>
 

diff --git a/plugins/ctf/fs/data-stream.c b/plugins/ctf/fs/data-stream.c
index a71cc00744d89f86f226adb4ff575632515852e4..905e26a946525c99ce4b35716d3d8d12fd0ea2c8 100644 (file)
--- a/plugins/ctf/fs/data-stream.c
+++ b/plugins/ctf/fs/data-stream.c
@@ -30,7 +30,7 @@
 #include <inttypes.h>
 #include <sys/mman.h>
 #include <babeltrace/ctf-ir/stream.h>
-#include <babeltrace/plugin/notification/iterator.h>
+#include <babeltrace/component/notification/iterator.h>
 #include "file.h"
 #include "metadata.h"
 #include "../common/notif-iter/notif-iter.h"

diff --git a/plugins/ctf/fs/fs.c b/plugins/ctf/fs/fs.c
index ea9bf562c4507a81c5ea4db43da4d762678b868a..f08f06a5daee3387763ad7e9ceabad70b9c6e321 100644 (file)
--- a/plugins/ctf/fs/fs.c
+++ b/plugins/ctf/fs/fs.c
@@ -26,14 +26,13 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/plugin/plugin-system.h>
 #include <babeltrace/ctf-ir/packet.h>
 #include <babeltrace/ctf-ir/clock-class.h>
-#include <babeltrace/plugin/notification/iterator.h>
-#include <babeltrace/plugin/notification/stream.h>
-#include <babeltrace/plugin/notification/event.h>
-#include <babeltrace/plugin/notification/packet.h>
-#include <babeltrace/plugin/notification/heap.h>
+#include <babeltrace/component/notification/iterator.h>
+#include <babeltrace/component/notification/stream.h>
+#include <babeltrace/component/notification/event.h>
+#include <babeltrace/component/notification/packet.h>
+#include <babeltrace/component/notification/heap.h>
 #include <glib.h>
 #include <assert.h>
 #include <unistd.h>

diff --git a/plugins/ctf/fs/fs.h b/plugins/ctf/fs/fs.h
index 80bd6d04efc864deabba09a8121cf77ebab63e49..35fbee90f839cb3278610eb0380483e9977fd361 100644 (file)
--- a/plugins/ctf/fs/fs.h
+++ b/plugins/ctf/fs/fs.h
@@ -29,7 +29,7 @@
  */
 
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/plugin/component.h>
+#include <babeltrace/component/component.h>
 #include "data-stream.h"
 
 #define CTF_FS_COMPONENT_NAME "fs"

diff --git a/plugins/ctf/lttng-live/lttng-live-internal.h b/plugins/ctf/lttng-live/lttng-live-internal.h
index 0cc5afb949389bd121851d14547a4cee21e2d1c3..3f5b9172a288d6c8c73ff235060d26e60d49894b 100644 (file)
--- a/plugins/ctf/lttng-live/lttng-live-internal.h
+++ b/plugins/ctf/lttng-live/lttng-live-internal.h
@@ -28,7 +28,7 @@
  */
 
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/plugin/component.h>
+#include <babeltrace/component/component.h>
 
 #define LTTNG_LIVE_COMPONENT_NAME "lttng-live"
 #define LTTNG_LIVE_COMPONENT_DESCRIPTION "Component implementing an LTTng-live client."

diff --git a/plugins/ctf/lttng-live/lttng-live.c b/plugins/ctf/lttng-live/lttng-live.c
index 4f28f484a2137bd00d95d2222ad967a8de9fe3b7..5cef2aa99f1936b54781bcb7b442272b723fc64c 100644 (file)
--- a/plugins/ctf/lttng-live/lttng-live.c
+++ b/plugins/ctf/lttng-live/lttng-live.c
@@ -27,7 +27,7 @@
  */
 
 #include "lttng-live-internal.h"
-#include <babeltrace/plugin/source.h>
+#include <babeltrace/component/source.h>
 
 BT_HIDDEN
 enum bt_component_status lttng_live_init(struct bt_component *component,

diff --git a/plugins/ctf/plugin.c b/plugins/ctf/plugin.c
index 0aac9032f7a20eb876679457b97826ac83978b2d..36730869392ec50990938e228d20ac178c73ec95 100644 (file)
--- a/plugins/ctf/plugin.c
+++ b/plugins/ctf/plugin.c
@@ -26,7 +26,7 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/plugin/plugin-macros.h>
+#include <babeltrace/plugin/plugin-dev.h>
 #include "fs/fs.h"
 #include "lttng-live/lttng-live-internal.h"
 
@@ -38,8 +38,8 @@ BT_PLUGIN_LICENSE("MIT");
 
 /* Declare component classes implemented by this plug-in. */
 BT_PLUGIN_COMPONENT_CLASSES_BEGIN
-BT_PLUGIN_SOURCE_COMPONENT_CLASS_ENTRY(CTF_FS_COMPONENT_NAME,
+BT_PLUGIN_COMPONENT_CLASS_SOURCE_ENTRY(CTF_FS_COMPONENT_NAME,
                CTF_FS_COMPONENT_DESCRIPTION, ctf_fs_init)
-BT_PLUGIN_SOURCE_COMPONENT_CLASS_ENTRY(LTTNG_LIVE_COMPONENT_NAME,
+BT_PLUGIN_COMPONENT_CLASS_SOURCE_ENTRY(LTTNG_LIVE_COMPONENT_NAME,
                LTTNG_LIVE_COMPONENT_DESCRIPTION, lttng_live_init)
 BT_PLUGIN_COMPONENT_CLASSES_END

diff --git a/plugins/muxer/muxer.c b/plugins/muxer/muxer.c
index ba78cfb0dde15f8860c10f22f7cd9b308a303131..6cd355e5c94a85939ff6fa59d5182428e717bcb2 100644 (file)
--- a/plugins/muxer/muxer.c
+++ b/plugins/muxer/muxer.c
@@ -26,12 +26,12 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/plugin/plugin-macros.h>
-#include <babeltrace/plugin/component.h>
-#include <babeltrace/plugin/filter.h>
-#include <babeltrace/plugin/notification/notification.h>
-#include <babeltrace/plugin/notification/iterator.h>
-#include <babeltrace/plugin/notification/event.h>
+#include <babeltrace/plugin/plugin-dev.h>
+#include <babeltrace/component/component.h>
+#include <babeltrace/component/filter.h>
+#include <babeltrace/component/notification/notification.h>
+#include <babeltrace/component/notification/iterator.h>
+#include <babeltrace/component/notification/event.h>
 #include "muxer.h"
 
 static
@@ -96,7 +96,7 @@ BT_PLUGIN_AUTHOR("Jérémie Galarneau");
 BT_PLUGIN_LICENSE("MIT");
 
 BT_PLUGIN_COMPONENT_CLASSES_BEGIN
-BT_PLUGIN_FILTER_COMPONENT_CLASS_ENTRY("muxer",
+BT_PLUGIN_COMPONENT_CLASS_FILTER_ENTRY("muxer",
                "Time-correlate multiple traces.",
                muxer_component_init)
 BT_PLUGIN_COMPONENT_CLASSES_END

diff --git a/plugins/muxer/muxer.h b/plugins/muxer/muxer.h
index 779375231f5a62ee928b7c3652aad3baaf884910..7bf8910955e16d358d489a2f1efe634f0d6a02fa 100644 (file)
--- a/plugins/muxer/muxer.h
+++ b/plugins/muxer/muxer.h
@@ -29,7 +29,6 @@
 
 #include <stdbool.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/plugin/component.h>
 
 struct muxer {
        GHashTable *trace_clocks;

diff --git a/plugins/text/text.c b/plugins/text/text.c
index 2712dd684db95d8de215cf24dc94a356e3faf71e..2a8e771773fe067f8d9dc83145e06fd5fddb1b47 100644 (file)
--- a/plugins/text/text.c
+++ b/plugins/text/text.c
@@ -27,12 +27,12 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/plugin/plugin-macros.h>
-#include <babeltrace/plugin/component.h>
-#include <babeltrace/plugin/sink.h>
-#include <babeltrace/plugin/notification/notification.h>
-#include <babeltrace/plugin/notification/iterator.h>
-#include <babeltrace/plugin/notification/event.h>
+#include <babeltrace/plugin/plugin-dev.h>
+#include <babeltrace/component/component.h>
+#include <babeltrace/component/sink.h>
+#include <babeltrace/component/notification/notification.h>
+#include <babeltrace/component/notification/iterator.h>
+#include <babeltrace/component/notification/event.h>
 #include <babeltrace/values.h>
 #include <babeltrace/compiler.h>
 #include <stdio.h>
@@ -661,7 +661,7 @@ BT_PLUGIN_AUTHOR("Jérémie Galarneau");
 BT_PLUGIN_LICENSE("MIT");
 
 BT_PLUGIN_COMPONENT_CLASSES_BEGIN
-BT_PLUGIN_SINK_COMPONENT_CLASS_ENTRY(PLUGIN_NAME,
+BT_PLUGIN_COMPONENT_CLASS_SINK_ENTRY(PLUGIN_NAME,
                "Formats CTF-IR to text. Formerly known as ctf-text.",
                text_component_init)
 BT_PLUGIN_COMPONENT_CLASSES_END

diff --git a/plugins/text/text.h b/plugins/text/text.h
index ef80ce3e4777e635b9fca42380ac644a896b9d05..9f1706e4f8bb088ed8794cc4f35050fe8604dfc8 100644 (file)
--- a/plugins/text/text.h
+++ b/plugins/text/text.h
@@ -29,7 +29,7 @@
 
 #include <stdbool.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/plugin/component.h>
+#include <babeltrace/component/component.h>
 
 enum text_default {
        TEXT_DEFAULT_UNSET,

diff --git a/plugins/trimmer/iterator.c b/plugins/trimmer/iterator.c
index e4213f47f7ddced5eb1bb11aca800b7b09fe1f1e..942b02641f82386ebd3c491866321f81643be07d 100644 (file)
--- a/plugins/trimmer/iterator.c
+++ b/plugins/trimmer/iterator.c
@@ -28,12 +28,12 @@
 
 #include "trimmer.h"
 #include "iterator.h"
-#include <babeltrace/plugin/notification/iterator.h>
-#include <babeltrace/plugin/notification/notification.h>
-#include <babeltrace/plugin/notification/event.h>
-#include <babeltrace/plugin/notification/stream.h>
-#include <babeltrace/plugin/notification/packet.h>
-#include <babeltrace/plugin/filter.h>
+#include <babeltrace/component/notification/iterator.h>
+#include <babeltrace/component/notification/notification.h>
+#include <babeltrace/component/notification/event.h>
+#include <babeltrace/component/notification/stream.h>
+#include <babeltrace/component/notification/packet.h>
+#include <babeltrace/component/filter.h>
 #include <babeltrace/ctf-ir/event.h>
 #include <babeltrace/ctf-ir/stream.h>
 #include <babeltrace/ctf-ir/stream-class.h>

diff --git a/plugins/trimmer/iterator.h b/plugins/trimmer/iterator.h
index f40f4b2d56a1c27ce072abbd9f6a9321b5f02541..1ab0b6f5db12e77ecea99f3f4815bdb87d19427a 100644 (file)
--- a/plugins/trimmer/iterator.h
+++ b/plugins/trimmer/iterator.h
@@ -28,7 +28,8 @@
  */
 
 #include "trimmer.h"
-#include <babeltrace/plugin/notification/notification.h>
+#include <babeltrace/component/notification/notification.h>
+#include <babeltrace/component/notification/iterator.h>
 
 struct trimmer_iterator {
        /* Input iterators associated with this output iterator. */

diff --git a/plugins/trimmer/trimmer.c b/plugins/trimmer/trimmer.c
index 333e7d12078c900a904a7e865266ce003f1e23f2..a29505d32806e00079cc8288e5fce51dc522a42d 100644 (file)
--- a/plugins/trimmer/trimmer.c
+++ b/plugins/trimmer/trimmer.c
@@ -26,12 +26,12 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/plugin/plugin-macros.h>
-#include <babeltrace/plugin/component.h>
-#include <babeltrace/plugin/filter.h>
-#include <babeltrace/plugin/notification/notification.h>
-#include <babeltrace/plugin/notification/iterator.h>
-#include <babeltrace/plugin/notification/event.h>
+#include <babeltrace/plugin/plugin-dev.h>
+#include <babeltrace/component/component.h>
+#include <babeltrace/component/filter.h>
+#include <babeltrace/component/notification/notification.h>
+#include <babeltrace/component/notification/iterator.h>
+#include <babeltrace/component/notification/event.h>
 #include "trimmer.h"
 #include "iterator.h"
 #include <assert.h>
@@ -391,7 +391,7 @@ BT_PLUGIN_AUTHOR("Jérémie Galarneau");
 BT_PLUGIN_LICENSE("MIT");
 
 BT_PLUGIN_COMPONENT_CLASSES_BEGIN
-BT_PLUGIN_FILTER_COMPONENT_CLASS_ENTRY("trimmer",
+BT_PLUGIN_COMPONENT_CLASS_FILTER_ENTRY("trimmer",
                "Ensure that trace notifications outside of a given range are filtered-out.",
                trimmer_component_init)
 BT_PLUGIN_COMPONENT_CLASSES_END

diff --git a/plugins/trimmer/trimmer.h b/plugins/trimmer/trimmer.h
index b0acf05ffcf322d336cd183a6a6910d0fab3d676..4d82a2446f78748e5a86573ac81a27f002a379c2 100644 (file)
--- a/plugins/trimmer/trimmer.h
+++ b/plugins/trimmer/trimmer.h
@@ -29,8 +29,6 @@
 
 #include <stdbool.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/plugin/component.h>
-#include <babeltrace/plugin/plugin-system.h>
 
 #define NSEC_PER_SEC   1000000000LL
 

diff --git a/plugins/writer/writer.c b/plugins/writer/writer.c
index ad99ed8abd4691d3d2b8397f6c6a26a0373c0724..e8b1fefdba118920d20f08a93834fb236da60823 100644 (file)
--- a/plugins/writer/writer.c
+++ b/plugins/writer/writer.c
@@ -27,13 +27,13 @@
  */
 
 #include <babeltrace/ctf-ir/packet.h>
-#include <babeltrace/plugin/plugin-macros.h>
-#include <babeltrace/plugin/component.h>
-#include <babeltrace/plugin/sink.h>
-#include <babeltrace/plugin/notification/notification.h>
-#include <babeltrace/plugin/notification/iterator.h>
-#include <babeltrace/plugin/notification/event.h>
-#include <babeltrace/plugin/notification/packet.h>
+#include <babeltrace/plugin/plugin-dev.h>
+#include <babeltrace/component/component.h>
+#include <babeltrace/component/sink.h>
+#include <babeltrace/component/notification/notification.h>
+#include <babeltrace/component/notification/iterator.h>
+#include <babeltrace/component/notification/event.h>
+#include <babeltrace/component/notification/packet.h>
 #include <stdio.h>
 #include <stdbool.h>
 #include <glib.h>
@@ -278,7 +278,6 @@ BT_PLUGIN_AUTHOR("Jérémie Galarneau");
 BT_PLUGIN_LICENSE("MIT");
 
 BT_PLUGIN_COMPONENT_CLASSES_BEGIN
-BT_PLUGIN_SINK_COMPONENT_CLASS_ENTRY("writer",
-               "Formats CTF-IR to CTF.",
+BT_PLUGIN_COMPONENT_CLASS_SINK_ENTRY("writer", "Formats CTF-IR to CTF.",
                writer_component_init)
 BT_PLUGIN_COMPONENT_CLASSES_END

diff --git a/plugins/writer/writer.h b/plugins/writer/writer.h
index 939a12c8bd35e61b3e5ca61044c9c4c9238ce7cb..21aae60150a25c49e91c7a9784bb33934dcb84a9 100644 (file)
--- a/plugins/writer/writer.h
+++ b/plugins/writer/writer.h
@@ -29,7 +29,7 @@
 
 #include <stdbool.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/plugin/component.h>
+#include <babeltrace/component/component.h>
 #include <babeltrace/ctf-writer/writer.h>
 
 struct writer_component {

diff --git a/tests/lib/test_bt_notification_heap.c b/tests/lib/test_bt_notification_heap.c
index 7fe538ade71bffe44980af35955c1b47334a7222..bacce9f6ce0f0b1778f32564e6664f112e90d538 100644 (file)
--- a/tests/lib/test_bt_notification_heap.c
+++ b/tests/lib/test_bt_notification_heap.c
@@ -24,9 +24,9 @@
 #include <stdlib.h>
 #include <babeltrace/compiler.h>
 #include <babeltrace/ref.h>
-#include <babeltrace/plugin/notification/heap.h>
-#include <babeltrace/plugin/notification/notification.h>
-#include <babeltrace/plugin/notification/notification-internal.h>
+#include <babeltrace/component/notification/heap.h>
+#include <babeltrace/component/notification/notification.h>
+#include <babeltrace/component/notification/notification-internal.h>
 
 #define NR_TESTS 7