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
Rename ActorImpl::comms into activities.
[simgrid.git]
/
src
/
kernel
/
activity
/
ExecImpl.hpp
diff --git
a/src/kernel/activity/ExecImpl.hpp
b/src/kernel/activity/ExecImpl.hpp
index
88b25eb
..
b233677
100644
(file)
--- a/
src/kernel/activity/ExecImpl.hpp
+++ b/
src/kernel/activity/ExecImpl.hpp
@@
-1,10
+1,10
@@
-/* Copyright (c) 2007-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-20
20
. 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 SIM
IX_SYNCHRO
_EXEC_HPP
-#define SIM
IX_SYNCHRO
_EXEC_HPP
+#ifndef SIM
GRID_KERNEL_ACTIVITY
_EXEC_HPP
+#define SIM
GRID_KERNEL_ACTIVITY
_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"
@@
-15,18
+15,18
@@
namespace kernel {
namespace activity {
class XBT_PUBLIC ExecImpl : public ActivityImpl_T<ExecImpl> {
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(); }};
+ double sharing_penalty_ = 1.0;
double bound_ = 0.0;
std::vector<s4u::Host*> hosts_;
std::vector<double> flops_amounts_;
std::vector<double> bytes_amounts_;
double bound_ = 0.0;
std::vector<s4u::Host*> hosts_;
std::vector<double> flops_amounts_;
std::vector<double> bytes_amounts_;
- ~ExecImpl();
public:
public:
- ExecImpl& set_timeout(double timeout);
+ ExecImpl& set_timeout(double timeout)
override
;
ExecImpl& set_bound(double bound);
ExecImpl& set_bound(double bound);
- ExecImpl& set_
priority(double priori
ty);
+ ExecImpl& set_
sharing_penalty(double sharing_penal
ty);
ExecImpl& set_flops_amount(double flop_amount);
ExecImpl& set_host(s4u::Host* host);
ExecImpl& set_flops_amount(double flop_amount);
ExecImpl& set_host(s4u::Host* host);
@@
-42,12
+42,9
@@
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 xbt::signal<void(ExecImpl const&, s4u::Host*)> on_migration;
};
} // namespace activity
static xbt::signal<void(ExecImpl const&, s4u::Host*)> on_migration;
};
} // namespace activity