Start to modernize the remaining old simcalls related to comms

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

diff --git a/src/kernel/activity/ActivityImpl.hpp b/src/kernel/activity/ActivityImpl.hpp
index fcda330..7acbe2b 100644 (file)
--- a/src/kernel/activity/ActivityImpl.hpp
+++ b/src/kernel/activity/ActivityImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2022. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -9,8 +9,8 @@
 #include <string>
 #include <list>
 
-#include <xbt/base.h>
 #include "simgrid/forward.h"
+#include <xbt/utility.hpp>
 
 #include <atomic>
 #include <simgrid/kernel/resource/Action.hpp>
@@ -19,30 +19,23 @@
 namespace simgrid {
 namespace kernel {
 namespace activity {
-enum class State {
-  WAITING = 0,
-  READY,
-  RUNNING,
-  DONE,
-  CANCELED,
-  FAILED,
-  SRC_HOST_FAILURE,
-  DST_HOST_FAILURE,
-  TIMEOUT,
-  SRC_TIMEOUT,
-  DST_TIMEOUT,
-  LINK_FAILURE
-};
+
+XBT_DECLARE_ENUM_CLASS(State, WAITING, READY, RUNNING, DONE, CANCELED, FAILED, SRC_HOST_FAILURE, DST_HOST_FAILURE,
+                       TIMEOUT, SRC_TIMEOUT, DST_TIMEOUT, LINK_FAILURE);
 
 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 */
+  s4u::Activity* piface_         = nullptr;
   resource::Action* surf_action_ = nullptr;
 
 protected:
@@ -52,13 +45,31 @@ protected:
     // child type
     name_ = name;
   }
+  void set_start_time(double start_time) { start_time_ = start_time; }
 
 public:
-  const std::string& get_name() { return name_; }
-  const char* get_cname() { return name_.c_str(); }
+  const std::string& get_name() const { return name_; }
+  const char* get_cname() const { return name_.c_str(); }
+
+  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_; }
+
+  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(actor::ActorImpl* issuer);
+  static ssize_t test_any(actor::ActorImpl* issuer, const std::vector<ActivityImpl*>& activities);
 
-  bool test();
-  void wait_for(actor::ActorImpl* issuer, double timeout);
+  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();
@@ -67,10 +78,13 @@ 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 handle_activity_waitany(smx_simcall_t simcall);
   void clean_action();
   virtual double get_remaining() const;
   // Support for the boost::intrusive_ptr<ActivityImpl> datatype
@@ -85,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:
@@ -100,7 +113,7 @@ public:
     tracing_category_ = category;
     return static_cast<AnyActivityImpl&>(*this);
   }
-  const std::string& get_tracing_category() { return tracing_category_; }
+  const std::string& get_tracing_category() const { return tracing_category_; }
 };
 
 } // namespace activity