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
split a function in two and kill it
[simgrid.git]
/
src
/
s4u
/
s4u_Host.cpp
diff --git
a/src/s4u/s4u_Host.cpp
b/src/s4u/s4u_Host.cpp
index
ceed115
..
e78c4eb
100644
(file)
--- a/
src/s4u/s4u_Host.cpp
+++ b/
src/s4u/s4u_Host.cpp
@@
-4,8
+4,9
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "simgrid/kernel/routing/NetPoint.hpp"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "simgrid/kernel/routing/NetPoint.hpp"
+#include "simgrid/s4u/Actor.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Engine.hpp"
-#include "s
rc/simix/smx_host_private
.hpp"
+#include "s
imgrid/s4u/Exec
.hpp"
#include "src/surf/HostImpl.hpp"
#include <string>
#include "src/surf/HostImpl.hpp"
#include <string>
@@
-85,8
+86,8
@@
void Host::turn_on()
{
if (is_off()) {
simgrid::simix::simcall([this] {
{
if (is_off()) {
simgrid::simix::simcall([this] {
- this->pimpl_->turn_on();
this->pimpl_cpu->turn_on();
this->pimpl_cpu->turn_on();
+ this->pimpl_->turn_on();
on_state_change(*this);
});
}
on_state_change(*this);
});
}
@@
-289,8
+290,7
@@
void Host::execute(double flops)
}
void Host::execute(double flops, double priority)
{
}
void Host::execute(double flops, double priority)
{
- smx_activity_t s = simcall_execution_start("", flops, 1 / priority /*priority*/, 0. /*bound*/, this);
- simcall_execution_wait(s);
+ this_actor::exec_init(flops)->set_host(this)->set_priority(1 / priority)->start()->wait();
}
} // namespace s4u
}
} // namespace s4u