model-checker : free memory

[simgrid.git] / src / mc / mc_checkpoint.c

diff --git a/src/mc/mc_checkpoint.c b/src/mc/mc_checkpoint.c
index 6fa1de3..8f7a23d 100644 (file)
--- a/src/mc/mc_checkpoint.c
+++ b/src/mc/mc_checkpoint.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2012 Da SimGrid Team. All rights reserved.            */
+/* Copyright (c) 2008-2013 Da SimGrid Team. All rights reserved.            */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -134,10 +134,6 @@ void MC_init_memory_map_info(){
 
 }
 
-mc_snapshot_t SIMIX_pre_mc_snapshot(smx_simcall_t simcall){
-  return MC_take_snapshot();
-}
-
 mc_snapshot_t MC_take_snapshot()
 {
   int raw_mem = (mmalloc_get_current_heap() == raw_heap);
@@ -205,7 +201,7 @@ mc_snapshot_t MC_take_snapshot()
 
   if(_sg_mc_visited > 0 || strcmp(_sg_mc_property_file,"")){
     snapshot->stacks = take_snapshot_stacks(&snapshot, heap);
-    get_hash_global(snapshot->hash_global, snapshot->regions[2]->data, snapshot->regions[1]->data);
+    get_hash_global(snapshot->hash_global, snapshot->regions[1]->data, snapshot->regions[2]->data);
     get_hash_local(snapshot->hash_local, snapshot->stacks);
   }
 
@@ -235,6 +231,7 @@ void MC_free_snapshot(mc_snapshot_t snapshot)
   for(i=0; i < NB_REGIONS; i++)
     MC_region_destroy(snapshot->regions[i]);
 
+  xbt_free(snapshot->stack_sizes);
   xbt_dynar_free(&(snapshot->stacks));
   xbt_dynar_free(&(snapshot->to_ignore));
   xbt_free(snapshot);
@@ -467,7 +464,7 @@ static xbt_strbuff_t get_local_variables_values(void *stack_context, void *heap)
     to_append = bprintf("frame_name=%s\n", frame_name);
     xbt_strbuff_append(variables, to_append);
     xbt_free(to_append);
-    to_append = bprintf("ip=%lx\n", ip);
+    to_append = bprintf("ip=%lx\n", (unsigned long)ip);
     xbt_strbuff_append(variables, to_append);
     xbt_free(to_append);
     
@@ -504,6 +501,7 @@ static xbt_strbuff_t get_local_variables_values(void *stack_context, void *heap)
 
             if(!xbt_dynar_is_empty(compose)){
               frame_pointer_address = xbt_dynar_get_as(compose, xbt_dynar_length(compose) - 1, variable_value_t)->value.address ; 
+              xbt_dynar_reset(compose);
             }
             break;
           default :
@@ -570,6 +568,7 @@ static xbt_strbuff_t get_local_variables_values(void *stack_context, void *heap)
                 xbt_free(to_append);
               }
             }
+            xbt_dynar_reset(compose);
           }else{
             to_append = bprintf("%s=undefined\n", current_variable->name);
             xbt_strbuff_append(variables, to_append);
@@ -620,6 +619,10 @@ void snapshot_stack_free_voidp(void *s){
   snapshot_stack_free((mc_snapshot_stack_t) * (void **) s);
 }
 
+mc_snapshot_t SIMIX_pre_mc_snapshot(smx_simcall_t simcall){
+  return MC_take_snapshot();
+}
+
 void *MC_snapshot(void){
 
   return simcall_mc_snapshot();
@@ -643,35 +646,33 @@ static void get_hash_global(char *snapshot_hash, void *data1, void *data2){
   size_t offset; 
   global_variable_t current_var; 
   void *addr_pointed = NULL;
-
-  void *res;
+  void *res = NULL;
 
   xbt_strbuff_t clear = xbt_strbuff_new();
   
   xbt_dynar_foreach(mc_global_variables, cursor, current_var){
-    if(current_var->address < start_data_libsimgrid)
-      continue;
-    offset = (char *)current_var->address - (char *)start_data_libsimgrid;
-    addr_pointed = *((void **)((char *)data2 + offset));
-    if((addr_pointed > start_plt_libsimgrid && addr_pointed < end_plt_libsimgrid) || (addr_pointed > std_heap && (char *)addr_pointed < (char *)std_heap + STD_HEAP_SIZE ))
-      continue;
-    res = xbt_malloc0(current_var->size);;
-    memcpy(res, (char*)data2 + offset, current_var->size);
-    xbt_strbuff_append(clear, (const char*)res);
-    xbt_free(res);
-  }
-
-  xbt_dynar_foreach(mc_global_variables, cursor, current_var){
-    if(current_var->address > start_data_libsimgrid)
-      break;
-    offset = (char *)current_var->address - (char *)start_data_binary;
-    addr_pointed = *((void **)((char *)data1 + offset));
-    if((addr_pointed > start_plt_binary && addr_pointed < end_plt_binary) || (addr_pointed > std_heap && (char *)addr_pointed < (char *)std_heap + STD_HEAP_SIZE ))
-      continue;
-    res = xbt_malloc0(current_var->size);;
-    memcpy(res, (char*)data1 + offset, current_var->size);
-    xbt_strbuff_append(clear, (const char*)res);
-    xbt_free(res);
+    if(current_var->address < start_data_libsimgrid){ /* binary */
+      offset = (char *)current_var->address - (char *)start_data_binary;
+      addr_pointed = *((void **)((char *)data2 + offset));
+      if(((addr_pointed >= start_plt_binary && addr_pointed <= end_plt_binary)) || ((addr_pointed >= std_heap && (char *)addr_pointed <= (char *)std_heap + STD_HEAP_SIZE )))
+        continue;
+      res = xbt_malloc0(current_var->size + 1);
+      memset(res, 0, current_var->size + 1);
+      memcpy(res, (char*)data2 + offset, current_var->size);
+    }else{ /* libsimgrid */
+      offset = (char *)current_var->address - (char *)start_data_libsimgrid;
+      addr_pointed = *((void **)((char *)data1 + offset));
+      if((addr_pointed >= start_plt_libsimgrid && addr_pointed <= end_plt_libsimgrid) || (addr_pointed >= std_heap && (char *)addr_pointed <= (char *)std_heap + STD_HEAP_SIZE ))
+        continue;
+      res = xbt_malloc0(current_var->size + 1);
+      memset(res, 0, current_var->size + 1);
+      memcpy(res, (char*)data1 + offset, current_var->size);
+    }
+    if(res != NULL){
+      xbt_strbuff_append(clear, (const char*)res);
+      xbt_free(res);
+      res = NULL;
+    }
   }
 
   xbt_sha(clear->data, snapshot_hash);