#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 *******************************/
/******************************************************************************/
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();
- simgrid::mc::Snapshot* s1;
- simgrid::mc::Snapshot* 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;
-
}
}
+}