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
Fix simcall_blocking returning a value.
[simgrid.git]
/
src
/
s4u
/
s4u_Semaphore.cpp
diff --git
a/src/s4u/s4u_Semaphore.cpp
b/src/s4u/s4u_Semaphore.cpp
index
90aaedf
..
7d42c3a
100644
(file)
--- a/
src/s4u/s4u_Semaphore.cpp
+++ b/
src/s4u/s4u_Semaphore.cpp
@@
-24,17
+24,15
@@
void Semaphore::acquire()
{
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
mc::SemAcquireSimcall observer{issuer, pimpl_};
- kernel::actor::simcall_blocking<void>([&observer] { observer.get_sem()->acquire(observer.get_issuer(), -1.0); },
- &observer);
+ kernel::actor::simcall_blocking([&observer] { observer.get_sem()->acquire(observer.get_issuer(), -1.0); }, &observer);
}
bool Semaphore::acquire_timeout(double timeout)
{
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
mc::SemAcquireSimcall observer{issuer, pimpl_, timeout};
-
kernel::actor::simcall_blocking<void>
(
+
return kernel::actor::simcall_blocking
(
[&observer] { observer.get_sem()->acquire(observer.get_issuer(), observer.get_timeout()); }, &observer);
- return observer.get_result();
}
void Semaphore::release()