Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid

diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c
index 6f44c29..cd16a82 100644 (file)
--- a/src/mc/mc_liveness.c
+++ b/src/mc/mc_liveness.c
@@ -45,8 +45,10 @@ const char* get_memory_map_addr(void *addr){
   if(fp == NULL)
     perror("fopen failed");
 
-  if(addr == NULL)
+  if(addr == NULL){
+    fclose(fp);
     return "nil";
+  }
 
   xbt_dynar_t lfields = NULL;
   xbt_dynar_t start_end  = NULL;
@@ -188,7 +190,7 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2, void* s_heap, void* r_h
          return 1;
        }
       }
-      if(data_program_region_compare(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
+      if(data_libsimgrid_region_compare(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
        if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
          XBT_DEBUG("Different memcmp for data in libsimgrid");
          errors++;
@@ -214,9 +216,9 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2, void* s_heap, void* r_h
          return 1;
        }
       }
-      if(data_libsimgrid_region_compare(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
+      if(data_program_region_compare(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
        if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
-         XBT_DEBUG("Different memcmp for data in libsimgrid");
+         XBT_DEBUG("Different memcmp for data in program");
          errors++;
        }else{
          return 1;
@@ -272,13 +274,13 @@ int reached(xbt_state_t st){
          //if(xbt_dict_length(pair_test->rdv_points) == xbt_dict_length(current_rdv_points)){
          //if(rdv_points_compare(pair_test->rdv_points, current_rdv_points) == 0){
          if(snapshot_compare(pair_test->system_state, sn, std_heap, raw_heap) == 0){
-               MC_free_snapshot(sn);
-               xbt_dynar_reset(prop_ato);
-               xbt_free(prop_ato);
-               MC_UNSET_RAW_MEM;
-               return 1;
-             }
-             /* }
+           MC_free_snapshot(sn);
+           xbt_dynar_reset(prop_ato);
+           xbt_free(prop_ato);
+           MC_UNSET_RAW_MEM;
+           return 1;
+         }
+         /* }
          }else{
            XBT_DEBUG("Different size of rdv points (%d - %d)",xbt_dict_length(pair_test->rdv_points), xbt_dict_length(current_rdv_points) );
            }*/