Merge branch 'dev/s4u_tuto_fixes' into 'master'

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

diff --git a/src/kernel/activity/ExecImpl.hpp b/src/kernel/activity/ExecImpl.hpp
index 0aefc025267d0f007f85e7ddff478ff00a7809c3..71331543e5b79672ca88e0e884397e868643e886 100644 (file)
--- a/src/kernel/activity/ExecImpl.hpp
+++ b/src/kernel/activity/ExecImpl.hpp
@@ -23,6 +23,7 @@ class XBT_PUBLIC ExecImpl : public ActivityImpl_T<ExecImpl> {
   std::vector<s4u::Host*> hosts_;
   std::vector<double> flops_amounts_;
   std::vector<double> bytes_amounts_;
+  int thread_count_ = 1;
   int cb_id_ = -1; // callback id from Host::on_state_change.connect()
 
 public:
@@ -42,9 +43,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;
@@ -56,7 +58,6 @@ public:
   void finish() override;
 
   void reset();
-  static void wait_any_for(actor::ActorImpl* issuer, const std::vector<ExecImpl*>& execs, double timeout);
 
   static xbt::signal<void(ExecImpl const&, s4u::Host*)> on_migration;
 };