#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"
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();
if (type->subtype && type->subtype->type == DW_TAG_subroutine_type)
return (addr_pointed1 != addr_pointed2);
- if (addr_pointed1 == nullptr && addr_pointed2 == NULL)
+ if (addr_pointed1 == nullptr && addr_pointed2 == nullptr)
return 0;
- if (addr_pointed1 == nullptr || addr_pointed2 == NULL)
+ if (addr_pointed1 == nullptr || addr_pointed2 == nullptr)
return 1;
if (!state.compared_pointers.insert(
std::make_pair(addr_pointed1, addr_pointed2)).second)
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;
#endif
return errors > 0 || hash_result;
-
}
}
+}