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 windows build (this is now used from the java library)
[simgrid.git]
/
src
/
simix
/
smx_global.c
diff --git
a/src/simix/smx_global.c
b/src/simix/smx_global.c
index
6d52482
..
6e3dac7
100644
(file)
--- a/
src/simix/smx_global.c
+++ b/
src/simix/smx_global.c
@@
-281,7
+281,7
@@
void SIMIX_clean(void)
*/
XBT_INLINE double SIMIX_get_clock(void)
{
*/
XBT_INLINE double SIMIX_get_clock(void)
{
- if(MC_is_active()){
+ if(MC_is_active()
|| MC_record_replay_is_active()
){
return MC_process_clock_get(SIMIX_process_self());
}else{
return surf_get_clock();
return MC_process_clock_get(SIMIX_process_self());
}else{
return surf_get_clock();
@@
-308,6
+308,7
@@
static int process_syscall_color(void *p)
void SIMIX_run(void)
{
if(MC_record_path) {
void SIMIX_run(void)
{
if(MC_record_path) {
+ MC_record_replay_init();
MC_record_replay_from_string(MC_record_path);
return;
}
MC_record_replay_from_string(MC_record_path);
return;
}