Add a clock per process when running in MC mode.

[simgrid.git] / src / simix / smx_global.c

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index 326fd97..059130d 100644 (file)
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -10,6 +10,7 @@
 #include "xbt/log.h"
 #include "xbt/str.h"
 #include "xbt/ex.h"             /* ex_backtrace_display */
+#include "mc/mc.h"
 
 XBT_LOG_EXTERNAL_CATEGORY(simix);
 XBT_LOG_EXTERNAL_CATEGORY(simix_action);
@@ -79,10 +80,6 @@ void SIMIX_global_init(int *argc, char **argv)
     simix_global->kill_process_function = NULL;
     simix_global->cleanup_process_function = SIMIX_process_cleanup;
 
-#ifdef HAVE_LATENCY_BOUND_TRACKING
-    simix_global->latency_limited_dict = xbt_dict_new();
-#endif
-
     surf_init(argc, argv);      /* Initialize SURF structures */
     SIMIX_context_mod_init();
     SIMIX_create_maestro_process();
@@ -131,10 +128,6 @@ void SIMIX_clean(void)
   xbt_dict_free(&(simix_global->registered_functions));
   xbt_dict_free(&(simix_global->host));
 
-#ifdef HAVE_LATENCY_BOUND_TRACKING
-  xbt_dict_free(&(simix_global->latency_limited_dict));
-#endif
-
   /* Let's free maestro now */
   SIMIX_context_free(simix_global->maestro_process->context);
   xbt_free(simix_global->maestro_process->running_ctx);
@@ -164,7 +157,11 @@ void SIMIX_clean(void)
  */
 XBT_INLINE double SIMIX_get_clock(void)
 {
-  return surf_get_clock();
+  if(MC_IS_ENABLED){
+    return MC_process_clock_get(SIMIX_process_self());
+  }else{
+    return surf_get_clock();
+  }
 }
 
 void SIMIX_run(void)
@@ -179,11 +176,12 @@ void SIMIX_run(void)
 
   do {
     do {
-      DEBUG0("New Schedule Round");
+      DEBUG1("New Schedule Round; size(queue)=%lu",
+          xbt_dynar_length(simix_global->process_to_run));
       SIMIX_context_runall(simix_global->process_to_run);
       while ((req = SIMIX_request_pop())) {
         DEBUG1("Handling request %p", req);
-        SIMIX_request_pre(req);
+        SIMIX_request_pre(req, 0);
       }
     } while (xbt_dynar_length(simix_global->process_to_run));