properly split init/start for Exec activities

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

diff --git a/src/kernel/activity/ExecImpl.hpp b/src/kernel/activity/ExecImpl.hpp
index 17f82ae..6ea0231 100644 (file)
--- 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. */
@@ -17,23 +17,31 @@ class XBT_PUBLIC ExecImpl : public ActivityImpl {
   ~ExecImpl() override;
 
 public:
-  explicit ExecImpl(const char* name, sg_host_t host);
+  explicit ExecImpl(std::string name, std::string tracing_category, resource::Action* timeout_detector,
+                    s4u::Host* host);
+  void start(double flops_amount, double priority, double bound);
   void suspend() override;
   void resume() override;
+  void cancel();
   void post() override;
-  double remains();
-  double remainingRatio();
-  void setBound(double bound);
+  double get_remaining();
+  double get_remaining_ratio();
+  void set_bound(double bound);
+  void set_priority(double priority);
+  void set_category(std::string category);
   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;
-  kernel::resource::Action* surfAction_     = nullptr; /* The Surf execution action encapsulated */
-  kernel::resource::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;
+  s4u::Host* host_ = nullptr;
+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(kernel::activity::ExecImplPtr)> on_suspended;
+  static simgrid::xbt::signal<void(kernel::activity::ExecImplPtr)> on_resumed;
+  static simgrid::xbt::signal<void(simgrid::kernel::activity::ExecImplPtr, simgrid::s4u::Host*)> on_migration;
 };
 }
 }