mutation fixes

Signed-off-by: tanneberger <[email protected]>

Author: OmerMajNition

examples/multiport_mutation/consumer.hh

@@ -18,8 +18,8 @@ private:
 
     [[maybe_unused]] const Inner& __lf_inner = *this;
 
-    void reaction_1([[maybe_unused]] const Input<unsigned>& scale) {
-      std::cout << "consumer: " << index_ << " received value!" << std::endl;
+    void reaction_1([[maybe_unused]] const Input<unsigned>& in) {
+      std::cout << "consumer: " << index_ << " received value:" << *in.get() << std::endl;
     }
 
     friend Consumer;

examples/multiport_mutation/load_balancer.hh

@@ -24,9 +24,9 @@ private:
       if (rand() % 30 == 0) {
         scale_action.schedule(rand() % 20 + 1);
       }
-
-      std::cout << "multiport size: " << outbound.size() << std::endl;
-      outbound[rand() % outbound.size()].set(inbound.get());
+      unsigned sel = rand() % outbound.size();
+      std::cout << "Sending out to:" << sel << std::endl;
+      outbound[sel].set(inbound.get());
     }
 
     void reaction_2(ModifableMultiport<Output<unsigned>>&outbound, [[maybe_unused]] const LogicalAction<unsigned>& scale, Output<unsigned>& scale_bank) {
@@ -74,6 +74,7 @@ public:
     }
     process.declare_trigger(&inbound);
     scale.declare_trigger(&scale_action);
+    scale.declare_antidependency(&scale_bank);
   }
 };
 

examples/multiport_mutation/main.cc

