#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"
using simgrid::mc::remote;
-extern "C" {
-
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, xbt,
"Logging specific to mc_compare in mc");
-}
-
namespace simgrid {
namespace mc {
using simgrid::mc::ComparisonState;
-extern "C" {
-
/************************** Snapshot comparison *******************************/
/******************************************************************************/
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,
+ 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)
{
simgrid::mc::Process* process = &mc_model_checker->process();
&& 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,
+ return simgrid::mc::compare_heap_area(process_index, addr_pointed1, addr_pointed2, snapshot1,
snapshot2, nullptr, type->subtype, pointer_level);
}
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.");
}
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)
{
return 0;
}
-int snapshot_compare(void *state1, void *state2)
+namespace simgrid {
+namespace mc {
+
+int snapshot_compare(int num1, simgrid::mc::Snapshot* s1, int num2, simgrid::mc::Snapshot* s2)
{
simgrid::mc::Process* process = &mc_model_checker->process();
- mc_snapshot_t s1, s2;
- int num1, num2;
-
- if (_sg_mc_liveness) { /* Liveness MC */
- s1 = ((simgrid::mc::VisitedPair*) state1)->graph_state->system_state;
- s2 = ((simgrid::mc::VisitedPair*) state2)->graph_state->system_state;
- num1 = ((simgrid::mc::VisitedPair*) state1)->num;
- num2 = ((simgrid::mc::VisitedPair*) state2)->num;
- }else if (_sg_mc_termination) { /* Non-progressive cycle MC */
- s1 = ((mc_state_t) state1)->system_state;
- s2 = ((mc_state_t) state2)->system_state;
- num1 = ((mc_state_t) state1)->num;
- num2 = ((mc_state_t) state2)->num;
- } else { /* Safety or comm determinism MC */
- s1 = ((simgrid::mc::VisitedState*) state1)->system_state;
- s2 = ((simgrid::mc::VisitedState*) state2)->system_state;
- num1 = ((simgrid::mc::VisitedState*) state1)->num;
- num2 = ((simgrid::mc::VisitedState*) state2)->num;
- }
-
int errors = 0;
int res_init;
alloca(sizeof(struct mdesc)), sizeof(struct mdesc),
remote(process->heap_address),
simgrid::mc::ProcessIndexMissing, simgrid::mc::ReadOptions::lazy());
- res_init = init_heap_information(heap1, heap2, &s1->to_ignore, &s2->to_ignore);
+ 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);
num2, cursor + 1);
#endif
- reset_heap_information();
+ simgrid::mc::reset_heap_information();
return 1;
#endif
}
/* Compare heap */
- if (mmalloc_compare_heap(s1, s2) > 0) {
+ if (simgrid::mc::mmalloc_compare_heap(s1, s2) > 0) {
#ifdef MC_DEBUG
XBT_DEBUG("(%d - %d) Different heap (mmalloc_compare)", num1, num2);
#endif
}
- reset_heap_information();
+ simgrid::mc::reset_heap_information();
#ifdef MC_VERBOSE
if (errors || hash_result)
#endif
return errors > 0 || hash_result;
+}
+
+int snapshot_compare(mc_state_t state1, mc_state_t state2)
+{
+ 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 snapshot_compare(simgrid::mc::VisitedState* state1, simgrid::mc::VisitedState* state2)
+{
+ 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);
}
}
+}