Merge branch 'mc++' into mc-merge

diff --cc examples/msg/mc/bugged1_liveness.tesh
Simple merge

diff --cc examples/msg/mc/bugged1_liveness_visited.tesh
Simple merge

diff --cc src/include/mc/datatypes.h
Simple merge

diff --cc src/include/mc/mc.h
Simple merge

diff --cc src/mc/mc_checkpoint.c
Simple merge

diff --cc src/mc/mc_compare.c
Simple merge

diff --cc src/mc/mc_dpor.c
Simple merge

diff --cc src/mc/mc_global.c
Simple merge

diff --cc src/mc/mc_private.h
Simple merge

diff --cc src/mc/mc_request.c
Simple merge

diff --cc src/simgrid/sg_config.c
Simple merge

diff --cc src/smpi/smpi_base.c
index b72d6ce,2597663..fa4e70d
--- 1/src/smpi/smpi_base.c
--- 2/src/smpi/smpi_base.c
+++ b/src/smpi/smpi_base.c
@@@ -764,11 -760,12 +764,11 @@@ void smpi_mpi_wait(MPI_Request * reques
  
    if ((*request)->action != NULL) { // this is not a detached send
      simcall_comm_wait((*request)->action, -1.0);
 -  }
 -
  #ifdef HAVE_MC
-   if(MC_is_active())
+   if(MC_is_active() && (*request)->action)
      (*request)->action->comm.dst_data = NULL; // dangling pointer : dst_data is freed with a wait, need to set it to NULL for system state comparison
  #endif
 +  }
  
    finish_wait(request, status);
    *request = MPI_REQUEST_NULL;

diff --cc src/xbt/mmalloc/mm_diff.c
Simple merge