Energy, onHostDestruction: ensured ptr existence

[simgrid.git] / src / mc / mc_diff.cpp

diff --git a/src/mc/mc_diff.cpp b/src/mc/mc_diff.cpp
index 7b7ecb7..93fd254 100644 (file)
--- a/src/mc/mc_diff.cpp
+++ b/src/mc/mc_diff.cpp
@@ -1,21 +1,21 @@
-/* mc_diff - Memory snapshooting and comparison                             */
-
 /* Copyright (c) 2008-2015. The 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. */
 
-#include "xbt/ex_interface.h"   /* internals of backtrace setup */
+/* mc_diff - Memory snapshooting and comparison                             */
+
+#include "src/xbt/ex_interface.h"   /* internals of backtrace setup */
 #include "xbt/str.h"
 #include "mc/mc.h"
 #include "xbt/mmalloc.h"
-#include "mc_object_info.h"
+#include "src/mc/mc_object_info.h"
 #include "mc/datatypes.h"
-#include "mc/mc_private.h"
-#include "mc/mc_snapshot.h"
-#include "mc/mc_dwarf.hpp"
-#include "mc/Type.hpp"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_snapshot.h"
+#include "src/mc/mc_dwarf.hpp"
+#include "src/mc/Type.hpp"
 
 using simgrid::mc::remote;
 
@@ -24,9 +24,6 @@ extern "C" {
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_diff, xbt,
                                 "Logging specific to mc_diff in mc");
 
-xbt_dynar_t mc_heap_comparison_ignore;
-xbt_dynar_t stacks_areas;
-
 /*********************************** Heap comparison ***********************************/
 /***************************************************************************************/
 
@@ -37,8 +34,8 @@ struct XBT_PRIVATE s_mc_diff {
   std::size_t heaplimit;
   // Number of blocks in the heaps:
   std::size_t heapsize1, heapsize2;
-  std::vector<s_mc_heap_ignore_region_t>* to_ignore1;
-  std::vector<s_mc_heap_ignore_region_t>* to_ignore2;
+  std::vector<simgrid::mc::IgnoredHeapRegion>* to_ignore1;
+  std::vector<simgrid::mc::IgnoredHeapRegion>* to_ignore2;
   s_heap_area_t *equals_to1, *equals_to2;
   simgrid::mc::Type **types1;
   simgrid::mc::Type **types2;
@@ -50,7 +47,7 @@ struct XBT_PRIVATE s_mc_diff {
 #define types1_(i,j) types1[ MAX_FRAGMENT_PER_BLOCK*(i) + (j)]
 #define types2_(i,j) types2[ MAX_FRAGMENT_PER_BLOCK*(i) + (j)]
 
-__thread struct s_mc_diff *mc_diff_info = NULL;
+static __thread struct s_mc_diff *mc_diff_info = nullptr;
 
 /*********************************** Free functions ************************************/
 
@@ -120,15 +117,16 @@ static int add_heap_area_pair(xbt_dynar_t list, int block1, int fragment1,
   return 0;
 }
 
-static ssize_t heap_comparison_ignore_size(std::vector<s_mc_heap_ignore_region_t>* ignore_list,
-                                           const void *address)
+static ssize_t heap_comparison_ignore_size(
+  std::vector<simgrid::mc::IgnoredHeapRegion>* ignore_list,
+  const void *address)
 {
   int start = 0;
   int end = ignore_list->size() - 1;
 
   while (start <= end) {
     unsigned int cursor = (start + end) / 2;
-    s_mc_heap_ignore_region_t region = (*ignore_list)[cursor];
+    simgrid::mc::IgnoredHeapRegion const& region = (*ignore_list)[cursor];
     if (region.address == address)
       return region.size;
     if (region.address < address)
@@ -140,31 +138,21 @@ static ssize_t heap_comparison_ignore_size(std::vector<s_mc_heap_ignore_region_t
   return -1;
 }
 
-static int is_stack(const void *address)
+static bool is_stack(const void *address)
 {
-  unsigned int cursor = 0;
-  stack_region_t stack;
-
-  xbt_dynar_foreach(stacks_areas, cursor, stack) {
-    if (address == stack->address)
-      return 1;
-  }
-
-  return 0;
+  for (auto const& stack : mc_model_checker->process().stack_areas())
+    if (address == stack.address)
+      return true;
+  return false;
 }
 
 // TODO, this should depend on the snapshot?
-static int is_block_stack(int block)
+static bool is_block_stack(int block)
 {
-  unsigned int cursor = 0;
-  stack_region_t stack;
-
-  xbt_dynar_foreach(stacks_areas, cursor, stack) {
-    if (block == stack->block)
-      return 1;
-  }
-
-  return 0;
+  for (auto const& stack : mc_model_checker->process().stack_areas())
+    if (block == stack.block)
+      return true;
+  return false;
 }
 
 static void match_equals(struct s_mc_diff *state, xbt_dynar_t list)
@@ -236,8 +224,8 @@ static int equal_fragments(struct s_mc_diff *state, int b1, int f1, int b2,
 }
 
 int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2,
-                          std::vector<s_mc_heap_ignore_region_t>* i1,
-                          std::vector<s_mc_heap_ignore_region_t>* i2)
+                          std::vector<simgrid::mc::IgnoredHeapRegion>* i1,
+                          std::vector<simgrid::mc::IgnoredHeapRegion>* i2)
 {
   if (mc_diff_info == NULL) {
     mc_diff_info = xbt_new0(struct s_mc_diff, 1);