Introduce on_???_cb functions to shield the signals

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

diff --git a/src/kernel/activity/ActivityImpl.hpp b/src/kernel/activity/ActivityImpl.hpp
index 4ba527358631c8cba635772201a2f96084454502..f136cc4ee2a1fbce38cc6a11de3d8d7bd5dcde2c 100644 (file)
--- a/src/kernel/activity/ActivityImpl.hpp
+++ b/src/kernel/activity/ActivityImpl.hpp
@@ -33,6 +33,10 @@ public:
   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;
 
 protected:
   void inline set_name(const std::string& name)
@@ -46,8 +50,18 @@ public:
   const std::string& get_name() const { return name_; }
   const char* get_cname() const { return name_.c_str(); }
 
-  bool test();
-  void wait_for(actor::ActorImpl* issuer, double timeout);
+  void set_actor(actor::ActorImpl* actor) { actor_ = actor; }
+  actor::ActorImpl* get_actor() const { return actor_; }
+
+  void set_iface(s4u::Activity* iface) { piface_ = iface; }
+  s4u::Activity* get_iface() { return piface_; }
+
+  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 void wait_for(actor::ActorImpl* issuer, double timeout);
   virtual ActivityImpl& set_timeout(double) { THROW_UNIMPLEMENTED; }
 
   virtual void suspend();
@@ -56,10 +70,12 @@ public:
 
   virtual void post() = 0; // Called by the main loop when the activity is marked as terminated or failed by its model.
                            // Setups the status, clean things up, and call finish()
+  virtual void set_exception(actor::ActorImpl* issuer) = 0; // Raising exceptions and stuff
   virtual void finish() = 0; // Unlock all simcalls blocked on that activity, either because it was marked as done by
                              // the model or because it terminated without waiting for the model
 
-  virtual void register_simcall(smx_simcall_t simcall);
+  void register_simcall(smx_simcall_t simcall);
+  void unregister_simcall(smx_simcall_t simcall);
   void clean_action();
   virtual double get_remaining() const;
   const char* get_state_str() const;