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

diff --git a/src/kernel/activity/ExecImpl.hpp b/src/kernel/activity/ExecImpl.hpp
index 4e68dc43b5..9e35d73d76 100644
--- a/src/kernel/activity/ExecImpl.hpp
+++ b/src/kernel/activity/ExecImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2019. 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. */
@@ -7,33 +7,49 @@
 #define SIMIX_SYNCHRO_EXEC_HPP
 
 #include "src/kernel/activity/ActivityImpl.hpp"
+#include "src/kernel/context/Context.hpp"
 #include "surf/surf.hpp"
 
 namespace simgrid {
 namespace kernel {
 namespace activity {
 
-XBT_PUBLIC_CLASS ExecImpl : public ActivityImpl
-{
-  ~ExecImpl() override;
+class XBT_PUBLIC ExecImpl : public ActivityImpl_T<ExecImpl> {
+  resource::Action* timeout_detector_ = nullptr;
+  double priority_                    = 1.0;
+  double bound_                       = 0.0;
+  std::vector<s4u::Host*> hosts_;
+  std::vector<double> flops_amounts_;
+  std::vector<double> bytes_amounts_;
+  ~ExecImpl();
 
 public:
-  explicit ExecImpl(const char* name, sg_host_t host);
-  void suspend() override;
-  void resume() override;
+  ExecImpl& set_timeout(double timeout);
+  ExecImpl& set_bound(double bound);
+  ExecImpl& set_priority(double priority);
+
+  ExecImpl& set_flops_amount(double flop_amount);
+  ExecImpl& set_host(s4u::Host* host);
+  s4u::Host* get_host() const { return hosts_.front(); }
+
+  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);
+
+  ExecImpl* start();
   void post() override;
-  double remains();
-  double remainingRatio();
-
-  /* The host where the execution takes place. If nullptr, then 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)> onDestruction;
+  void finish() override;
+
+  static xbt::signal<void(ExecImpl&)> on_creation;
+  static xbt::signal<void(ExecImpl const&)> on_completion;
+  static xbt::signal<void(ExecImpl const&, s4u::Host*)> on_migration;
 };
-}
-}
-} // namespace simgrid::kernel::activity
+} // namespace activity
+} // namespace kernel
+} // namespace simgrid
 #endif