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
add waitfor of Io too
[simgrid.git]
/
include
/
simgrid
/
modelchecker.h
diff --git
a/include/simgrid/modelchecker.h
b/include/simgrid/modelchecker.h
index
0b920bb
..
b4eb10c
100644
(file)
--- a/
include/simgrid/modelchecker.h
+++ b/
include/simgrid/modelchecker.h
@@
-1,7
+1,6
@@
/* simgrid/modelchecker.h - Formal Verification made possible in SimGrid */
/* simgrid/modelchecker.h - Formal Verification made possible in SimGrid */
-/* Copyright (c) 2008-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2008-2019. 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. */
@@
-15,39
+14,41
@@
#ifndef SIMGRID_MODELCHECKER_H
#define SIMGRID_MODELCHECKER_H
#ifndef SIMGRID_MODELCHECKER_H
#define SIMGRID_MODELCHECKER_H
-#include <stdbool.h>
-#include <stddef.h> /* size_t */
-
-#include <simgrid_config.h> /* SIMGRID_HAVE_MC ? */
-
+#include <simgrid/config.h> /* SIMGRID_HAVE_MC ? */
#include <xbt/base.h>
#include <xbt/base.h>
-SG_BEGIN_DECL()
+#include <stddef.h> /* size_t */
-XBT_PUBLIC(int) MC_random(int min, int max);
+SG_BEGIN_DECL
+
+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. */
#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. */
-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
*
* This function is used to define safety properties to verify.
*/
#define MC_visited_reduction() _sg_mc_max_visited_states
/** Assertion for the model-checker
*
* This function is used to define safety properties to verify.
*/
-XBT_PUBLIC(void) MC_assert(int);
+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* valu
e);
+XBT_PUBLIC
void MC_cut(void
);
+XBT_PUBLIC
void MC_ignore(void* addr, size_t siz
e);
-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_global_variable(const char* var_name);
#else
#else
@@
-60,8
+61,12
@@
XBT_PUBLIC(void) MC_ignore(void *addr, size_t size);
#define MC_cut() ((void)0)
#define MC_ignore(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)
+
#endif
#endif
-SG_END_DECL
()
+SG_END_DECL
#endif /* SIMGRID_MODELCHECKER_H */
#endif /* SIMGRID_MODELCHECKER_H */