X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/55385199b11593e9afc79c5c42d5a302b9c26b6a..1a697cc4a3e16062754e16e0e4662510131ed35a:/include/simgrid/modelchecker.h diff --git a/include/simgrid/modelchecker.h b/include/simgrid/modelchecker.h index 3c14b2ad9e..4015e9a654 100644 --- a/include/simgrid/modelchecker.h +++ b/include/simgrid/modelchecker.h @@ -1,6 +1,6 @@ /* simgrid/modelchecker.h - Formal Verification made possible in SimGrid */ -/* Copyright (c) 2008-2014. The SimGrid Team. +/* Copyright (c) 2008-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -12,15 +12,15 @@ * with the MC. */ +#ifndef SIMGRID_MODELCHECKER_H +#define SIMGRID_MODELCHECKER_H + #include #include /* HAVE_MC ? */ #include #include "xbt/automaton.h" -#ifndef SIMGRID_MODELCHECKER_H -#define SIMGRID_MODELCHECKER_H - SG_BEGIN_DECL() XBT_PUBLIC(int) MC_random(int min, int max); @@ -30,8 +30,8 @@ XBT_PUBLIC(int) MC_random(int min, int max); /* Internal variable used to check if we're running under the MC * * Please don't use directly: you should use MC_is_active. */ -extern int _sg_do_model_check; -extern int _sg_mc_visited; +extern XBT_PUBLIC(int) _sg_do_model_check; +extern XBT_PUBLIC(int) _sg_mc_visited; #define MC_is_active() _sg_do_model_check #define MC_visited_reduction() _sg_mc_visited @@ -44,9 +44,7 @@ XBT_PUBLIC(void) MC_assert(int); XBT_PUBLIC(void) MC_automaton_new_propositional_symbol(const char* id, int(*fct)(void)); XBT_PUBLIC(void) MC_automaton_new_propositional_symbol_pointer(const char *id, int* value); -XBT_PUBLIC(void) MC_automaton_new_propositional_symbol_callback(const char* id, - xbt_automaton_propositional_symbol_callback_type callback, - void* data, xbt_automaton_propositional_symbol_free_function_type free_function); + XBT_PUBLIC(void *) MC_snapshot(void); XBT_PUBLIC(int) MC_compare_snapshots(void *s1, void *s2); XBT_PUBLIC(void) MC_cut(void); @@ -60,8 +58,6 @@ XBT_PUBLIC(void) MC_ignore(void *addr, size_t size); #define MC_assert(a) xbt_assert(a) #define MC_automaton_new_propositional_symbol(a, b) ((void)0) #define MC_automaton_new_propositional_symbol_pointer(a, b) ((void)0) -#define MC_automaton_new_propositional_symbol_callback(id,callback,data,free_function) \ - if(free_function) free_function(data); #define MC_snapshot() ((void*)0) #define MC_compare_snapshots(a, b) 0 #define MC_cut() ((void)0)