Make CommDet a plugin on top of Safety

[simgrid.git] / src / kernel / activity / ActivityImpl.hpp

diff --git a/src/kernel/activity/ActivityImpl.hpp b/src/kernel/activity/ActivityImpl.hpp
index 9ea942203d803e06e1a6d814983605b6999aee60..7acbe2b3a8db8c23f9dd57b17bf659b9457c6e69 100644 (file)
--- a/src/kernel/activity/ActivityImpl.hpp
+++ b/src/kernel/activity/ActivityImpl.hpp
@@ -26,17 +26,17 @@ XBT_DECLARE_ENUM_CLASS(State, WAITING, READY, RUNNING, DONE, CANCELED, FAILED, S
 class XBT_PUBLIC ActivityImpl {
   std::atomic_int_fast32_t refcount_{0};
   std::string name_ = "";
+  actor::ActorImpl* actor_ = nullptr;
+  State state_             = State::WAITING; /* State of the activity */
+  double start_time_       = -1.0;
+  double finish_time_      = -1.0;
 
 public:
   virtual ~ActivityImpl();
   ActivityImpl() = default;
-  State state_   = State::WAITING;      /* State of the activity */
   std::list<smx_simcall_t> simcalls_;   /* List of simcalls waiting for this activity */
-  resource::Action* surf_action_ = nullptr;
-  actor::ActorImpl* actor_       = nullptr;
   s4u::Activity* piface_         = nullptr;
-  double start_time_             = -1.0;
-  double finish_time_            = -1.0;
+  resource::Action* surf_action_ = nullptr;
 
 protected:
   void inline set_name(const std::string& name)
@@ -45,6 +45,7 @@ protected:
     // child type
     name_ = name;
   }
+  void set_start_time(double start_time) { start_time_ = start_time; }
 
 public:
   const std::string& get_name() const { return name_; }
@@ -56,12 +57,19 @@ public:
   void set_iface(s4u::Activity* iface) { piface_ = iface; }
   s4u::Activity* get_iface() { return piface_; }
 
+  void set_state(State state) { state_ = state; }
+  const State& get_state() const { return state_; }
+  const char* get_state_str() const;
+
   double get_start_time() const { return start_time_; }
   void set_finish_time(double finish_time) { finish_time_ = finish_time; }
   double get_finish_time() const { return finish_time_; }
 
-  virtual bool test();
+  virtual bool test(actor::ActorImpl* issuer);
+  static ssize_t test_any(actor::ActorImpl* issuer, const std::vector<ActivityImpl*>& activities);
+
   virtual void wait_for(actor::ActorImpl* issuer, double timeout);
+  static void wait_any_for(actor::ActorImpl* issuer, const std::vector<ActivityImpl*>& activities, double timeout);
   virtual ActivityImpl& set_timeout(double) { THROW_UNIMPLEMENTED; }
 
   virtual void suspend();
@@ -76,9 +84,9 @@ public:
 
   void register_simcall(smx_simcall_t simcall);
   void unregister_simcall(smx_simcall_t simcall);
+  void handle_activity_waitany(smx_simcall_t simcall);
   void clean_action();
   virtual double get_remaining() const;
-  const char* get_state_str() const;
   // Support for the boost::intrusive_ptr<ActivityImpl> datatype
   friend XBT_PUBLIC void intrusive_ptr_add_ref(ActivityImpl* activity);
   friend XBT_PUBLIC void intrusive_ptr_release(ActivityImpl* activity);
@@ -91,7 +99,6 @@ public:
  * The difficulty is that set_name() must return a qualified child class, not the generic ancestor
  * But the getter is still in the ancestor to be usable on generic activities with no downcast */
 template <class AnyActivityImpl> class ActivityImpl_T : public ActivityImpl {
-private:
   std::string tracing_category_ = "";
 
 public: