Core: redesigned plugin manager, added support to list all available plugins, split instance classes into multiple files based on their type

Author: Lukas955

src/core/CMakeLists.txt

@@ -4,10 +4,17 @@ set(CORE_SOURCE
 	configurator/config_file.hpp
 	configurator/configurator.cpp
 	configurator/configurator.hpp
-	configurator/instance.cpp
 	configurator/instance.hpp
-	configurator/plugin_finder.cpp
-	configurator/plugin_finder.hpp
+	configurator/instance_input.cpp
+	configurator/instance_input.hpp
+	configurator/instance_intermediate.cpp
+	configurator/instance_intermediate.hpp
+	configurator/instance_outmgr.cpp
+	configurator/instance_outmgr.hpp
+	configurator/instance_output.cpp
+	configurator/instance_output.hpp
+	configurator/plugin_mgr.cpp
+	configurator/plugin_mgr.hpp
 	configurator/model.cpp
 	configurator/model.hpp
 	api.c

src/core/configurator/configurator.cpp

@@ -183,18 +183,18 @@ ipx_configurator::start(const ipx_config_model &model)
 
     // Phase 1. Create all instances (i.e. find plugins)
     for (const auto &output : model.outputs) {
-        const ipx_plugin_data *data = finder.find(output.plugin, IPX_PT_OUTPUT);
-        outputs.emplace_back(new ipx_instance_output(output.name, &data->cbs, ring_size));
+        ipx_plugin_mgr::plugin_ref *ref = plugins.plugin_get(IPX_PT_OUTPUT, output.plugin);
+        outputs.emplace_back(new ipx_instance_output(output.name, ref, ring_size));
     }
 
     for (const auto &inter : model.inters) {
-        const ipx_plugin_data *data = finder.find(inter.plugin, IPX_PT_INTERMEDIATE);
-        inters.emplace_back(new ipx_instance_intermediate(inter.name, &data->cbs, ring_size));
+        ipx_plugin_mgr::plugin_ref *ref = plugins.plugin_get(IPX_PT_INTERMEDIATE, inter.plugin);
+        inters.emplace_back(new ipx_instance_intermediate(inter.name, ref, ring_size));
     }
 
     for (const auto &input : model.inputs) {
-        const ipx_plugin_data *data = finder.find(input.plugin, IPX_PT_INPUT);
-        inputs.emplace_back(new ipx_instance_input(input.name, &data->cbs, ring_size));
+        ipx_plugin_mgr::plugin_ref *ref = plugins.plugin_get(IPX_PT_INPUT, input.plugin);
+        inputs.emplace_back(new ipx_instance_input(input.name, ref, ring_size));
     }
 
     // Insert the output manager as the last intermediate plugin
@@ -210,9 +210,9 @@ ipx_configurator::start(const ipx_config_model &model)
     }
 
     for (size_t i = 0; i < inters.size() - 1; ++i) { // Skip the last element
-        ipx_instance_intermediate *now = inters[i].get();
-        ipx_instance_intermediate *next = inters[i + 1].get();
-        now->connect_to(*next);
+        ipx_instance_intermediate *from = inters[i].get();
+        ipx_instance_intermediate *to = inters[i + 1].get();
+        from->connect_to(*to);
     }
 
     for (size_t i = 0; i < model.outputs.size(); ++i) {
@@ -234,7 +234,7 @@ ipx_configurator::start(const ipx_config_model &model)
         instance->init(cfg.params, iemgr, verbosity_str2level(cfg.verbosity));
     }
 
-    output_manager->init("", iemgr, ipx_verb_level_get());
+    output_manager->init(iemgr, ipx_verb_level_get());
     for (size_t i = 0; i < model.inters.size(); ++i) {
         ipx_instance_intermediate *instance = inters[i].get();
         const ipx_plugin_inter &cfg = model.inters[i];
@@ -249,7 +249,7 @@ ipx_configurator::start(const ipx_config_model &model)
 
     IPX_DEBUG(comp_str, "All instances have been successfully initialized.", '\0');
 
-    // Start threads of all plugins
+    // Phase 4. Start threads of all plugins
     for (auto &output : outputs) {
         output->start();
     }

src/core/configurator/configurator.hpp

@@ -45,9 +45,13 @@
 #include <stdint.h>
 #include <vector>
 #include <memory>
-#include "plugin_finder.hpp"
+
 #include "model.hpp"
-#include "instance.hpp"
+#include "instance_input.hpp"
+#include "instance_intermediate.hpp"
+#include "instance_outmgr.hpp"
+#include "instance_output.hpp"
+#include "plugin_mgr.hpp"
 
 extern "C" {
 #include <ipfixcol2.h>
@@ -90,8 +94,8 @@ class ipx_configurator {
     ipx_configurator(const ipx_configurator &) = delete;
     ipx_configurator& operator=(const ipx_configurator &) = delete;
 
-    /** Modules finder */
-    ipx_plugin_finder finder;
+    /** Plugin manager */
+    ipx_plugin_mgr plugins;
 
     /**
      * \brief Start the configuration with a new model
@@ -123,5 +127,4 @@ class ipx_configurator {
      void set_buffer_size(uint32_t size);
 };
 
-
 #endif //IPFIXCOL_CONFIGURATOR_H