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
model-checker : new function MC_diff to display all informations about a system state
[simgrid.git]
/
src
/
mc
/
private.h
diff --git
a/src/mc/private.h
b/src/mc/private.h
index
3960433
..
389c087
100644
(file)
--- a/
src/mc/private.h
+++ b/
src/mc/private.h
@@
-1,5
+1,3
@@
-/* $Id: private.h 5497 2008-05-26 12:19:15Z cristianrosa $ */
-
/* Copyright (c) 2007 Arnaud Legrand, Bruno Donnassolo.
All rights reserved. */
/* Copyright (c) 2007 Arnaud Legrand, Bruno Donnassolo.
All rights reserved. */
@@
-48,7
+46,7
@@
extern double *mc_time;
/* Bound of the MC depth-first search algorithm */
#define MAX_DEPTH 1000
/* Bound of the MC depth-first search algorithm */
#define MAX_DEPTH 1000
-#define MAX_DEPTH_LIVENESS 50
+#define MAX_DEPTH_LIVENESS 50
0
int MC_deadlock_check(void);
void MC_replay(xbt_fifo_t stack);
int MC_deadlock_check(void);
void MC_replay(xbt_fifo_t stack);
@@
-210,6
+208,9
@@
void MC_exit_stateful(void);
/********************************** Double-DFS for liveness property**************************************/
/********************************** Double-DFS for liveness property**************************************/
+extern mc_snapshot_t initial_snapshot_liveness;
+extern xbt_automaton_t automaton;
+
typedef struct s_mc_pair{
mc_snapshot_t system_state;
mc_state_t graph_state;
typedef struct s_mc_pair{
mc_snapshot_t system_state;
mc_state_t graph_state;
@@
-232,18
+233,24
@@
typedef struct s_mc_pair_visited{
typedef struct s_mc_pair_visited_hash{
xbt_state_t automaton_state;
xbt_dynar_t prop_ato;
typedef struct s_mc_pair_visited_hash{
xbt_state_t automaton_state;
xbt_dynar_t prop_ato;
-
xbt_dict_t
hash_regions;
+
unsigned int *
hash_regions;
int search_cycle;
}s_mc_pair_visited_hash_t, *mc_pair_visited_hash_t;
int search_cycle;
}s_mc_pair_visited_hash_t, *mc_pair_visited_hash_t;
+typedef struct s_mc_pair_reached_hash{
+ xbt_state_t automaton_state;
+ xbt_dynar_t prop_ato;
+ unsigned int *hash_regions;
+}s_mc_pair_reached_hash_t, *mc_pair_reached_hash_t;
+
int MC_automaton_evaluate_label(xbt_exp_label_t l);
mc_pair_t new_pair(mc_snapshot_t sn, mc_state_t sg, xbt_state_t st);
int reached(xbt_state_t st);
void set_pair_reached(xbt_state_t st);
int MC_automaton_evaluate_label(xbt_exp_label_t l);
mc_pair_t new_pair(mc_snapshot_t sn, mc_state_t sg, xbt_state_t st);
int reached(xbt_state_t st);
void set_pair_reached(xbt_state_t st);
+int reached_hash(xbt_state_t st);
+void set_pair_reached_hash(xbt_state_t st);
int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2);
int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2);
-void MC_show_stack_liveness_stateful(xbt_fifo_t stack);
-void MC_dump_stack_liveness_stateful(xbt_fifo_t stack);
void MC_pair_delete(mc_pair_t pair);
void MC_exit_liveness(void);
mc_state_t MC_state_pair_new(void);
void MC_pair_delete(mc_pair_t pair);
void MC_exit_liveness(void);
mc_state_t MC_state_pair_new(void);
@@
-251,13
+258,8
@@
int visited(xbt_state_t st, int search_cycle);
void set_pair_visited(xbt_state_t st, int search_cycle);
int visited_hash(xbt_state_t st, int search_cycle);
void set_pair_visited_hash(xbt_state_t st, int search_cycle);
void set_pair_visited(xbt_state_t st, int search_cycle);
int visited_hash(xbt_state_t st, int search_cycle);
void set_pair_visited_hash(xbt_state_t st, int search_cycle);
+unsigned int hash_region(char *str, int str_len);
-/* **** Double-DFS stateful without visited state **** */
-
-extern xbt_fifo_t mc_stack_liveness_stateful;
-
-void MC_ddfs_stateful_init(xbt_automaton_t a);
-void MC_ddfs_stateful(xbt_automaton_t a, int search_cycle, int restore);
/* **** Double-DFS stateless **** */
/* **** Double-DFS stateless **** */
@@
-267,17
+269,14
@@
typedef struct s_mc_pair_stateless{
int requests;
}s_mc_pair_stateless_t, *mc_pair_stateless_t;
int requests;
}s_mc_pair_stateless_t, *mc_pair_stateless_t;
-extern xbt_fifo_t mc_stack_liveness_stateless;
-extern mc_snapshot_t initial_snapshot_liveness;
-extern xbt_automaton_t automaton;
+extern xbt_fifo_t mc_stack_liveness;
mc_pair_stateless_t new_pair_stateless(mc_state_t sg, xbt_state_t st, int r);
mc_pair_stateless_t new_pair_stateless(mc_state_t sg, xbt_state_t st, int r);
-void MC_ddfs_
stateless_init(
);
-void MC_ddfs
_stateless
(int search_cycle);
-void MC_show_stack_liveness
_stateless
(xbt_fifo_t stack);
-void MC_dump_stack_liveness
_stateless
(xbt_fifo_t stack);
+void MC_ddfs_
init(void
);
+void MC_ddfs(int search_cycle);
+void MC_show_stack_liveness(xbt_fifo_t stack);
+void MC_dump_stack_liveness(xbt_fifo_t stack);
void MC_pair_stateless_delete(mc_pair_stateless_t pair);
void MC_pair_stateless_delete(mc_pair_stateless_t pair);
-
#endif
#endif