base changes for sdk, bug fix for export_dependency_graph to a .dot file

Author: OmerMajNition

include/reactor-cpp/action.hh

@@ -152,7 +152,7 @@ public:
 };
 
 class Timer : public BaseAction {
-private:
+protected:
   Duration offset_{0};
   Duration period_{0};
 

include/reactor-cpp/environment.hh

@@ -30,10 +30,11 @@ constexpr bool default_fast_fwd_execution = false;
 enum class Phase : std::uint8_t {
   Construction = 0,
   Assembly = 1,
-  Startup = 2,
-  Execution = 3,
-  Shutdown = 4,
-  Deconstruction = 5
+  Indexing = 2,
+  Startup = 3,
+  Execution = 4,
+  Shutdown = 5,
+  Deconstruction = 6
 };
 
 class Environment {
@@ -107,7 +108,9 @@ public:
   void register_reactor(Reactor* reactor);
   void register_port(BasePort* port) noexcept;
   void register_input_action(BaseAction* action);
+  void construct();
   void assemble();
+  void dependency_graph_and_indexes();
   auto startup() -> std::thread;
   void sync_shutdown();
   void async_shutdown();

include/reactor-cpp/reactor.hh

@@ -52,6 +52,7 @@ public:
   void shutdown() final;
 
   virtual void assemble() = 0;
+  virtual void construct() {}
 
   [[nodiscard]] static auto get_physical_time() noexcept -> TimePoint;
   [[nodiscard]] auto get_logical_time() const noexcept -> TimePoint;

lib/environment.cc

@@ -67,6 +67,26 @@ void Environment::optimize() {
   optimized_graph_ = graph_;
 }
 
+void recursive_construct(Reactor* container) {
+  container->construct();
+  for (auto* reactor : container->reactors()) {
+    recursive_construct(reactor);
+  }
+}
+
+void Environment::construct() {
+    // phase_ = Phase::Assembly;
+
+    log::Info() << "Start Contruction of reactors";
+    for (auto* reactor : top_level_reactors_) {
+        recursive_construct(reactor);
+    }
+
+    for (auto* env : contained_environments_) {
+        env->construct();
+    }
+}
+
 void recursive_assemble(Reactor* container) {
   container->assemble();
   for (auto* reactor : container->reactors()) {
@@ -80,7 +100,7 @@ void Environment::assemble() { // NOLINT(readability-function-cognitive-complexi
   // constructing all the reactors
   // this mainly tell the reactors that they should connect their ports and actions not ports and ports
 
-  log::Debug() << "start assembly of reactors";
+  log::Info() << "start assembly of reactors";
   for (auto* reactor : top_level_reactors_) {
     recursive_assemble(reactor);
   }
@@ -112,6 +132,8 @@ void Environment::assemble() { // NOLINT(readability-function-cognitive-complexi
           source_port->add_outward_binding(destination_port);
           log::Debug() << "from: " << source_port->fqn() << "(" << source_port << ")"
                        << " --> to: " << destination_port->fqn() << "(" << destination_port << ")";
+          reactor::validate(source_port != destination_port,
+                            "Self wiring detected; from " + source_port->fqn() + " --> " + destination_port->fqn());
         }
       } else {
         if (properties.type_ == ConnectionType::Enclaved || properties.type_ == ConnectionType::PhysicalEnclaved ||
@@ -221,6 +243,8 @@ void Environment::export_dependency_graph(const std::string& path) {
   std::ofstream dot;
   dot.open(path);
 
+  dependency_graph_and_indexes();
+
   // sort all reactions_ by their index
   std::map<unsigned int, std::vector<Reaction*>> reactions_by_index;
   for (auto* reaction : reactions_) {
@@ -317,7 +341,7 @@ auto Environment::startup() -> std::thread {
   return startup(get_physical_time());
 }
 
-auto Environment::startup(const TimePoint& start_time) -> std::thread {
+void Environment::dependency_graph_and_indexes() {
   validate(this->phase() == Phase::Assembly, "startup() may only be called during assembly phase!");
 
   log::Debug() << "Building the Dependency-Graph";
@@ -327,7 +351,17 @@ auto Environment::startup(const TimePoint& start_time) -> std::thread {
 
   calculate_indexes();
 
-  log_.debug() << "Starting the execution";
+  phase_ = Phase::Indexing;
+}
+
+auto Environment::startup(const TimePoint& start_time) -> std::thread {
+  if (phase_ == Phase::Assembly) {
+    dependency_graph_and_indexes();
+  }
+
+  validate(this->phase() == Phase::Indexing, "startup() may only be called during Indexing phase!");
+
+  log_.info() << "Starting the execution";
   phase_ = Phase::Startup;
 
   this->start_tag_ = Tag::from_physical_time(start_time);

lib/reactor.cc

@@ -47,7 +47,7 @@ void Reactor::register_output(BasePort* port) {
   reactor_assert(port != nullptr);
   reactor::validate(this->environment()->phase() == Phase::Construction,
                     "Ports can only be registered during construction phase!");
-  [[maybe_unused]] bool result = inputs_.insert(port).second;
+  [[maybe_unused]] bool result = outputs_.insert(port).second;
   reactor_assert(result);
   Statistics::increment_ports();
 }