-/* Copyright (c) 2012-2014. The SimGrid Team.
+/* Copyright (c) 2012-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. */
#define __STDC_FORMAT_MACROS
-#include <inttypes.h>
-#include <boost/unordered_set.hpp>
-
-#include "internal_config.h"
-#include "mc_object_info.h"
-#include "mc_safety.h"
-#include "mc_liveness.h"
-#include "mc_private.h"
-
-#ifdef HAVE_SMPI
-#include "smpi/private.h"
+#include <cinttypes>
+
+#include <utility>
+#include <unordered_set>
+
+#include <xbt/sysdep.h>
+
+#include "src/internal_config.h"
+#include "src/mc/mc_forward.hpp"
+#include "src/mc/mc_safety.h"
+#include "src/mc/mc_liveness.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_smx.h"
+#include "src/mc/mc_dwarf.hpp"
+#include "src/mc/malloc.hpp"
+#include "src/mc/Frame.hpp"
+#include "src/mc/ObjectInformation.hpp"
+#include "src/mc/Variable.hpp"
+
+#if HAVE_SMPI
+#include "src/smpi/private.h"
#endif
#include "xbt/mmalloc.h"
-#include "xbt/mmalloc/mmprivate.h"
-
-#include <xbt/probes.h>
+#include "src/xbt/mmalloc/mmprivate.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, mc,
- "Logging specific to mc_compare");
-
-typedef struct s_pointers_pair {
- void *p1;
- void *p2;
- bool operator==(s_pointers_pair const& x) const {
- return this->p1 == x.p1 && this->p2 == x.p2;
- }
- bool operator<(s_pointers_pair const& x) const {
- return this->p1 < x.p1 || (this->p1 == x.p1 && this->p2 < x.p2);
- }
-} s_pointers_pair_t, *pointers_pair_t;
-
-namespace boost {
- template<>
- struct hash<s_pointers_pair> {
- typedef uintptr_t result_type;
- result_type operator()(s_pointers_pair const& x) const {
- return (result_type) x.p1 ^
- ((result_type) x.p2 << 8 | (result_type) x.p2 >> (8*sizeof(uintptr_t) - 8));
- }
- };
-}
+using simgrid::mc::remote;
-struct mc_compare_state {
- boost::unordered_set<s_pointers_pair> compared_pointers;
-};
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, xbt,
+ "Logging specific to mc_compare in mc");
-extern "C" {
+namespace simgrid {
+namespace mc {
-/************************** Free functions ****************************/
-/********************************************************************/
+/** A hash which works with more stuff
+ *
+ * It can hash pairs: the standard hash currently doesn't include this.
+ */
+template<class X> struct hash : public std::hash<X> {};
-static void stack_region_free(stack_region_t s)
-{
- if (s) {
- xbt_free(s->process_name);
- xbt_free(s);
+template<class X, class Y>
+struct hash<std::pair<X,Y>> {
+ std::size_t operator()(std::pair<X,Y>const& x) const
+ {
+ struct hash<X> h1;
+ struct hash<X> h2;
+ return h1(x.first) ^ h2(x.second);
}
-}
+};
-static void stack_region_free_voidp(void *s)
-{
- stack_region_free((stack_region_t) * (void **) s);
-}
+struct ComparisonState {
+ std::unordered_set<std::pair<void*, void*>, hash<std::pair<void*, void*>>> compared_pointers;
+};
-static void pointers_pair_free(pointers_pair_t p)
-{
- xbt_free(p);
}
-
-static void pointers_pair_free_voidp(void *p)
-{
- pointers_pair_free((pointers_pair_t) * (void **) p);
}
+using simgrid::mc::ComparisonState;
+
/************************** Snapshot comparison *******************************/
/******************************************************************************/
-/** \brief Try to add a pair a compared pointers to the set of compared pointers
- *
- * \result !=0 if the pointers were added (they were not in the set),
- * 0 otherwise (they were already in the set)
- */
-static int add_compared_pointers(mc_compare_state& state, void *p1, void *p2)
-{
- s_pointers_pair_t new_pair;
- new_pair.p1 = p1;
- new_pair.p2 = p2;
- return state.compared_pointers.insert(new_pair).second ? 1 : 0;
-}
-
-static int compare_areas_with_type(struct mc_compare_state& state,
+static int compare_areas_with_type(ComparisonState& state,
int process_index,
- void* real_area1, mc_snapshot_t snapshot1, mc_mem_region_t region1,
- void* real_area2, mc_snapshot_t snapshot2, mc_mem_region_t region2,
- dw_type_t type, int pointer_level)
+ void* real_area1, simgrid::mc::Snapshot* snapshot1, mc_mem_region_t region1,
+ void* real_area2, simgrid::mc::Snapshot* snapshot2, mc_mem_region_t region2,
+ simgrid::mc::Type* type, int pointer_level)
{
- unsigned int cursor = 0;
- dw_type_t member, subtype, subsubtype;
+ simgrid::mc::Process* process = &mc_model_checker->process();
+
+ simgrid::mc::Type* subtype;
+ simgrid::mc::Type* subsubtype;
int elm_size, i, res;
top:
case DW_TAG_enumeration_type:
case DW_TAG_union_type:
{
- return mc_snapshot_region_memcmp(
+ return MC_snapshot_region_memcmp(
real_area1, region1, real_area2, region2,
type->byte_size) != 0;
}
case DW_TAG_reference_type:
case DW_TAG_rvalue_reference_type:
{
- void* addr_pointed1 = mc_snapshot_read_pointer_region(real_area1, region1);
- void* addr_pointed2 = mc_snapshot_read_pointer_region(real_area2, region2);
+ void* addr_pointed1 = MC_region_read_pointer(region1, real_area1);
+ void* addr_pointed2 = MC_region_read_pointer(region2, real_area2);
- if (type->subtype && type->subtype->type == DW_TAG_subroutine_type) {
+ if (type->subtype && type->subtype->type == DW_TAG_subroutine_type)
return (addr_pointed1 != addr_pointed2);
- } else {
-
- if (addr_pointed1 == NULL && addr_pointed2 == NULL)
- return 0;
- if (addr_pointed1 == NULL || addr_pointed2 == NULL)
- return 1;
- if (!add_compared_pointers(state, addr_pointed1, addr_pointed2))
- return 0;
+ if (addr_pointed1 == nullptr && addr_pointed2 == NULL)
+ return 0;
+ if (addr_pointed1 == nullptr || addr_pointed2 == NULL)
+ return 1;
+ if (!state.compared_pointers.insert(
+ std::make_pair(addr_pointed1, addr_pointed2)).second)
+ return 0;
- pointer_level++;
+ pointer_level++;
// Some cases are not handled here:
// * the pointers lead to different areas (one to the heap, the other to the RW segment ...);
// * a pointer leads to the read-only segment of the current object;
// * a pointer lead to a different ELF object.
- if (addr_pointed1 > std_heap
+ if (addr_pointed1 > process->heap_address
&& addr_pointed1 < mc_snapshot_get_heap_end(snapshot1)) {
if (!
- (addr_pointed2 > std_heap
+ (addr_pointed2 > process->heap_address
&& addr_pointed2 < mc_snapshot_get_heap_end(snapshot2)))
return 1;
// The pointers are both in the heap:
- return compare_heap_area(process_index, addr_pointed1, addr_pointed2, snapshot1,
- snapshot2, NULL, type->subtype, pointer_level);
+ return simgrid::mc::compare_heap_area(process_index, addr_pointed1, addr_pointed2, snapshot1,
+ snapshot2, nullptr, type->subtype, pointer_level);
}
// The pointers are both in the current object R/W segment:
- else if (mc_region_contain(region1, addr_pointed1)) {
- if (!mc_region_contain(region2, addr_pointed2))
+ else if (region1->contain(simgrid::mc::remote(addr_pointed1))) {
+ if (!region2->contain(simgrid::mc::remote(addr_pointed2)))
return 1;
- if (type->dw_type_id == NULL)
+ if (!type->type_id)
return (addr_pointed1 != addr_pointed2);
- else {
+ else
return compare_areas_with_type(state, process_index,
addr_pointed1, snapshot1, region1,
addr_pointed2, snapshot2, region2,
type->subtype, pointer_level);
- }
}
// TODO, We do not handle very well the case where
// it belongs to a different (non-heap) region from the current one.
- else {
+ else
return (addr_pointed1 != addr_pointed2);
- }
- }
+
break;
}
case DW_TAG_structure_type:
case DW_TAG_class_type:
- xbt_dynar_foreach(type->members, cursor, member) {
- void *member1 =
- mc_member_resolve(real_area1, type, member, snapshot1, process_index);
- void *member2 =
- mc_member_resolve(real_area2, type, member, snapshot2, process_index);
+ for(simgrid::mc::Member& member : type->members) {
+ void *member1 = simgrid::dwarf::resolve_member(
+ real_area1, type, &member, snapshot1, process_index);
+ void *member2 = simgrid::dwarf::resolve_member(
+ real_area2, type, &member, snapshot2, process_index);
mc_mem_region_t subregion1 = mc_get_region_hinted(member1, snapshot1, process_index, region1);
mc_mem_region_t subregion2 = mc_get_region_hinted(member2, snapshot2, process_index, region2);
res =
compare_areas_with_type(state, process_index,
member1, snapshot1, subregion1,
member2, snapshot2, subregion2,
- member->subtype, pointer_level);
+ member.type, pointer_level);
if (res == 1)
return res;
}
return 0;
}
-static int compare_global_variables(mc_object_info_t object_info,
+static int compare_global_variables(simgrid::mc::ObjectInformation* object_info,
int process_index,
mc_mem_region_t r1,
- mc_mem_region_t r2, mc_snapshot_t snapshot1,
- mc_snapshot_t snapshot2)
+ mc_mem_region_t r2, simgrid::mc::Snapshot* snapshot1,
+ simgrid::mc::Snapshot* snapshot2)
{
xbt_assert(r1 && r2, "Missing region.");
- struct mc_compare_state state;
- xbt_dynar_t variables;
- int res;
- unsigned int cursor = 0;
- dw_variable_t current_var;
+#if HAVE_SMPI
+ if (r1->storage_type() == simgrid::mc::StorageType::Privatized) {
+ xbt_assert(process_index >= 0);
+ if (r2->storage_type() != simgrid::mc::StorageType::Privatized)
+ return 1;
+
+ size_t process_count = MC_smpi_process_count();
+ xbt_assert(process_count == r1->privatized_data().size()
+ && process_count == r2->privatized_data().size());
+
+ // Compare the global variables separately for each simulates process:
+ for (size_t process_index = 0; process_index < process_count; process_index++) {
+ int is_diff = compare_global_variables(object_info, process_index,
+ &r1->privatized_data()[process_index],
+ &r2->privatized_data()[process_index],
+ snapshot1, snapshot2);
+ if (is_diff) return 1;
+ }
+ return 0;
+ }
+#else
+ xbt_assert(r1->storage_type() != simgrid::mc::StorageType::Privatized);
+#endif
+ xbt_assert(r2->storage_type() != simgrid::mc::StorageType::Privatized);
+
+ ComparisonState state;
- variables = object_info->global_variables;
+ std::vector<simgrid::mc::Variable>& variables = object_info->global_variables;
- xbt_dynar_foreach(variables, cursor, current_var) {
+ for (simgrid::mc::Variable& current_var : variables) {
// If the variable is not in this object, skip it:
// We do not expect to find a pointer to something which is not reachable
// by the global variables.
- if ((char *) current_var->address < (char *) object_info->start_rw
- || (char *) current_var->address > (char *) object_info->end_rw)
+ if ((char *) current_var.address < (char *) object_info->start_rw
+ || (char *) current_var.address > (char *) object_info->end_rw)
continue;
- dw_type_t bvariable_type = current_var->type;
- res =
+ simgrid::mc::Type* bvariable_type = current_var.type;
+ int res =
compare_areas_with_type(state, process_index,
- (char *) current_var->address, snapshot1, r1,
- (char *) current_var->address, snapshot2, r2,
+ (char *) current_var.address, snapshot1, r1,
+ (char *) current_var.address, snapshot2, r2,
bvariable_type, 0);
if (res == 1) {
- XBT_TRACE3(mc, global_diff, -1, -1, current_var->name);
XBT_VERB("Global variable %s (%p) is different between snapshots",
- current_var->name, (char *) current_var->address);
+ current_var.name.c_str(),
+ (char *) current_var.address);
return 1;
}
}
static int compare_local_variables(int process_index,
- mc_snapshot_t snapshot1,
- mc_snapshot_t snapshot2,
+ simgrid::mc::Snapshot* snapshot1,
+ simgrid::mc::Snapshot* snapshot2,
mc_snapshot_stack_t stack1,
mc_snapshot_stack_t stack2)
{
- struct mc_compare_state state;
+ ComparisonState state;
- if (xbt_dynar_length(stack1->local_variables) !=
- xbt_dynar_length(stack2->local_variables)) {
+ if (stack1->local_variables.size() != stack2->local_variables.size()) {
XBT_VERB("Different number of local variables");
return 1;
- } else {
+ }
+
unsigned int cursor = 0;
local_variable_t current_var1, current_var2;
int res;
- while (cursor < xbt_dynar_length(stack1->local_variables)) {
- current_var1 =
- (local_variable_t) xbt_dynar_get_as(stack1->local_variables, cursor,
- local_variable_t);
- current_var2 =
- (local_variable_t) xbt_dynar_get_as(stack2->local_variables, cursor,
- local_variable_t);
- if (strcmp(current_var1->name, current_var2->name) != 0
- || current_var1->subprogram != current_var1->subprogram
+ while (cursor < stack1->local_variables.size()) {
+ current_var1 = &stack1->local_variables[cursor];
+ current_var2 = &stack1->local_variables[cursor];
+ if (current_var1->name != current_var2->name
+ || current_var1->subprogram != current_var2->subprogram
|| current_var1->ip != current_var2->ip) {
// TODO, fix current_varX->subprogram->name to include name if DW_TAG_inlined_subprogram
XBT_VERB
- ("Different name of variable (%s - %s) or frame (%s - %s) or ip (%lu - %lu)",
- current_var1->name, current_var2->name,
- current_var1->subprogram->name, current_var2->subprogram->name,
+ ("Different name of variable (%s - %s) "
+ "or frame (%s - %s) or ip (%lu - %lu)",
+ current_var1->name.c_str(),
+ current_var2->name.c_str(),
+ current_var1->subprogram->name.c_str(),
+ current_var2->subprogram->name.c_str(),
current_var1->ip, current_var2->ip);
return 1;
}
// TODO, fix current_varX->subprogram->name to include name if DW_TAG_inlined_subprogram
- dw_type_t subtype = current_var1->type;
+ simgrid::mc::Type* subtype = current_var1->type;
res =
compare_areas_with_type(state, process_index,
current_var1->address, snapshot1, mc_get_snapshot_region(current_var1->address, snapshot1, process_index),
if (res == 1) {
// TODO, fix current_varX->subprogram->name to include name if DW_TAG_inlined_subprogram
- XBT_TRACE3(mc, local_diff, -1, -1, current_var1->name);
XBT_VERB
- ("Local variable %s (%p - %p) in frame %s is different between snapshots",
- current_var1->name, current_var1->address, current_var2->address,
- current_var1->subprogram->name);
+ ("Local variable %s (%p - %p) in frame %s "
+ "is different between snapshots",
+ current_var1->name.c_str(),
+ current_var1->address,
+ current_var2->address,
+ current_var1->subprogram->name.c_str());
return res;
}
cursor++;
}
return 0;
- }
}
-int snapshot_compare(void *state1, void *state2)
-{
+namespace simgrid {
+namespace mc {
- mc_snapshot_t s1, s2;
- int num1, num2;
-
- if (_sg_mc_liveness) { /* Liveness MC */
- s1 = ((mc_visited_pair_t) state1)->graph_state->system_state;
- s2 = ((mc_visited_pair_t) state2)->graph_state->system_state;
- num1 = ((mc_visited_pair_t) state1)->num;
- num2 = ((mc_visited_pair_t) state2)->num;
- } else { /* Safety or comm determinism MC */
- s1 = ((mc_visited_state_t) state1)->system_state;
- s2 = ((mc_visited_state_t) state2)->system_state;
- num1 = ((mc_visited_state_t) state1)->num;
- num2 = ((mc_visited_state_t) state2)->num;
- }
+static
+int snapshot_compare(int num1, simgrid::mc::Snapshot* s1, int num2, simgrid::mc::Snapshot* s2)
+{
+ simgrid::mc::Process* process = &mc_model_checker->process();
int errors = 0;
int res_init;
- xbt_os_timer_t global_timer = xbt_os_timer_new();
- xbt_os_timer_t timer = xbt_os_timer_new();
-
- xbt_os_walltimer_start(global_timer);
-
-#ifdef MC_DEBUG
- xbt_os_walltimer_start(timer);
-#endif
-
int hash_result = 0;
if (_sg_mc_hash) {
hash_result = (s1->hash != s2->hash);
if (hash_result) {
- XBT_TRACE2(mc, hash_diff, num1, num2);
XBT_VERB("(%d - %d) Different hash : 0x%" PRIx64 "--0x%" PRIx64, num1,
num2, s1->hash, s2->hash);
#ifndef MC_DEBUG
return 1;
#endif
- } else {
+ } else
XBT_VERB("(%d - %d) Same hash : 0x%" PRIx64, num1, num2, s1->hash);
- }
}
/* Compare enabled processes */
- unsigned int cursor;
- int pid;
- xbt_dynar_foreach(s1->enabled_processes, cursor, pid){
- if(!xbt_dynar_member(s2->enabled_processes, &pid)) {
- //XBT_TRACE3(mc, state_diff, num1, num2, "Different enabled processes");
+ if (s1->enabled_processes != s2->enabled_processes) {
XBT_VERB("(%d - %d) Different enabled processes", num1, num2);
// return 1; ??
- }
}
unsigned long i = 0;
int is_diff = 0;
/* Compare size of stacks */
- while (i < xbt_dynar_length(s1->stacks)) {
+ while (i < s1->stacks.size()) {
size_used1 = s1->stack_sizes[i];
size_used2 = s2->stack_sizes[i];
if (size_used1 != size_used2) {
#ifdef MC_DEBUG
- if (is_diff == 0) {
- xbt_os_walltimer_stop(timer);
- mc_comp_times->stacks_sizes_comparison_time =
- xbt_os_timer_elapsed(timer);
- }
XBT_DEBUG("(%d - %d) Different size used in stacks : %zu - %zu", num1,
num2, size_used1, size_used2);
errors++;
XBT_VERB("(%d - %d) Different size used in stacks : %zu - %zu", num1,
num2, size_used1, size_used2);
#endif
- XBT_TRACE3(mc, state_diff, num1, num2, "Different stack size");
-
- xbt_os_walltimer_stop(timer);
- xbt_os_timer_free(timer);
- xbt_os_walltimer_stop(global_timer);
- mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
- xbt_os_timer_free(global_timer);
-
return 1;
#endif
}
i++;
}
-#ifdef MC_DEBUG
- if (is_diff == 0)
- xbt_os_walltimer_stop(timer);
- xbt_os_walltimer_start(timer);
-#endif
-
/* Init heap information used in heap comparison algorithm */
- xbt_mheap_t heap1 = (xbt_mheap_t) mc_snapshot_read(std_heap, s1, MC_NO_PROCESS_INDEX,
- alloca(sizeof(struct mdesc)), sizeof(struct mdesc));
- xbt_mheap_t heap2 = (xbt_mheap_t) mc_snapshot_read(std_heap, s2, MC_NO_PROCESS_INDEX,
- alloca(sizeof(struct mdesc)), sizeof(struct mdesc));
- res_init = init_heap_information(heap1, heap2, s1->to_ignore, s2->to_ignore);
+ xbt_mheap_t heap1 = (xbt_mheap_t)s1->read_bytes(
+ alloca(sizeof(struct mdesc)), sizeof(struct mdesc),
+ remote(process->heap_address),
+ simgrid::mc::ProcessIndexMissing, simgrid::mc::ReadOptions::lazy());
+ xbt_mheap_t heap2 = (xbt_mheap_t)s2->read_bytes(
+ alloca(sizeof(struct mdesc)), sizeof(struct mdesc),
+ remote(process->heap_address),
+ simgrid::mc::ProcessIndexMissing, simgrid::mc::ReadOptions::lazy());
+ res_init = simgrid::mc::init_heap_information(heap1, heap2, &s1->to_ignore, &s2->to_ignore);
if (res_init == -1) {
#ifdef MC_DEBUG
XBT_DEBUG("(%d - %d) Different heap information", num1, num2);
errors++;
#else
#ifdef MC_VERBOSE
- XBT_TRACE3(mc, state_diff, num1, num2, "Different heap information");
XBT_VERB("(%d - %d) Different heap information", num1, num2);
#endif
- xbt_os_walltimer_stop(global_timer);
- mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
- xbt_os_timer_free(global_timer);
-
return 1;
#endif
}
-#ifdef MC_DEBUG
- xbt_os_walltimer_start(timer);
-#endif
/* Stacks comparison */
- cursor = 0;
+ unsigned cursor = 0;
int diff_local = 0;
#ifdef MC_DEBUG
is_diff = 0;
#endif
mc_snapshot_stack_t stack1, stack2;
- while (cursor < xbt_dynar_length(s1->stacks)) {
- stack1 =
- (mc_snapshot_stack_t) xbt_dynar_get_as(s1->stacks, cursor,
- mc_snapshot_stack_t);
- stack2 =
- (mc_snapshot_stack_t) xbt_dynar_get_as(s2->stacks, cursor,
- mc_snapshot_stack_t);
+ while (cursor < s1->stacks.size()) {
+ stack1 = &s1->stacks[cursor];
+ stack2 = &s2->stacks[cursor];
if (stack1->process_index != stack2->process_index) {
diff_local = 1;
else diff_local =
compare_local_variables(stack1->process_index, s1, s2, stack1, stack2);
if (diff_local > 0) {
- XBT_TRACE3(mc, state_diff, num1, num2, "Different local variables");
#ifdef MC_DEBUG
- if (is_diff == 0) {
- xbt_os_walltimer_stop(timer);
- mc_comp_times->stacks_comparison_time = xbt_os_timer_elapsed(timer);
- }
XBT_DEBUG("(%d - %d) Different local variables between stacks %d", num1,
num2, cursor + 1);
errors++;
num2, cursor + 1);
#endif
- reset_heap_information();
- xbt_os_walltimer_stop(timer);
- xbt_os_timer_free(timer);
- xbt_os_walltimer_stop(global_timer);
- mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
- xbt_os_timer_free(global_timer);
+ simgrid::mc::reset_heap_information();
return 1;
#endif
cursor++;
}
+ size_t regions_count = s1->snapshot_regions.size();
+ // TODO, raise a difference instead?
+ xbt_assert(regions_count == s2->snapshot_regions.size());
+ for (size_t k = 0; k != regions_count; ++k) {
+ mc_mem_region_t region1 = s1->snapshot_regions[k].get();
+ mc_mem_region_t region2 = s2->snapshot_regions[k].get();
- const char *names[3] = { "?", "libsimgrid", "binary" };
-#ifdef MC_DEBUG
- double *times[3] = {
- NULL,
- &mc_comp_times->libsimgrid_global_variables_comparison_time,
- &mc_comp_times->binary_global_variables_comparison_time
- };
-#endif
+ // Preconditions:
+ if (region1->region_type() != simgrid::mc::RegionType::Data)
+ continue;
- mc_object_info_t object_infos[] = { NULL, mc_libsimgrid_info, mc_binary_info };
+ xbt_assert(region1->region_type() == region2->region_type());
+ xbt_assert(region1->object_info() == region2->object_info());
+ xbt_assert(region1->object_info());
- int k = 0;
- for (k = 2; k != 0; --k) {
-#ifdef MC_DEBUG
- if (is_diff == 0)
- xbt_os_walltimer_stop(timer);
- xbt_os_walltimer_start(timer);
-#endif
+ std::string const& name = region1->object_info()->file_name;
/* Compare global variables */
-#ifdef HAVE_SMPI
- if (object_infos[k] == mc_binary_info && smpi_privatize_global_variables) {
- // Compare the global variables separately for each simulates process:
- for (int process_index = 0; process_index < smpi_process_count(); process_index++) {
- is_diff =
- compare_global_variables(object_infos[k], process_index,
- s1->privatization_regions[process_index], s2->privatization_regions[process_index], s1, s2);
- if (is_diff) break;
- }
- }
- else
-#endif
- is_diff =
- compare_global_variables(object_infos[k], MC_NO_PROCESS_INDEX, s1->regions[k], s2->regions[k], s1, s2);
+ is_diff =
+ compare_global_variables(region1->object_info(),
+ simgrid::mc::ProcessIndexDisabled,
+ region1, region2,
+ s1, s2);
if (is_diff != 0) {
- XBT_TRACE3(mc, state_diff, num1, num2, "Different global variables");
#ifdef MC_DEBUG
- xbt_os_walltimer_stop(timer);
- *times[k] = xbt_os_timer_elapsed(timer);
- XBT_DEBUG("(%d - %d) Different global variables in %s", num1, num2,
- names[k]);
+ XBT_DEBUG("(%d - %d) Different global variables in %s",
+ num1, num2, name.c_str());
errors++;
#else
#ifdef MC_VERBOSE
- XBT_VERB("(%d - %d) Different global variables in %s", num1, num2,
- names[k]);
+ XBT_VERB("(%d - %d) Different global variables in %s",
+ num1, num2, name.c_str());
#endif
- reset_heap_information();
- xbt_os_walltimer_stop(timer);
- xbt_os_timer_free(timer);
- xbt_os_walltimer_stop(global_timer);
- mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
- xbt_os_timer_free(global_timer);
-
return 1;
#endif
}
}
-#ifdef MC_DEBUG
- xbt_os_walltimer_start(timer);
-#endif
-
/* Compare heap */
- if (mmalloc_compare_heap(s1, s2) > 0) {
- XBT_TRACE3(mc, state_diff, num1, num2, "Different heap");
+ if (simgrid::mc::mmalloc_compare_heap(s1, s2) > 0) {
#ifdef MC_DEBUG
- xbt_os_walltimer_stop(timer);
- mc_comp_times->heap_comparison_time = xbt_os_timer_elapsed(timer);
XBT_DEBUG("(%d - %d) Different heap (mmalloc_compare)", num1, num2);
errors++;
#else
XBT_VERB("(%d - %d) Different heap (mmalloc_compare)", num1, num2);
#endif
- reset_heap_information();
- xbt_os_walltimer_stop(timer);
- xbt_os_timer_free(timer);
- xbt_os_walltimer_stop(global_timer);
- mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
- xbt_os_timer_free(global_timer);
-
return 1;
-#endif
- } else {
-#ifdef MC_DEBUG
- xbt_os_walltimer_stop(timer);
#endif
}
- reset_heap_information();
-
- xbt_os_walltimer_stop(timer);
- xbt_os_timer_free(timer);
-
-#ifdef MC_VERBOSE
- xbt_os_walltimer_stop(global_timer);
- mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
-#endif
-
- xbt_os_timer_free(global_timer);
-
-#ifdef MC_DEBUG
- print_comparison_times();
-#endif
+ simgrid::mc::reset_heap_information();
#ifdef MC_VERBOSE
if (errors || hash_result)
#endif
return errors > 0 || hash_result;
-
}
-/***************************** Statistics *****************************/
-/*******************************************************************/
-
-void print_comparison_times()
+int snapshot_compare(simgrid::mc::VisitedPair* state1, simgrid::mc::VisitedPair* state2)
{
- XBT_DEBUG("*** Comparison times ***");
- XBT_DEBUG("- Nb processes : %f", mc_comp_times->nb_processes_comparison_time);
- XBT_DEBUG("- Nb bytes used : %f", mc_comp_times->bytes_used_comparison_time);
- XBT_DEBUG("- Stacks sizes : %f", mc_comp_times->stacks_sizes_comparison_time);
- XBT_DEBUG("- Binary global variables : %f",
- mc_comp_times->binary_global_variables_comparison_time);
- XBT_DEBUG("- Libsimgrid global variables : %f",
- mc_comp_times->libsimgrid_global_variables_comparison_time);
- XBT_DEBUG("- Heap : %f", mc_comp_times->heap_comparison_time);
- XBT_DEBUG("- Stacks : %f", mc_comp_times->stacks_comparison_time);
+ simgrid::mc::Snapshot* s1 = state1->graph_state->system_state;
+ simgrid::mc::Snapshot* s2 = state2->graph_state->system_state;
+ int num1 = state1->num;
+ int num2 = state2->num;
+ return snapshot_compare(num1, s1, num2, s2);
}
-/**************************** MC snapshot compare simcall **************************/
-/***********************************************************************************/
-
-int simcall_HANDLER_mc_compare_snapshots(smx_simcall_t simcall,
- mc_snapshot_t s1, mc_snapshot_t s2)
+int snapshot_compare(mc_state_t state1, mc_state_t state2)
{
- return snapshot_compare(s1, s2);
+ simgrid::mc::Snapshot* s1 = state1->system_state;
+ simgrid::mc::Snapshot* s2 = state2->system_state;
+ int num1 = state1->num;
+ int num2 = state2->num;
+ return snapshot_compare(num1, s1, num2, s2);
}
-int MC_compare_snapshots(void *s1, void *s2)
+int snapshot_compare(simgrid::mc::VisitedState* state1, simgrid::mc::VisitedState* state2)
{
-
- return simcall_mc_compare_snapshots(s1, s2);
-
+ simgrid::mc::Snapshot* s1 = state1->system_state;
+ simgrid::mc::Snapshot* s2 = state2->system_state;
+ int num1 = state1->num;
+ int num2 = state2->num;
+ return snapshot_compare(num1, s1, num2, s2);
}
}
+}
