Try to fix a failure about mutex freed too early in RMA

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

diff --git a/src/kernel/activity/ActivityImpl.hpp b/src/kernel/activity/ActivityImpl.hpp
index 327c300..cbabdcd 100644 (file)
--- a/src/kernel/activity/ActivityImpl.hpp
+++ b/src/kernel/activity/ActivityImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2022. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2023. 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. */
@@ -6,38 +6,37 @@
 #ifndef SIMGRID_KERNEL_ACTIVITY_ACTIVITYIMPL_HPP
 #define SIMGRID_KERNEL_ACTIVITY_ACTIVITYIMPL_HPP
 
-#include <list>
-#include <string>
-#include <string_view>
-
 #include "simgrid/forward.h"
-#include <xbt/utility.hpp>
+#include "simgrid/kernel/resource/Action.hpp"
+#include "simgrid/simix.hpp"
+#include "src/kernel/actor/Simcall.hpp"
+#include "xbt/utility.hpp"
 
 #include <atomic>
-#include <simgrid/kernel/resource/Action.hpp>
-#include <simgrid/simix.hpp>
+#include <list>
+#include <string>
+#include <string_view>
 
-namespace simgrid {
-namespace kernel {
-namespace activity {
+namespace simgrid::kernel::activity {
 
 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 {
+class XBT_PUBLIC ActivityImpl : public kernel::actor::ObjectAccessSimcallItem {
   std::atomic_int_fast32_t refcount_{0};
-  std::string name_ = "";
+  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;
+  std::vector<s4u::Host*> hosts_;
 
 public:
   virtual ~ActivityImpl();
   ActivityImpl() = default;
   std::list<actor::Simcall*> simcalls_; /* List of simcalls waiting for this activity */
-  s4u::Activity* piface_         = nullptr;
-  resource::Action* surf_action_ = nullptr;
+  s4u::Activity* piface_          = nullptr;
+  resource::Action* model_action_ = nullptr; /* The resource consumption in the used model */
 
 protected:
   void inline set_name(std::string_view name)
@@ -47,6 +46,9 @@ protected:
     name_ = name;
   }
   void set_start_time(double start_time) { start_time_ = start_time; }
+  void clear_hosts() { hosts_.clear(); }
+  void add_host(s4u::Host* host) { hosts_.push_back(host); }
+  void set_hosts(const std::vector<s4u::Host*>& hosts) { hosts_ = hosts; }
 
 public:
   const std::string& get_name() const { return name_; }
@@ -77,11 +79,11 @@ public:
   virtual void resume();
   virtual void cancel();
 
-  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 finish() = 0; // Setups the status, clean things up, unlock all simcalls blocked on that activity.
+
+  s4u::Host* get_host() const { return hosts_.front(); }
+  const std::vector<s4u::Host*>& get_hosts() const { return hosts_; };
 
   void register_simcall(actor::Simcall* simcall);
   void unregister_simcall(actor::Simcall* simcall);
@@ -115,8 +117,6 @@ public:
   const std::string& get_tracing_category() const { return tracing_category_; }
 };
 
-} // namespace activity
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::activity
 
 #endif /* SIMGRID_KERNEL_ACTIVITY_ACTIVITYIMPL_HPP */