Split TransitionAny and TransitionRandom to their own files

[simgrid.git] / src / kernel / actor / SimcallObserver.hpp

diff --git a/src/kernel/actor/SimcallObserver.hpp b/src/kernel/actor/SimcallObserver.hpp
index 54169d5..4242b2d 100644 (file)
--- a/src/kernel/actor/SimcallObserver.hpp
+++ b/src/kernel/actor/SimcallObserver.hpp
@@ -7,7 +7,7 @@
 #define SIMGRID_MC_SIMCALL_OBSERVER_HPP
 
 #include "simgrid/forward.h"
-#include "src/mc/api/Transition.hpp"
+#include "src/mc/transition/Transition.hpp"
 #include "xbt/asserts.h"
 
 #include <string>
@@ -27,7 +27,7 @@ public:
    * For example, a mutex_lock is not enabled when the mutex is not free.
    * A comm_receive is not enabled before the corresponding send has been issued.
    */
-  virtual bool is_enabled() const { return true; }
+  virtual bool is_enabled() { return true; }
 
   /** Returns the amount of time that this transition can be used.
    *
@@ -35,7 +35,7 @@ public:
    * If it's more than one (as with mc_random or waitany), we need to consider this transition several times to start
    * differing branches
    */
-  virtual int get_max_consider() const { return 1; }
+  virtual int get_max_consider() { return 1; }
 
   /** Prepares the simcall to be used.
    *
@@ -82,7 +82,7 @@ public:
     xbt_assert(min < max);
   }
   void serialize(std::stringstream& stream) const override;
-  int get_max_consider() const override;
+  int get_max_consider() override;
   void prepare(int times_considered) override;
   int get_value() const { return next_value_; }
   bool depends(SimcallObserver* other) override;
@@ -109,7 +109,7 @@ public:
       : MutexSimcall(actor, mutex), blocking_(blocking)
   {
   }
-  bool is_enabled() const override;
+  bool is_enabled() override;
 };
 
 class ConditionWaitSimcall : public ResultingSimcall<bool> {
@@ -123,7 +123,7 @@ public:
       : ResultingSimcall(actor, false), cond_(cond), mutex_(mutex), timeout_(timeout)
   {
   }
-  bool is_enabled() const override;
+  bool is_enabled() override;
   bool is_visible() const override { return false; }
   activity::ConditionVariableImpl* get_cond() const { return cond_; }
   activity::MutexImpl* get_mutex() const { return mutex_; }
@@ -139,7 +139,7 @@ public:
       : ResultingSimcall(actor, false), sem_(sem), timeout_(timeout)
   {
   }
-  bool is_enabled() const override;
+  bool is_enabled() override;
   bool is_visible() const override { return false; }
   activity::SemaphoreImpl* get_sem() const { return sem_; }
   double get_timeout() const { return timeout_; }
@@ -160,15 +160,15 @@ public:
 
 class ActivityTestanySimcall : public ResultingSimcall<ssize_t> {
   const std::vector<activity::ActivityImpl*>& activities_;
+  std::vector<int> indexes_; // indexes in activities_ pointing to ready activities (=whose test() is positive)
   int next_value_ = 0;
 
 public:
-  ActivityTestanySimcall(ActorImpl* actor, const std::vector<activity::ActivityImpl*>& activities)
-      : ResultingSimcall(actor, -1), activities_(activities)
-  {
-  }
+  ActivityTestanySimcall(ActorImpl* actor, const std::vector<activity::ActivityImpl*>& activities);
   bool is_visible() const override { return true; }
-  int get_max_consider() const override;
+  bool is_enabled() override { return true; /* can return -1 if no activity is ready */ }
+  void serialize(std::stringstream& stream) const override;
+  int get_max_consider() override;
   void prepare(int times_considered) override;
   const std::vector<activity::ActivityImpl*>& get_activities() const { return activities_; }
   int get_value() const { return next_value_; }
@@ -185,7 +185,7 @@ public:
   }
   void serialize(std::stringstream& stream) const override;
   bool is_visible() const override { return true; }
