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
Merge branch 'master' of https://framagit.org/simgrid/simgrid
[simgrid.git]
/
src
/
s4u
/
s4u_Actor.cpp
diff --git
a/src/s4u/s4u_Actor.cpp
b/src/s4u/s4u_Actor.cpp
index
57aef00
..
284faaa
100644
(file)
--- a/
src/s4u/s4u_Actor.cpp
+++ b/
src/s4u/s4u_Actor.cpp
@@
-359,7
+359,7
@@
void execute(double flops)
void execute(double flops, double priority)
{
void execute(double flops, double priority)
{
- exec_init(flops)->set_priority(priority)->
vetoable_
start()->wait();
+ exec_init(flops)->set_priority(priority)->start()->wait();
}
void parallel_execute(const std::vector<s4u::Host*>& hosts, const std::vector<double>& flops_amounts,
}
void parallel_execute(const std::vector<s4u::Host*>& hosts, const std::vector<double>& flops_amounts,
@@
-407,7
+407,7
@@
ExecPtr exec_init(const std::vector<s4u::Host*>& hosts, const std::vector<double
ExecPtr exec_async(double flops)
{
ExecPtr res = exec_init(flops);
ExecPtr exec_async(double flops)
{
ExecPtr res = exec_init(flops);
- res->
vetoable_
start();
+ res->start();
return res;
}
return res;
}