[mc] Cleanup mc_ignore/mcer_ignore

[simgrid.git] / src / smpi / smpi_global.c

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index 585847b..f47536e 100644 (file)
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -12,6 +12,7 @@
 #include "surf/surf.h"
 #include "simix/smx_private.h"
 #include "simgrid/sg_config.h"
+#include "mc/mc_replay.h"
 
 #include <float.h>              /* DBL_MAX */
 #include <stdint.h>
@@ -350,8 +351,8 @@ void smpi_comm_copy_buffer_callback(smx_synchro_t comm,
   void* tmpbuff=buff;
 
   if((smpi_privatize_global_variables)
-      && ((char*)buff >= start_data_exe)
-      && ((char*)buff < start_data_exe + size_data_exe )
+      && ((char*)buff >= smpi_start_data_exe)
+      && ((char*)buff < smpi_start_data_exe + smpi_size_data_exe )
     ){
        XBT_DEBUG("Privatization : We are copying from a zone inside global memory... Saving data to temp buffer !");
        smpi_switch_data_segment(((smpi_process_data_t)SIMIX_process_get_data(comm->comm.src_proc))->index);
@@ -361,8 +362,8 @@ void smpi_comm_copy_buffer_callback(smx_synchro_t comm,
 
 
   if((smpi_privatize_global_variables)
-      && ((char*)comm->comm.dst_buff >= start_data_exe)
-      && ((char*)comm->comm.dst_buff < start_data_exe + size_data_exe )
+      && ((char*)comm->comm.dst_buff >= smpi_start_data_exe)
+      && ((char*)comm->comm.dst_buff < smpi_start_data_exe + smpi_size_data_exe )
     ){
        XBT_DEBUG("Privatization : We are copying to a zone inside global memory - Switch data segment");
        smpi_switch_data_segment(((smpi_process_data_t)SIMIX_process_get_data(comm->comm.dst_proc))->index);
@@ -528,9 +529,7 @@ static void smpi_init_logs(){
                                    function: xbt_log_appender_file.c depends on it
                                    DO NOT connect this in XBT or so, or it will be
                                    useless to xbt_log_appender_file.c */
-#ifdef HAVE_TRACING
   XBT_LOG_CONNECT(instr_smpi);
-#endif
   XBT_LOG_CONNECT(smpi_base);
   XBT_LOG_CONNECT(smpi_bench);
   XBT_LOG_CONNECT(smpi_coll);
@@ -641,12 +640,10 @@ int smpi_main(int (*realmain) (int argc, char *argv[]), int argc, char *argv[])
 
   smpi_init_logs();
 
-#ifdef HAVE_TRACING
   TRACE_global_init(&argc, argv);
 
   TRACE_add_start_function(TRACE_smpi_alloc);
   TRACE_add_end_function(TRACE_smpi_release);
-#endif
 
   SIMIX_global_init(&argc, argv);
 
@@ -670,7 +667,7 @@ int smpi_main(int (*realmain) (int argc, char *argv[]), int argc, char *argv[])
   fflush(stderr);
 
   if (MC_is_active()) {
-    MC_do_the_modelcheck_for_real();
+    MC_run();
   } else {
   
     SIMIX_run();
@@ -691,9 +688,7 @@ int smpi_main(int (*realmain) (int argc, char *argv[]), int argc, char *argv[])
 
   smpi_global_destroy();
 
-#ifdef HAVE_TRACING
   TRACE_end();
-#endif
 
   return 0;
 }
@@ -705,11 +700,8 @@ void SMPI_init(){
   smpi_init_options();
   smpi_global_init();
   smpi_check_options();
-#ifdef HAVE_TRACING
-  if (TRACE_is_enabled() && TRACE_is_configured()) {
+  if (TRACE_is_enabled() && TRACE_is_configured())
     TRACE_smpi_alloc();
-  }
-#endif
   if(smpi_privatize_global_variables)
     smpi_initialize_global_memory_segments();
 }