-  bool is_enabled() const override;
+  bool is_enabled() override;
   activity::ActivityImpl* get_activity() const { return activity_; }
   void set_activity(activity::ActivityImpl* activity) { activity_ = activity; }
   double get_timeout() const { return timeout_; }
@@ -193,18 +193,17 @@ public:
 
 class ActivityWaitanySimcall : public ResultingSimcall<ssize_t> {
   const std::vector<activity::ActivityImpl*>& activities_;
+  std::vector<int> indexes_; // indexes in activities_ pointing to ready activities (=whose test() is positive)
   const double timeout_;
   int next_value_ = 0;
 
 public:
-  ActivityWaitanySimcall(ActorImpl* actor, const std::vector<activity::ActivityImpl*>& activities, double timeout)
-      : ResultingSimcall(actor, -1), activities_(activities), timeout_(timeout)
-  {
-  }
-  bool is_enabled() const override;
+  ActivityWaitanySimcall(ActorImpl* actor, const std::vector<activity::ActivityImpl*>& activities, double timeout);
+  bool is_enabled() override;
+  void serialize(std::stringstream& stream) const override;
   bool is_visible() const override { return true; }
   void prepare(int times_considered) override;
-  int get_max_consider() const override;
+  int get_max_consider() override;
   const std::vector<activity::ActivityImpl*>& get_activities() const { return activities_; }
   double get_timeout() const { return timeout_; }
   int get_value() const { return next_value_; }
@@ -218,12 +217,14 @@ class CommIsendSimcall : public SimcallObserver {
   size_t src_buff_size_;
   void* payload_;
   bool detached_;
+  activity::CommImpl* comm_;
+  int tag_;
 
-public:
   bool (*match_fun_)(void*, void*, activity::CommImpl*);
   void (*clean_fun_)(void*); // used to free the synchro in case of problem after a detached send
   void (*copy_data_fun_)(activity::CommImpl*, void*, size_t); // used to copy data if not default one
 
+public:
   CommIsendSimcall(ActorImpl* actor, activity::MailboxImpl* mbox, double payload_size, double rate,
                    unsigned char* src_buff, size_t src_buff_size, bool (*match_fun)(void*, void*, activity::CommImpl*),
                    void (*clean_fun)(void*), // used to free the synchro in case of problem after a detached send
@@ -251,6 +252,12 @@ public:
   size_t get_src_buff_size() const { return src_buff_size_; }
   void* get_payload() const { return payload_; }
   bool is_detached() const { return detached_; }
+  void set_comm(activity::CommImpl* comm) { comm_ = comm; }
+  void set_tag(int tag) { tag_ = tag; }
+
+  auto get_match_fun() const { return match_fun_; }
+  auto get_clean_fun() const { return clean_fun_; }
+  auto get_copy_data_fun() const { return copy_data_fun_; }
 };
 
 class CommIrecvSimcall : public SimcallObserver {
@@ -259,11 +266,13 @@ class CommIrecvSimcall : public SimcallObserver {
   size_t* dst_buff_size_;
   void* payload_;
   double rate_;
+  int tag_;
+  activity::CommImpl* comm_;
 
-public:
   bool (*match_fun_)(void*, void*, activity::CommImpl*);
   void (*copy_data_fun_)(activity::CommImpl*, void*, size_t); // used to copy data if not default one
 
+public:
   CommIrecvSimcall(ActorImpl* actor, activity::MailboxImpl* mbox, unsigned char* dst_buff, size_t* dst_buff_size,
                    bool (*match_fun)(void*, void*, activity::CommImpl*),
                    void (*copy_data_fun)(activity::CommImpl*, void*, size_t), void* payload, double rate)
@@ -284,6 +293,11 @@ public:
   unsigned char* get_dst_buff() const { return dst_buff_; }
   size_t* get_dst_buff_size() const { return dst_buff_size_; }
   void* get_payload() const { return payload_; }
+  void set_comm(activity::CommImpl* comm) { comm_ = comm; }
+  void set_tag(int tag) { tag_ = tag; }
+
+  auto get_match_fun() const { return match_fun_; };
+  auto get_copy_data_fun() const { return copy_data_fun_; }
 };
 
 } // namespace actor