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 ***********************************/
/***************************************************************************************/
void match_equals(const HeapLocationPairs* list);
};
-} // namespace mc
-} // namespace simgrid
+} // namespace simgrid::mc
/************************************************************************************/
[block](auto const& stack) { return stack.block == block; });
}
-namespace simgrid {
-namespace mc {
+namespace simgrid::mc {
void StateComparator::match_equals(const HeapLocationPairs* list)
{
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;
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 *******************************/
/******************************************************************************/
return false;
}
-namespace simgrid {
-namespace mc {
+namespace simgrid::mc {
bool snapshot_equal(const Snapshot* s1, const Snapshot* s2)
{
}
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("(%ld - %ld) 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++) {
return true;
}
-} // namespace mc
-} // namespace simgrid
+} // namespace simgrid::mc