X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/16e27d2a68b9d21536c50eddff53fb68caa30d91..1f5cc4e090af49a98da0e25e9ee21a8ce6ce30f8:/src/kernel/activity/ExecImpl.hpp

diff --git a/src/kernel/activity/ExecImpl.hpp b/src/kernel/activity/ExecImpl.hpp
index 24f8467d66..e02c10f2d3 100644
--- a/src/kernel/activity/ExecImpl.hpp
+++ b/src/kernel/activity/ExecImpl.hpp
@@ -1,42 +1,68 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2021. 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. */
 
-#ifndef SIMIX_SYNCHRO_EXEC_HPP
-#define SIMIX_SYNCHRO_EXEC_HPP
+#ifndef SIMGRID_KERNEL_ACTIVITY_EXEC_HPP
+#define SIMGRID_KERNEL_ACTIVITY_EXEC_HPP
+
+#include <simgrid/s4u/Exec.hpp>
 
 #include "src/kernel/activity/ActivityImpl.hpp"
-#include "surf/surf.hpp"
+#include "src/kernel/context/Context.hpp"
 
 namespace simgrid {
 namespace kernel {
 namespace activity {
 
-XBT_PUBLIC_CLASS ExecImpl : public ActivityImpl
-{
-  ~ExecImpl() override;
-
+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 cb_id_ = -1; // callback id from Host::on_state_change.connect()
 public:
-  explicit ExecImpl(const char* name, sg_host_t host);
-  void suspend() override;
-  void resume() override;
-  void post() override;
-  double remains();
-  double remainingRatio();
-  void setBound(double bound);
+  ExecImpl();
+  s4u::Exec* get_iface() { return piface_; }
+
+  ExecImpl& set_timeout(double timeout) override;
+  ExecImpl& set_bound(double bound);
+  ExecImpl& set_sharing_penalty(double sharing_penalty);
+  void set_cb_id(unsigned int cb_id) { cb_id_ = cb_id; }
+
+  double get_start_time() const { return start_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(); }
+  const std::vector<s4u::Host*>& get_hosts() const { return hosts_; }
+
+  ExecImpl& set_flops_amounts(const std::vector<double>& flops_amounts);
+  ExecImpl& set_bytes_amounts(const std::vector<double>& bytes_amounts);
+  ExecImpl& set_hosts(const std::vector<s4u::Host*>& hosts);
+
+  unsigned int get_host_number() const { return hosts_.size(); }
+  double get_seq_remaining_ratio();
+  double get_par_remaining_ratio();
   virtual ActivityImpl* migrate(s4u::Host* to);
 
-  /* The host where the execution takes place. nullptr means this is a parallel exec (and only surf knows the hosts) */
-  sg_host_t host_               = nullptr;
-  surf_action_t surfAction_     = nullptr; /* The Surf execution action encapsulated */
-  surf::Action* timeoutDetector = nullptr;
-  static simgrid::xbt::signal<void(kernel::activity::ExecImplPtr)> onCreation;
-  static simgrid::xbt::signal<void(kernel::activity::ExecImplPtr)> onCompletion;
-  static simgrid::xbt::signal<void(simgrid::kernel::activity::ExecImplPtr, simgrid::s4u::Host*)> onMigration;
+  ExecImpl* start();
+  void post() override;
+  void finish() override;
+
+  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;
 };
-}
-}
-} // namespace simgrid::kernel::activity
+} // namespace activity
+} // namespace kernel
+} // namespace simgrid
 #endif