A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
include cleanups (mostly surf/surf.hpp)
[simgrid.git]
/
src
/
kernel
/
activity
/
ExecImpl.hpp
diff --git
a/src/kernel/activity/ExecImpl.hpp
b/src/kernel/activity/ExecImpl.hpp
index
88b25eb
..
e02c10f
100644
(file)
--- a/
src/kernel/activity/ExecImpl.hpp
+++ b/
src/kernel/activity/ExecImpl.hpp
@@
-1,36
+1,49
@@
-/* Copyright (c) 2007-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-20
21
. 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. */
/* 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 "src/kernel/context/Context.hpp"
#include "src/kernel/activity/ActivityImpl.hpp"
#include "src/kernel/context/Context.hpp"
-#include "surf/surf.hpp"
namespace simgrid {
namespace kernel {
namespace activity {
class XBT_PUBLIC ExecImpl : public ActivityImpl_T<ExecImpl> {
namespace simgrid {
namespace kernel {
namespace activity {
class XBT_PUBLIC ExecImpl : public ActivityImpl_T<ExecImpl> {
- resource::Action* timeout_detector_ = nullptr;
- double priority_ = 1.0;
+ std::unique_ptr<resource::Action, std::function<void(resource::Action*)>> timeout_detector_{
+ nullptr, [](resource::Action* a) { a->unref(); }};
+ actor::ActorImpl* actor_ = nullptr;
+ double sharing_penalty_ = 1.0;
double bound_ = 0.0;
double bound_ = 0.0;
+ double start_time_ = -1.0;
+ double finish_time_ = -1.0;
std::vector<s4u::Host*> hosts_;
std::vector<double> flops_amounts_;
std::vector<double> bytes_amounts_;
std::vector<s4u::Host*> hosts_;
std::vector<double> flops_amounts_;
std::vector<double> bytes_amounts_;
-
~ExecImpl()
;
-
+
s4u::Exec* piface_
;
+ int cb_id_ = -1; // callback id from Host::on_state_change.connect()
public:
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_bound(double bound);
- ExecImpl& set_priority(double priority);
+ ExecImpl& set_sharing_penalty(double sharing_penalty);
+ void set_cb_id(unsigned int cb_id) { cb_id_ = cb_id; }
+
+ double get_start_time() const { return start_time_; }
+ double get_finish_time() const { return finish_time_; }
ExecImpl& set_flops_amount(double flop_amount);
ExecImpl& set_host(s4u::Host* host);
s4u::Host* get_host() const { return hosts_.front(); }
ExecImpl& set_flops_amount(double flop_amount);
ExecImpl& set_host(s4u::Host* host);
s4u::Host* get_host() const { return hosts_.front(); }
+ const std::vector<s4u::Host*>& get_hosts() const { return hosts_; }
ExecImpl& set_flops_amounts(const std::vector<double>& flops_amounts);
ExecImpl& set_bytes_amounts(const std::vector<double>& bytes_amounts);
ExecImpl& set_flops_amounts(const std::vector<double>& flops_amounts);
ExecImpl& set_bytes_amounts(const std::vector<double>& bytes_amounts);
@@
-42,12
+55,11
@@
public:
virtual ActivityImpl* migrate(s4u::Host* to);
ExecImpl* start();
virtual ActivityImpl* migrate(s4u::Host* to);
ExecImpl* start();
- void cancel();
void post() override;
void finish() override;
void post() override;
void finish() override;
- static
xbt::signal<void(ExecImpl&)> on_creation
;
- static xbt::signal<void(ExecImpl const&)> on_completion;
+ static
void wait_any_for(actor::ActorImpl* issuer, const std::vector<ExecImpl*>& execs, double timeout)
;
+
static xbt::signal<void(ExecImpl const&, s4u::Host*)> on_migration;
};
} // namespace activity
static xbt::signal<void(ExecImpl const&, s4u::Host*)> on_migration;
};
} // namespace activity