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 scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
simix
/
smx_process.cpp
diff --git
a/src/simix/smx_process.cpp
b/src/simix/smx_process.cpp
index
d1ed841
..
bb91a10
100644
(file)
--- a/
src/simix/smx_process.cpp
+++ b/
src/simix/smx_process.cpp
@@
-754,7
+754,7
@@
xbt_dict_t SIMIX_process_get_properties(smx_process_t process)
void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_process_t process, double timeout)
{
if (process->finished) {
void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_process_t process, double timeout)
{
if (process->finished) {
- // The
process is already finished, just wake up the process right now:
+ // The
joined process is already finished, just wake up the issuer process right away
simcall_process_sleep__set__result(simcall, SIMIX_DONE);
SIMIX_simcall_answer(simcall);
return;
simcall_process_sleep__set__result(simcall, SIMIX_DONE);
SIMIX_simcall_answer(simcall);
return;