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
Populate the kernel::context namespace and continue separating concerns out of simix
[simgrid.git]
/
src
/
simix
/
smx_synchro.cpp
diff --git
a/src/simix/smx_synchro.cpp
b/src/simix/smx_synchro.cpp
index
0db61fd
..
81017c1
100644
(file)
--- a/
src/simix/smx_synchro.cpp
+++ b/
src/simix/smx_synchro.cpp
@@
-102,7
+102,7
@@
Mutex::Mutex() : mutex_(this)
{
XBT_IN("(%p)", this);
// Useful to initialize sleeping swag:
- simgrid::simix::
Process
p;
+ simgrid::simix::
ActorImpl
p;
this->sleeping = xbt_swag_new(xbt_swag_offset(p, synchro_hookup));
XBT_OUT();
}
@@
-167,8
+167,8
@@
void Mutex::unlock(smx_process_t issuer)
/* If the mutex is not owned by the issuer, that's not good */
if (issuer != this->owner)
- THROWF(mismatch_error, 0, "Cannot release that mutex: it was locked by %s (pid:%d), not by you.",
- this->owner->name.c_str(),
SIMIX_process_get_PID(this->owner)
);
+ THROWF(mismatch_error, 0, "Cannot release that mutex: it was locked by %s (pid:%
l
d), not by you.",
+ this->owner->name.c_str(),
this->owner->pid
);
if (xbt_swag_size(this->sleeping) > 0) {
/*process to wake up */
@@
-237,7
+237,7
@@
void simcall_HANDLER_mutex_unlock(smx_simcall_t simcall, smx_mutex_t mutex)
smx_cond_t SIMIX_cond_init(void)
{
XBT_IN("()");
- simgrid::simix::
Process
p;
+ simgrid::simix::
ActorImpl
p;
smx_cond_t cond = new s_smx_cond();
cond->sleeping = xbt_swag_new(xbt_swag_offset(p, synchro_hookup));
cond->refcount_ = 1;
@@
-393,7
+393,7
@@
void intrusive_ptr_release(s_smx_cond_t *cond)
smx_sem_t SIMIX_sem_init(unsigned int value)
{
XBT_IN("(%u)",value);
- simgrid::simix::
Process
p;
+ simgrid::simix::
ActorImpl
p;
smx_sem_t sem = xbt_new0(s_smx_sem_t, 1);
sem->sleeping = xbt_swag_new(xbt_swag_offset(p, synchro_hookup));