X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/41efdce0277c52d55f27af300df9821cbd18c12c..d78a7f87e28a15c0f1e71e4510a055554e0e5e9b:/src/kernel/activity/ExecImpl.hpp diff --git a/src/kernel/activity/ExecImpl.hpp b/src/kernel/activity/ExecImpl.hpp index 7d4a915ecf..201b7336ea 100644 --- a/src/kernel/activity/ExecImpl.hpp +++ b/src/kernel/activity/ExecImpl.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2021. 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. */ @@ -6,6 +6,7 @@ #ifndef SIMGRID_KERNEL_ACTIVITY_EXEC_HPP #define SIMGRID_KERNEL_ACTIVITY_EXEC_HPP +#include "simgrid/s4u/Exec.hpp" #include "src/kernel/activity/ActivityImpl.hpp" #include "src/kernel/context/Context.hpp" #include "surf/surf.hpp" @@ -17,14 +18,19 @@ namespace activity { class XBT_PUBLIC ExecImpl : public ActivityImpl_T { std::unique_ptr> timeout_detector_{ nullptr, [](resource::Action* a) { a->unref(); }}; + actor::ActorImpl* actor_ = nullptr; double sharing_penalty_ = 1.0; double bound_ = 0.0; std::vector hosts_; std::vector flops_amounts_; std::vector bytes_amounts_; + s4u::Exec* piface_; public: - ExecImpl& set_timeout(double timeout); + ExecImpl(); + s4u::Exec* get_iface() { return piface_; } + + ExecImpl& set_timeout(double timeout) override; ExecImpl& set_bound(double bound); ExecImpl& set_sharing_penalty(double sharing_penalty); @@ -42,7 +48,6 @@ public: virtual ActivityImpl* migrate(s4u::Host* to); ExecImpl* start(); - void wait_for(actor::ActorImpl* issuer, double timeout); void post() override; void finish() override;