-/* Copyright (c) 2008-2016. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-2017. 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 "src/internal_config.h"
#include "src/xbt/mmalloc/mmprivate.h"
-#include "src/xbt/ex_interface.h"
#if HAVE_SMPI
#include "src/smpi/private.h"
static inline
HeapLocationPair makeHeapLocationPair(int block1, int fragment1, int block2, int fragment2)
{
- return simgrid::mc::HeapLocationPair({
+ return simgrid::mc::HeapLocationPair{{
simgrid::mc::HeapLocation(block1, fragment1),
simgrid::mc::HeapLocation(block2, fragment2)
- });
+ }};
}
struct HeapArea : public HeapLocation {
/** Check whether two blocks are known to be matching
*
- * @param state State used
* @param b1 Block of state 1
* @param b2 Block of state 2
* @return if the blocks are known to be matching
/** Check whether two fragments are known to be matching
*
- * @param state State used
* @param b1 Block of state 1
* @param f1 Fragment of state 1
* @param b2 Block of state 2
}
if (i1 == state.heaplimit)
- XBT_DEBUG("Number of blocks/fragments not found in heap1 : %d", nb_diff1);
+ XBT_DEBUG("Number of blocks/fragments not found in heap1: %d", nb_diff1);
for (i=1; i < state.heaplimit; i++) {
const malloc_info* heapinfo2 = (const malloc_info*) MC_region_read(
}
if (i1 == state.heaplimit)
- XBT_DEBUG("Number of blocks/fragments not found in heap2 : %d", nb_diff2);
+ XBT_DEBUG("Number of blocks/fragments not found in heap2: %d", nb_diff2);
return nb_diff1 > 0 || nb_diff2 > 0;
}
return nullptr;
default:
- /* FIXME : other cases ? */
+ /* FIXME: other cases ? */
return nullptr;
}
return -1;
break;
default:
- XBT_VERB("Unknown case : %d", type->type);
+ XBT_VERB("Unknown case: %d", type->type);
break;
}
if (_sg_mc_hash) {
hash_result = (s1->hash != s2->hash);
if (hash_result) {
- XBT_VERB("(%d - %d) Different hash : 0x%" PRIx64 "--0x%" PRIx64, num1,
- num2, s1->hash, s2->hash);
+ XBT_VERB("(%d - %d) Different hash: 0x%" PRIx64 "--0x%" PRIx64, num1, num2, s1->hash, s2->hash);
#ifndef MC_DEBUG
return 1;
#endif
} else
- XBT_VERB("(%d - %d) Same hash : 0x%" PRIx64, num1, num2, s1->hash);
+ XBT_VERB("(%d - %d) Same hash: 0x%" PRIx64, num1, num2, s1->hash);
}
/* Compare enabled processes */
size_used2 = s2->stack_sizes[i];
if (size_used1 != size_used2) {
#ifdef MC_DEBUG
- XBT_DEBUG("(%d - %d) Different size used in stacks : %zu - %zu", num1,
- num2, size_used1, size_used2);
+ XBT_DEBUG("(%d - %d) Different size used in stacks: %zu - %zu", num1, num2, size_used1, size_used2);
errors++;
is_diff = 1;
#else
#ifdef MC_VERBOSE
- XBT_VERB("(%d - %d) Different size used in stacks : %zu - %zu", num1,
- num2, size_used1, size_used2);
+ XBT_VERB("(%d - %d) Different size used in stacks: %zu - %zu", num1, num2, size_used1, size_used2);
#endif
return 1;
#endif
}
/* Stacks comparison */
- unsigned cursor = 0;
int diff_local = 0;
#ifdef MC_DEBUG
is_diff = 0;
#endif
- mc_snapshot_stack_t stack1, stack2;
- while (cursor < s1->stacks.size()) {
- stack1 = &s1->stacks[cursor];
- stack2 = &s2->stacks[cursor];
+ for (unsigned int cursor = 0; cursor < s1->stacks.size(); cursor++) {
+ mc_snapshot_stack_t stack1 = &s1->stacks[cursor];
+ mc_snapshot_stack_t stack2 = &s2->stacks[cursor];
if (stack1->process_index != stack2->process_index) {
diff_local = 1;
return 1;
#endif
}
- cursor++;
}
size_t regions_count = s1->snapshot_regions.size();
#ifdef MC_VERBOSE
XBT_VERB("(%d - %d) Different heap (mmalloc_compare)", num1, num2);
#endif
-
return 1;
#endif
}