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

diff --git a/src/kernel/activity/ExecImpl.hpp b/src/kernel/activity/ExecImpl.hpp
index 317d93c6a2..38cedadf04 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,32 +7,39 @@
 #define SIMIX_SYNCHRO_EXEC_HPP
 
 #include "src/kernel/activity/ActivityImpl.hpp"
+#include "src/kernel/context/Context.hpp"
 #include "surf/surf.hpp"
-#include "xbt/Extendable.hpp"
 
 namespace simgrid {
 namespace kernel {
 namespace activity {
 
-XBT_PUBLIC_CLASS ExecImpl : public ActivityImpl, public simgrid::xbt::Extendable<ExecImpl>
-{
+class XBT_PUBLIC ExecImpl : public ActivityImpl {
   ~ExecImpl() override;
 
 public:
-  explicit ExecImpl(const char* name, sg_host_t host);
-  void suspend() override;
-  void resume() override;
+  explicit ExecImpl(std::string name, std::string tracing_category, s4u::Host* host);
+  explicit ExecImpl(std::string name, std::string tracing_category, s4u::Host* host, double timeout);
+  ExecImpl* start(double flops_amount, double priority, double bound);
+  void cancel();
   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;
+  double get_remaining();
+  double get_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;
+
+private:
+  resource::Action* timeout_detector_ = nullptr;
+
+public:
+  static simgrid::xbt::signal<void(ExecImplPtr)> on_creation;
+  static simgrid::xbt::signal<void(ExecImplPtr)> on_completion;
+  static simgrid::xbt::signal<void(ExecImplPtr, simgrid::s4u::Host*)> on_migration;
 };
 }
 }