X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/03d36345c4247a907709b86c189a53f5f85bea88..d6ed3317d2f0ed96c72d39310b4010b6598be45a:/src/simix/smx_global.c

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index 6d52482a29..ecd64f0502 100644
--- 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)
 {
-  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();
@@ -308,6 +308,7 @@ static int process_syscall_color(void *p)
 void SIMIX_run(void)
 {
   if(MC_record_path) {
+    MC_record_replay_init();
     MC_record_replay_from_string(MC_record_path);
     return;
   }
@@ -340,7 +341,7 @@ void SIMIX_run(void)
       xbt_os_cputimer_resume(simix_global->timer_seq);
 #endif
 
-      /* Move all killing processes to the end of the list, because killing a process that have an ongoing simcall is a bad idea */
+      /* Move all killer processes to the end of the list, because killing a process that have an ongoing simcall is a bad idea */
       xbt_dynar_three_way_partition(simix_global->process_that_ran, process_syscall_color);
 
       /* answer sequentially and in a fixed arbitrary order all the simcalls that were issued during that sub-round */