further reduce the amount of call sites for RemoteProcess::actors()

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

diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp
index ce9121e..a59f4c7 100644 (file)
--- a/src/mc/compare.cpp
+++ b/src/mc/compare.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2008-2022. 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. */
@@ -11,12 +11,9 @@
 
 #include <algorithm>
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, xbt, "Logging specific to mc_compare in mc");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, mc, "Logging specific to mc_compare in mc");
 
-using simgrid::mc::remote;
-
-namespace simgrid {
-namespace mc {
+namespace simgrid::mc {
 
 /*********************************** Heap comparison ***********************************/
 /***************************************************************************************/
@@ -127,8 +124,7 @@ public:
   void match_equals(const HeapLocationPairs* list);
 };
 
-} // namespace mc
-} // namespace simgrid
+} // namespace simgrid::mc
 
 /************************************************************************************/
 
@@ -155,8 +151,7 @@ static bool is_block_stack(const simgrid::mc::RemoteProcess& process, int block)
                      [block](auto const& stack) { return stack.block == block; });
 }
 
-namespace simgrid {
-namespace mc {
+namespace simgrid::mc {
 
 void StateComparator::match_equals(const HeapLocationPairs* list)
 {
@@ -820,7 +815,8 @@ static bool heap_area_differ(const RemoteProcess& process, StateComparator& stat
 
     if (type_size != -1 && type_size != (ssize_t)heapinfo1->busy_block.busy_size &&
         type_size != (ssize_t)heapinfo2->busy_block.busy_size &&
-        (type->name.empty() || type->name == "struct s_smx_context")) {
+        (type->name.empty() ||
+         type->name == "struct s_smx_context")) { // FIXME: there is no struct s_smx_context anymore
       if (match_pairs)
         state.match_equals(previous);
       return false;
@@ -880,7 +876,7 @@ static bool heap_area_differ(const RemoteProcess& process, StateComparator& stat
     }
 
     // Check if the blocks are already matched together:
-    if (state.equals_to_<1>(block1, frag1).valid_ && state.equals_to_<2>(block2, frag2).valid_ && offset1 == offset2 &&
+    if (state.equals_to_<1>(block1, frag1).valid_ && state.equals_to_<2>(block2, frag2).valid_ &&
         state.fragmentsEqual(block1, frag1, block2, frag2)) {
       if (match_pairs)
         state.match_equals(previous);
@@ -975,19 +971,17 @@ static bool heap_area_differ(const RemoteProcess& process, StateComparator& stat
     return true;
 
   /* Start comparison */
-  bool differ = type ? heap_area_differ_with_type(process, state, area1, area2, snapshot1, snapshot2, previous, type,
-                                                  size, check_ignore, pointer_level)
-                     : heap_area_differ_without_type(process, state, area1, area2, snapshot1, snapshot2, previous, size,
-                                                     check_ignore);
-  if (differ)
+  if (type ? heap_area_differ_with_type(process, state, area1, area2, snapshot1, snapshot2, previous, type, size,
+                                        check_ignore, pointer_level)
+           : heap_area_differ_without_type(process, state, area1, area2, snapshot1, snapshot2, previous, size,
+                                           check_ignore))
     return true;
 
   if (match_pairs)
     state.match_equals(previous);
   return false;
 }
-} // namespace mc
-} // namespace simgrid
+} // namespace simgrid::mc
 
 /************************** Snapshot comparison *******************************/
 /******************************************************************************/
@@ -1178,8 +1172,7 @@ static bool local_variables_differ(const simgrid::mc::RemoteProcess& process, si
   return false;
 }
 
-namespace simgrid {
-namespace mc {
+namespace simgrid::mc {
 
 bool snapshot_equal(const Snapshot* s1, const Snapshot* s2)
 {
@@ -1189,24 +1182,20 @@ bool snapshot_equal(const Snapshot* s1, const Snapshot* s2)
   const RemoteProcess& process = mc_model_checker->get_remote_process();
 
   if (s1->hash_ != s2->hash_) {
-    XBT_VERB("(%d - %d) Different hash: 0x%" PRIx64 "--0x%" PRIx64, s1->num_state_, s2->num_state_, s1->hash_,
+    XBT_VERB("(%ld - %ld) Different hash: 0x%" PRIx64 "--0x%" PRIx64, s1->num_state_, s2->num_state_, s1->hash_,
              s2->hash_);
     return false;
   }
-  XBT_VERB("(%d - %d) Same hash: 0x%" PRIx64, s1->num_state_, s2->num_state_, s1->hash_);
+  XBT_VERB("(%ld - %ld) Same hash: 0x%" PRIx64, s1->num_state_, s2->num_state_, s1->hash_);
 
-  /* Compare enabled processes */
-  if (s1->enabled_processes_ != s2->enabled_processes_) {
-    XBT_VERB("(%d - %d) Different amount of enabled processes", s1->num_state_, s2->num_state_);
-    return false;
-  }
+  /* TODO: re-enable the quick filter of counting enabled processes in each snapshots */
 
   /* Compare size of stacks */
   for (unsigned long i = 0; i < s1->stacks_.size(); i++) {
     size_t size_used1 = s1->stack_sizes_[i];
     size_t size_used2 = s2->stack_sizes_[i];
     if (size_used1 != size_used2) {
-      XBT_VERB("(%d - %d) Different size used in stacks: %zu - %zu", s1->num_state_, s2->num_state_, size_used1,
+      XBT_VERB("(%ld - %ld) Different size used in stacks: %zu - %zu", s1->num_state_, s2->num_state_, size_used1,
                size_used2);
       return false;
     }
@@ -1218,7 +1207,7 @@ bool snapshot_equal(const Snapshot* s1, const Snapshot* s2)
   const s_xbt_mheap_t* heap2 = static_cast<xbt_mheap_t>(
       s2->read_bytes(alloca(sizeof(s_xbt_mheap_t)), sizeof(s_xbt_mheap_t), process.heap_address, ReadOptions::lazy()));
   if (state_comparator.initHeapInformation(heap1, heap2, s1->to_ignore_, s2->to_ignore_) == -1) {
-    XBT_VERB("(%d - %d) Different heap information", s1->num_state_, s2->num_state_);
+    XBT_VERB("(%ld - %ld) Different heap information", s1->num_state_, s2->num_state_);
     return false;
   }
 
@@ -1228,7 +1217,7 @@ bool snapshot_equal(const Snapshot* s1, const Snapshot* s2)
     const_mc_snapshot_stack_t stack2 = &s2->stacks_[cursor];
 
     if (local_variables_differ(process, state_comparator, *s1, *s2, stack1, stack2)) {
-      XBT_VERB("(%d - %d) Different local variables between stacks %u", s1->num_state_, s2->num_state_, cursor + 1);
+      XBT_VERB("(%ld - %ld) Different local variables between stacks %u", s1->num_state_, s2->num_state_, cursor + 1);
       return false;
     }
   }
@@ -1252,20 +1241,19 @@ bool snapshot_equal(const Snapshot* s1, const Snapshot* s2)
     /* Compare global variables */
     if (global_variables_differ(process, state_comparator, region1->object_info(), region1, region2, *s1, *s2)) {
       std::string const& name = region1->object_info()->file_name;
-      XBT_VERB("(%d - %d) Different global variables in %s", s1->num_state_, s2->num_state_, name.c_str());
+      XBT_VERB("(%ld - %ld) Different global variables in %s", s1->num_state_, s2->num_state_, name.c_str());
       return false;
     }
   }
 
   /* Compare heap */
   if (mmalloc_heap_differ(process, state_comparator, *s1, *s2)) {
-    XBT_VERB("(%d - %d) Different heap (mmalloc_compare)", s1->num_state_, s2->num_state_);
+    XBT_VERB("(%ld - %ld) Different heap (mmalloc_compare)", s1->num_state_, s2->num_state_);
     return false;
   }
 
-  XBT_VERB("(%d - %d) No difference found", s1->num_state_, s2->num_state_);
+  XBT_VERB("(%ld - %ld) No difference found", s1->num_state_, s2->num_state_);
 
   return true;
 }
-} // namespace mc
-} // namespace simgrid
+} // namespace simgrid::mc