@@ -47,12 +47,12 @@ class Inner: public MutableScope {
         }
       } else {
         std::cout << "load_balancer size:" << load_balancer.size() << " bank size: " << reactor_bank.size() << std::endl;
-        for (auto i = 0; i < new_size - old_size; i++) {
-            std::cout << "add connection: " << i + old_size << std::endl;
-            MutationAddConnection<Output<unsigned>, Input<unsigned>> add_conn{&load_balancer[i + old_size], &reactor_bank[i + old_size].get()->in, reactor_};
+        for (auto i = 0; i < new_size; i++) {
+            std::cout << "add connection: " << i << std::endl;
+            MutationAddConnection<Output<unsigned>, Input<unsigned>> add_conn{&load_balancer[i], &reactor_bank[i].get()->in, reactor_};
             add_to_transaction(&add_conn);
-            commit_transaction();
         }
+        commit_transaction(true);
       }
 
       std::cout << "new bank size:" << reactor_bank.size() << std::endl;
@@ -90,7 +90,7 @@ class Inner: public MutableScope {
 
 auto main() -> int {
   //srand(time(nullptr));
-  Environment env{4};
+  Environment env{4, true};
   auto deployment = std::make_unique<Deployment>("c1", &env);
   env.optimize();
   env.assemble();

examples/multiport_mutation/producer.hh

@@ -16,10 +16,11 @@ private:
   Reaction r_timer{"r_timer", 1, this, [this]() { __lf_inner.reaction_1(this->value);}};
 
   class Inner: public Scope {
+    unsigned itr = 0;
     [[maybe_unused]] const Inner& __lf_inner = *this;
     void reaction_1([[maybe_unused]] Output<unsigned>& out) {
-      std::cout << "producing value" << std::endl;
-      out.set(42);
+      std::cout << "producing value:" << itr << std::endl;
+      out.set(itr++);
     }
     explicit Inner(Reactor* reactor) : Scope(reactor) {}
 

include/reactor-cpp/environment.hh

@@ -84,6 +84,7 @@ public:
   //TODO: fix visebility
   void calculate_indexes();
   void build_dependency_graph(Reactor* reactor);
+  void clear_dependency_graph();
 
 
   explicit Environment(unsigned int num_workers, bool fast_fwd_execution = default_fast_fwd_execution,

include/reactor-cpp/graph.hh

@@ -54,7 +54,14 @@ public:
       std::vector<std::pair<P, E>> edges{std::make_pair(properties, destination)};
       graph_[source] = edges;
     } else {
-      graph_[source].emplace_back(properties, destination);
+        auto &edges = graph_[source];
+        auto duplicate = std::find_if(edges.begin(), edges.end(),
+                                       [&](const std::pair<P, E>& edge) {
+                                        return edge.first == properties && edge.second == destination;
+                                       });
+        if (duplicate == edges.end()) {
+            graph_[source].emplace_back(properties, destination);
+        }
     }
   }
 

include/reactor-cpp/reaction.hh

@@ -27,7 +27,6 @@ private:
   std::set<BasePort*> dependencies_;
 
   const int priority_ = -1;
-  const bool mutation_;
   unsigned int index_ = -1;
 
   std::function<void(void)> body_{nullptr};
@@ -53,6 +52,7 @@ public:
   [[nodiscard]] auto port_triggers() const noexcept -> const auto& { return port_trigger_; }
 
   [[maybe_unused]] [[nodiscard]] auto antidependencies() const noexcept -> const auto& { return antidependencies_; }
+  [[maybe_unused]] void clear_antidependencies() noexcept { antidependencies_.clear(); }
 
   [[nodiscard]] auto dependencies() const noexcept -> const auto& { return dependencies_; }
 

include/reactor-cpp/scopes.hh

@@ -43,7 +43,7 @@ public:
   explicit MutableScope(Reactor* reactor) : Scope(reactor), transaction_(reactor), reactor_(reactor), env_(reactor->environment()) {}
   ~MutableScope() = default;
 
-  void commit_transaction();
+  void commit_transaction(bool recalculate = false);
   void add_to_transaction(Mutation* mutation);
 
 };

include/reactor-cpp/transaction.hh

@@ -21,7 +21,6 @@ class Environment;
 
 class Transaction {
 private:
-  Reactor* parent_ = nullptr;
   Environment* environment_ = nullptr;
   std::vector<Mutation*> mutations_{};
 
@@ -30,7 +29,7 @@ public:
   ~Transaction() = default;
 
   void push_back(Mutation* mutation);
-  auto execute() -> MutationResult;
+  auto execute(bool recalculate = false) -> MutationResult;
 };
 }
 #endif // REACTOR_CPP_TRANSACTION_HH

lib/environment.cc

@@ -144,6 +144,11 @@ void Environment::assemble() { // NOLINT(readability-function-cognitive-complexi
   }
 }
 
+void Environment::clear_dependency_graph() {
+    dependencies_.clear();
+    reactions_.clear();
+}
+
 void Environment::build_dependency_graph(Reactor* reactor) {
   // obtain dependencies from each contained reactor
   for (auto* sub_reactor : reactor->reactors()) {
@@ -157,23 +162,14 @@ void Environment::build_dependency_graph(Reactor* reactor) {
     validate(result.second, "priorities must be unique for all reactions_ of the same reactor");
   }
 
-  dependencies_.clear(); //TODO: fix
-
   // connect all reactions_ this reaction depends on
   for (auto* reaction : reactor->reactions()) {
-    std::set<BasePort*> dependencies = reaction->dependencies();
-    for (auto* dependency : dependencies) {
-        if (dependency <= (BasePort*)0x100) {
-          std::cout << "FUCK" << std::endl;
-        }
-      while (dependency->has_inward_binding()) {
-        if (dependency <= (BasePort*)0x100) {
-          std::cout << "FUCK" << std::endl;
-        }
-        dependency = dependency->inward_binding();
+    for (auto* dependency : reaction->dependencies()) {
+      auto* source = dependency;
+      while (source->has_inward_binding()) {
+        source = source->inward_binding();
       }
-      std::cout << "anti deps of: " << dependency->fqn() << "(" << dependency << ")" << std::endl;
-      for (auto* antidependency : dependency->anti_dependencies()) {
+      for (auto* antidependency : source->anti_dependencies()) {
         dependencies_.emplace_back(reaction, antidependency);
       }
     }