#include <simgrid_config.h> /* HAVE_MC ? */
#include <xbt.h>
+#include "xbt/automaton.h"
#ifndef SIMGRID_MODELCHECKER_H
#define SIMGRID_MODELCHECKER_H
#ifdef HAVE_MC
-extern int _surf_do_model_check;
-#define MC_IS_ENABLED _surf_do_model_check
-#else
-#define MC_IS_ENABLED 0
-#endif
+extern int _sg_do_model_check; /* please don't use directly: we inline MC_is_active, but that's what you should use */
+extern int _sg_mc_visited;
+
+#define MC_is_active() _sg_do_model_check
+#define MC_visited_reduction() _sg_mc_visited
XBT_PUBLIC(void) MC_assert(int);
-XBT_PUBLIC(void) MC_assert_stateful(int);
XBT_PUBLIC(int) MC_random(int min, int max);
-XBT_PUBLIC(void) MC_diff();
+XBT_PUBLIC(void) MC_automaton_new_propositional_symbol(const char* id, void* fct);
+XBT_PUBLIC(void *) MC_snapshot(void);
+XBT_PUBLIC(int) MC_compare_snapshots(void *s1, void *s2);
+XBT_PUBLIC(void) MC_cut(void);
+
+#else
+
+#define MC_assert(a) xbt_assert(a)
+#define MC_is_active() 0
+#define MC_visited_reduction() 0
+
+#endif
+
+
#endif /* SIMGRID_MODELCHECKER_H */
