fixing

Author: tanneberger

examples/power_train/main.cc

@@ -140,7 +140,7 @@ class Engine : public Reactor {
 public:
   // ports
   Input<void> torque{"torque", this}; // NOLINT
-
+  Multiport<int> control_input;
 private:
   // reactions_
   Reaction r1{"1", 1, this, [this]() { reaction_1(); }};
@@ -180,3 +180,12 @@ auto main() -> int {
 
   return 0;
 }
+
+class ReactionScope : public MutableScope<Engine> {
+  void reaction_0() {
+    MutationChangeMultiportSize<int> change_multiport_width{&this->self_->control_input, 6};
+    this->add_to_transaction(&change_multiport_width);
+
+    this->commit_transaction();
+  }
+};

include/reactor-cpp/scops.hh

@@ -43,9 +43,8 @@ public:
   explicit MutableScope(reactor::Reactor* reactor) : Scope(reactor), self_(reactor), env_(reactor->environment()) {}
   ~MutableScope() = default;
 
-  void begin_transaction();
-  void end_transaction();
-  void mutate(const std::unique_ptr<Mutation>&& mutation);
+  void commit_transaction();
+  void add_to_transaction(Mutation* mutation);
 
 };
 

include/reactor-cpp/transaction.hh

@@ -24,21 +24,24 @@ enum MutationResult {
 
 class Mutation {
 public:
+  virtual ~Mutation() = default;
   virtual auto run() -> MutationResult = 0 ;
-
+  virtual auto rollback() -> MutationResult = 0;
 };
 
 template<class T>
 class MutationChangeMultiportSize : public Mutation {
 private:
   Multiport<T>* multiport_ = nullptr;
   std::size_t desired_size_ = 0;
+  std::size_t size_before_application_ = 0;
 public:
   MutationChangeMultiportSize(Multiport<T>* multiport, std::size_t size);
-  ~MutationChangeMultiportSize() = default;
-  void run() override;
-};
+  ~MutationChangeMultiportSize() override = default;
 
+  auto run() -> MutationResult override;
+  auto rollback() -> MutationResult override;
+};
 
 class Transaction {
 private:
@@ -47,9 +50,8 @@ private:
   std::vector<Mutation*> mutations_{};
 
 public:
-  void reset();
+  void push_back(Mutation* mutation);
   auto execute() -> MutationResult;
-
 };
 }
 #endif // REACTOR_CPP_TRANSACTION_HH

lib/transaction.cc

@@ -8,10 +8,18 @@ reactor::MutationChangeMultiportSize<T>::MutationChangeMultiportSize(Multiport<T
 }
 
 template<class T>
-void reactor::MutationChangeMultiportSize<T>::run() {
+auto reactor::MutationChangeMultiportSize<T>::run() -> MutationResult {
   multiport_->ports_.resize(desired_size_);
+
+  return Success;
+}
+
+template <class T>
+auto reactor::MutationChangeMultiportSize<T>::rollback() -> MutationResult {
+  return Success;
 }
 
+
 auto reactor::Transaction::execute() -> MutationResult {
   for (auto *mutation : mutations_) {
     mutation->run();
@@ -20,6 +28,6 @@ auto reactor::Transaction::execute() -> MutationResult {
   return Success;
 }
 
-void reactor::Transaction::reset() {
-    mutations_.clear();
+void reactor::Transaction::push_back(reactor::Mutation* mutation) {
+  mutations_.push_back(mutation);
 }