Default parameters support with ReactorBanks

Author: OmerMajNition

examples/sdk-SrcSink/Config-a/Config-a.cc

@@ -2,17 +2,22 @@
 
 UserParameters cfg_parameters;
 
-ConfigParameter<int, uint32_t>::ParametersMap UserParameters::homogeneous_config() {
+ConfigParameter<int, uint32_t, string>::ParametersMap UserParameters::homogeneous_config() {
     return {
-            {"Main.Source.iterations", ConfigParameterMetadata<int> { 5 } }
+            {"Main.Source.iterations", ConfigParameterMetadata<int> { 5 } },
+            // {"Main.Sink.name", ConfigParameterMetadata<string> { "Homog Name" } },
     };
 }
 
-ConfigParameter<int, uint32_t>::ParametersMap UserParameters::heterogeneous_config() {
+ConfigParameter<int, uint32_t, string>::ParametersMap UserParameters::heterogeneous_config() {
     return {
             {"Main.Source.iterations", ConfigParameterMetadata<int> { 20 } },
             {"Main.Source.n_ports", ConfigParameterMetadata<int> { 4 } },
             {"Main.n_sinks", ConfigParameterMetadata<int> { 4 } },
+            // {"Main.Sink_0.name", ConfigParameterMetadata<string> { "Hetero Name 0" } },
+            // {"Main.Sink_1.name", ConfigParameterMetadata<string> { "Hetero Name 1" } },
+            // {"Main.Sink_2.name", ConfigParameterMetadata<string> { "Hetero Name 2" } },
+            // {"Main.Sink_3.name", ConfigParameterMetadata<string> { "Hetero Name 3" } },
 
     };
 }

examples/sdk-SrcSink/Config-a/Config-a.hh

@@ -8,9 +8,9 @@
 
 using namespace sdk;
 
-struct UserParameters : public ConfigParameter<int, uint32_t> {
-    ConfigParameter<int, uint32_t>::ParametersMap homogeneous_config();
-    ConfigParameter<int, uint32_t>::ParametersMap heterogeneous_config();
+struct UserParameters : public ConfigParameter<int, uint32_t, string> {
+    ConfigParameter<int, uint32_t, string>::ParametersMap homogeneous_config();
+    ConfigParameter<int, uint32_t, string>::ParametersMap heterogeneous_config();
 };
 
 extern UserParameters cfg_parameters;

examples/sdk-SrcSink/Main/MainReactor.cc

@@ -7,7 +7,7 @@ void MainReactor::construction() {
     src = std::make_unique<SourceReactor>("Source", this);
 
     for (int i = 0; i < parameters.n_sinks.value; i++) {
-        snk.create_reactor();
+        snk.create_reactor(SinkReactor::DefaultParameters{.name = "Default Sink Name"});
     }
 }
 

examples/sdk-SrcSink/Sink/SinkReactor.hh

@@ -6,21 +6,30 @@ using namespace sdk;
 
 class SinkReactor : public Reactor {
 public:
-    struct Parameters : public SystemParameter<string> {
-        REACTOR_PARAMETER(string, name, "Alternate name", "Sink", "Sink", "Sink");
 
-        Parameters(Reactor *container)
-            :   SystemParameter<string>(container) {
+    struct DefaultParameters {
+        string name = "Sink";
+    };
+    struct Parameters : public SystemParameterWithDefault<DefaultParameters, string> {
+        REACTOR_PARAMETER(string, name, "Alternate name", "Sink", "Sink", defaults.name);
+
+        Parameters(Reactor *container, DefaultParameters &&param)
+            :   SystemParameterWithDefault<DefaultParameters, string>(container, std::forward<DefaultParameters>(param)) {
             register_parameters (name);
         }
     };
 
     SinkReactor(const std::string &name, Environment *env)
-        : Reactor(name, env) {}
+    : Reactor(name, env), parameters{this, DefaultParameters{}} {}
     SinkReactor(const std::string &name, Reactor *container)
-        : Reactor(name, container) {}
+    : Reactor(name, container), parameters{this, DefaultParameters{}} {}
+
+    SinkReactor(const std::string &name, Environment *env, DefaultParameters && param)
+    : Reactor(name, env), parameters{this, std::forward<DefaultParameters>(param)} {}
+    SinkReactor(const std::string &name, Reactor *container, DefaultParameters && param)
+    : Reactor(name, container), parameters{this, std::forward<DefaultParameters>(param)} {}
 
-    Parameters parameters{this};
+    Parameters parameters;
 
     Input<int> req{"req", this};
     Output<int> rsp{"rsp", this};

include/reactor-sdk/ReactorBank.hh

@@ -447,6 +447,17 @@ public:
         reactors.back()->bank_index_ = index++;
     }
 
+    template <class... Args> void create_reactor(Args&&... args) noexcept {
+        assert (e_parent || r_parent);
+        std::string bank_name = name + "\r\n" + std::to_string(index);
+        if (e_parent) {
+            reactors.emplace_back(std::make_unique<ReactorType>(bank_name, e_parent, std::forward<Args>(args)...));
+        } else {
+            reactors.emplace_back(std::make_unique<ReactorType>(bank_name, r_parent, std::forward<Args>(args)...));
+        }
+        reactors.back()->bank_index_ = index++;
+    }
+
     template <class... Args> void emplace_back(Args&&... args) noexcept {
         reactors.emplace_back(std::forward<Args>(args)...);
         reactors.back()->bank_index_ = index++;