X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/29a3b2869c0075fc75e8ccc66fc1d9c4c8bf6a85..3203afd846219ef8b41cadda945ea0a98103c46f:/src/kernel/activity/ExecImpl.hpp?ds=sidebyside

diff --git a/src/kernel/activity/ExecImpl.hpp b/src/kernel/activity/ExecImpl.hpp
index fb5248e682..286bf33cc1 100644
--- a/src/kernel/activity/ExecImpl.hpp
+++ b/src/kernel/activity/ExecImpl.hpp
@@ -1,47 +1,57 @@
-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2023. 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 {
+namespace simgrid::kernel::activity {
 
-class XBT_PUBLIC ExecImpl : public ActivityImpl {
-  ~ExecImpl() override;
+class XBT_PUBLIC ExecImpl : public ActivityImpl_T<ExecImpl> {
+  double sharing_penalty_             = 1.0;
+  double bound_                       = 0.0;
+  std::vector<double> flops_amounts_;
+  std::vector<double> bytes_amounts_;
+  int thread_count_ = 1;
+  int cb_id_ = -1; // callback id from Host::on_state_change.connect()
 
 public:
-  explicit ExecImpl(std::string name, resource::Action* surf_action, resource::Action* timeout_detector,
-                    s4u::Host* host);
-  void suspend() override;
-  void resume() override;
-  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);
+  ExecImpl();
+
+  ExecImpl& set_bound(double bound);
+  ExecImpl& set_sharing_penalty(double sharing_penalty);
+  ExecImpl& update_sharing_penalty(double sharing_penalty);
+
+  void set_cb_id(unsigned int cb_id) { cb_id_ = cb_id; }
+
+  ExecImpl& set_flops_amount(double flop_amount);
+  ExecImpl& set_host(s4u::Host* host);
+
+  ExecImpl& set_flops_amounts(const std::vector<double>& flops_amounts);
+  ExecImpl& set_bytes_amounts(const std::vector<double>& bytes_amounts);
+  ExecImpl& set_thread_count(int thread_count);
+  ExecImpl& set_hosts(const std::vector<s4u::Host*>& hosts);
+
+  unsigned int get_host_number() const { return static_cast<unsigned>(get_hosts().size()); }
+  int get_thread_count() const { return thread_count_; }
+  double get_seq_remaining_ratio();
+  double get_par_remaining_ratio();
+  double get_remaining() const override;
   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;
+  ExecImpl* start();
+  void set_exception(actor::ActorImpl* issuer) override;
+  void finish() override;
 
-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;
+  void reset();
+
+  static xbt::signal<void(ExecImpl const&, s4u::Host*)> on_migration;
 };
-}
-}
 } // namespace simgrid::kernel::activity
 #endif