A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MC further cleanups (let it compile, this time)
[simgrid.git]
/
include
/
simgrid
/
modelchecker.h
diff --git
a/include/simgrid/modelchecker.h
b/include/simgrid/modelchecker.h
index
f071a26
..
c61a45d
100644
(file)
--- a/
include/simgrid/modelchecker.h
+++ b/
include/simgrid/modelchecker.h
@@
-1,16
+1,10
@@
/* simgrid/modelchecker.h - Formal Verification made possible in SimGrid */
/* simgrid/modelchecker.h - Formal Verification made possible in SimGrid */
-/* Copyright (c) 2008-20
18
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-20
22
. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-/** \file modelchecker.h
- *
- * This is the API used by the user simulated program to communicate
- * with the MC.
- */
-
#ifndef SIMGRID_MODELCHECKER_H
#define SIMGRID_MODELCHECKER_H
#ifndef SIMGRID_MODELCHECKER_H
#define SIMGRID_MODELCHECKER_H
@@
-19,19
+13,18
@@
#include <stddef.h> /* size_t */
#include <stddef.h> /* size_t */
-SG_BEGIN_DECL
()
+SG_BEGIN_DECL
+/** Explore every branches where that function returns a value between min and max (inclusive) */
XBT_PUBLIC int MC_random(int min, int max);
#if SIMGRID_HAVE_MC
XBT_PUBLIC int MC_random(int min, int max);
#if SIMGRID_HAVE_MC
-/* Internal variable used to check if we're running under the MC
- *
- * Please don't use directly: you should use MC_is_active. */
+/* Internal variable used to check if we're running under the MC. Please use MC_is_active instead. */
extern XBT_PUBLIC int _sg_do_model_check;
extern XBT_PUBLIC int _sg_mc_max_visited_states;
extern XBT_PUBLIC int _sg_do_model_check;
extern XBT_PUBLIC int _sg_mc_max_visited_states;
-#define MC_is_active()
_sg_do_model_check
+#define MC_is_active() _sg_do_model_check
#define MC_visited_reduction() _sg_mc_max_visited_states
/** Assertion for the model-checker
#define MC_visited_reduction() _sg_mc_max_visited_states
/** Assertion for the model-checker
@@
-43,12
+36,8
@@
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(const char* id, int (*fct)(void));
XBT_PUBLIC void MC_automaton_new_propositional_symbol_pointer(const char* id, int* value);
-XBT_PUBLIC void MC_cut(void);
-XBT_PUBLIC void MC_ignore(void* addr, size_t size);
-
XBT_PUBLIC void MC_ignore_heap(void* address, size_t size);
XBT_PUBLIC void MC_unignore_heap(void* address, size_t size);
XBT_PUBLIC void MC_ignore_heap(void* address, size_t size);
XBT_PUBLIC void MC_unignore_heap(void* address, size_t size);
-XBT_PUBLIC void MC_ignore_global_variable(const char* var_name);
#else
#else
@@
-56,17
+45,15
@@
XBT_PUBLIC void MC_ignore_global_variable(const char* var_name);
#define MC_visited_reduction() 0
#define MC_assert(a) xbt_assert(a)
#define MC_visited_reduction() 0
#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(a, b) ((void)0)
#define MC_automaton_new_propositional_symbol_pointer(a, b) ((void)0)
-#define MC_cut() ((void)0)
-#define MC_ignore(a, b) ((void)0)
-#define MC_ignore_heap(a,s) ((void)0)
-#define MC_remove_ignore_heap(a,s) ((void)0)
-#define MC_ignore_global_variable(v) ((void)0)
+#define MC_ignore_heap(a, s) ((void)0)
+#define MC_unignore_heap(a, s) ((void)0)
#endif
#endif
-SG_END_DECL
()
+SG_END_DECL
#endif /* SIMGRID_MODELCHECKER_H */
#endif /* SIMGRID_MODELCHECKER_H */