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

diff --git a/src/kernel/activity/ExecImpl.hpp b/src/kernel/activity/ExecImpl.hpp
index fb5248e682..b1dc4f7608 100644
--- a/src/kernel/activity/ExecImpl.hpp
+++ b/src/kernel/activity/ExecImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2018. 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,6 +7,7 @@
 #define SIMIX_SYNCHRO_EXEC_HPP
 
 #include "src/kernel/activity/ActivityImpl.hpp"
+#include "src/kernel/context/Context.hpp"
 #include "surf/surf.hpp"
 
 namespace simgrid {
@@ -14,34 +15,36 @@ namespace kernel {
 namespace activity {
 
 class XBT_PUBLIC ExecImpl : public ActivityImpl {
-  ~ExecImpl() override;
+  resource::Action* timeout_detector_ = nullptr;
+  ~ExecImpl();
 
 public:
-  explicit ExecImpl(std::string name, resource::Action* surf_action, resource::Action* timeout_detector,
-                    s4u::Host* host);
-  void suspend() override;
-  void resume() override;
+  ExecImpl* start(double flops_amount, double priority, double bound);
+  ExecImpl* start(const std::vector<s4u::Host*>& hosts, const std::vector<double>& flops_amounts,
+                  const std::vector<double>& bytes_amounts);
+
+  ExecImpl* set_name(const std::string& name);
+  ExecImpl* set_tracing_category(const std::string& category);
+  ExecImpl* set_host(s4u::Host* host);
+  ExecImpl* set_timeout(double timeout);
   void cancel();
   void post() override;
-  double get_remaining();
-  double get_remaining_ratio();
-  void set_bound(double bound);
-  void set_priority(double priority);
-  void set_category(std::string category);
+  void finish() override;
+  double get_remaining() const;
+  double get_seq_remaining_ratio();
+  double get_par_remaining_ratio();
+  void set_bound(double bound);       // deprecated. To be removed in v3.25
+  void set_priority(double priority); // deprecated. To be removed in v3.25
   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) */
   s4u::Host* host_ = nullptr;
-  resource::Action* surf_action_; /* The Surf execution action encapsulated */
-private:
-  resource::Action* timeout_detector_ = nullptr;
 
-public:
-  static simgrid::xbt::signal<void(kernel::activity::ExecImplPtr)> on_creation;
-  static simgrid::xbt::signal<void(kernel::activity::ExecImplPtr)> on_completion;
-  static simgrid::xbt::signal<void(simgrid::kernel::activity::ExecImplPtr, simgrid::s4u::Host*)> on_migration;
+  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