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 git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
simix
/
smx_synchro_private.h
diff --git
a/src/simix/smx_synchro_private.h
b/src/simix/smx_synchro_private.h
index
7faa049
..
06bd94b
100644
(file)
--- a/
src/simix/smx_synchro_private.h
+++ b/
src/simix/smx_synchro_private.h
@@
-26,12
+26,12
@@
public:
Mutex(Mutex const&) = delete;
Mutex& operator=(Mutex const&) = delete;
Mutex(Mutex const&) = delete;
Mutex& operator=(Mutex const&) = delete;
- void lock(smx_
process
_t issuer);
- bool try_lock(smx_
process
_t issuer);
- void unlock(smx_
process
_t issuer);
+ void lock(smx_
actor
_t issuer);
+ bool try_lock(smx_
actor
_t issuer);
+ void unlock(smx_
actor
_t issuer);
bool locked = false;
bool locked = false;
- smx_
process
_t owner = nullptr;
+ smx_
actor
_t owner = nullptr;
// List of sleeping processes:
xbt_swag_t sleeping = nullptr;
// List of sleeping processes:
xbt_swag_t sleeping = nullptr;
@@
-76,7
+76,7
@@
typedef struct s_smx_sem {
} s_smx_sem_t;
XBT_PRIVATE void SIMIX_post_synchro(smx_activity_t synchro);
} s_smx_sem_t;
XBT_PRIVATE void SIMIX_post_synchro(smx_activity_t synchro);
-XBT_PRIVATE void SIMIX_synchro_stop_waiting(smx_
process
_t process, smx_simcall_t simcall);
+XBT_PRIVATE void SIMIX_synchro_stop_waiting(smx_
actor
_t process, smx_simcall_t simcall);
XBT_PRIVATE void SIMIX_synchro_destroy(smx_activity_t synchro);
XBT_PRIVATE void SIMIX_synchro_finish(smx_activity_t synchro);
XBT_PRIVATE void SIMIX_synchro_destroy(smx_activity_t synchro);
XBT_PRIVATE void SIMIX_synchro_finish(smx_activity_t synchro);