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
SIMIX_synchro_wait becomes RawImpl::start
[simgrid.git]
/
src
/
kernel
/
activity
/
ConditionVariableImpl.cpp
diff --git
a/src/kernel/activity/ConditionVariableImpl.cpp
b/src/kernel/activity/ConditionVariableImpl.cpp
index
12f2e02
..
fa4b9cf
100644
(file)
--- a/
src/kernel/activity/ConditionVariableImpl.cpp
+++ b/
src/kernel/activity/ConditionVariableImpl.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-201
9
. 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. */
@@
-17,7
+17,7
@@
static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout,
smx_simcall_t simcall)
{
XBT_IN("(%p, %p, %f, %p,%p)", cond, mutex, timeout, issuer, simcall);
smx_simcall_t simcall)
{
XBT_IN("(%p, %p, %f, %p,%p)", cond, mutex, timeout, issuer, simcall);
- s
mx_activity_t
synchro = nullptr;
+ s
imgrid::kernel::activity::RawImplPtr
synchro = nullptr;
XBT_DEBUG("Wait condition %p", cond);
XBT_DEBUG("Wait condition %p", cond);
@@
-28,7
+28,8
@@
static void _SIMIX_cond_wait(smx_cond_t cond, smx_mutex_t mutex, double timeout,
mutex->unlock(issuer);
}
mutex->unlock(issuer);
}
- synchro = SIMIX_synchro_wait(issuer->host_, timeout);
+ synchro = simgrid::kernel::activity::RawImplPtr(new simgrid::kernel::activity::RawImpl())
+ ->start(issuer->get_host(), timeout);
synchro->simcalls_.push_front(simcall);
issuer->waiting_synchro = synchro;
cond->sleeping.push_back(*simcall->issuer);
synchro->simcalls_.push_front(simcall);
issuer->waiting_synchro = synchro;
cond->sleeping.push_back(*simcall->issuer);