Move hosts_ to ActivityImpl_ to allow tracking of detached comms by maestro

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

diff --git a/src/kernel/activity/ExecImpl.hpp b/src/kernel/activity/ExecImpl.hpp
index a7e5f57..a6c691b 100644 (file)
--- a/src/kernel/activity/ExecImpl.hpp
+++ b/src/kernel/activity/ExecImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2021. 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. */
@@ -11,28 +11,20 @@
 #include "src/kernel/activity/ActivityImpl.hpp"
 #include "src/kernel/context/Context.hpp"
 
-namespace simgrid {
-namespace kernel {
-namespace activity {
+namespace simgrid::kernel::activity {
 
 class XBT_PUBLIC ExecImpl : public ActivityImpl_T<ExecImpl> {
   std::unique_ptr<resource::Action, std::function<void(resource::Action*)>> timeout_detector_{
       nullptr, [](resource::Action* a) { a->unref(); }};
-  actor::ActorImpl* actor_            = nullptr;
   double sharing_penalty_             = 1.0;
   double bound_                       = 0.0;
-  double start_time_                  = -1.0;
-  double finish_time_                 = -1.0;
-  std::vector<s4u::Host*> hosts_;
   std::vector<double> flops_amounts_;
   std::vector<double> bytes_amounts_;
-  s4u::Exec* piface_;
+  int thread_count_ = 1;
   int cb_id_ = -1; // callback id from Host::on_state_change.connect()
 
 public:
   ExecImpl();
-  s4u::Exec* get_iface() { return piface_; }
-  actor::ActorImpl* get_actor() { return actor_; }
 
   ExecImpl& set_timeout(double timeout) override;
   ExecImpl& set_bound(double bound);
@@ -41,10 +33,6 @@ public:
 
   void set_cb_id(unsigned int cb_id) { cb_id_ = cb_id; }
 
-  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_; }
-
   ExecImpl& set_flops_amount(double flop_amount);
   ExecImpl& set_host(s4u::Host* host);
   s4u::Host* get_host() const { return hosts_.front(); }
@@ -52,9 +40,10 @@ public:
 
   ExecImpl& set_flops_amounts(const std::vector<double>& flops_amounts);
   ExecImpl& set_bytes_amounts(const std::vector<double>& bytes_amounts);
+  ExecImpl& set_thread_count(int thread_count);
   ExecImpl& set_hosts(const std::vector<s4u::Host*>& hosts);
 
-  unsigned int get_host_number() const { return hosts_.size(); }
+  unsigned int get_host_number() const { return static_cast<unsigned>(hosts_.size()); }
   double get_seq_remaining_ratio();
   double get_par_remaining_ratio();
   double get_remaining() const override;
@@ -65,11 +54,9 @@ public:
   void set_exception(actor::ActorImpl* issuer) override;
   void finish() override;
 
-  static void wait_any_for(actor::ActorImpl* issuer, const std::vector<ExecImpl*>& execs, double timeout);
+  void reset();
 
   static xbt::signal<void(ExecImpl const&, s4u::Host*)> on_migration;
 };
-} // namespace activity
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::activity
 #endif