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 test unit for snapshot comparison
[simgrid.git]
/
src
/
mc
/
mc_private.h
diff --git
a/src/mc/mc_private.h
b/src/mc/mc_private.h
index
89ff690
..
4493561
100644
(file)
--- a/
src/mc/mc_private.h
+++ b/
src/mc/mc_private.h
@@
-19,7
+19,6
@@
#include "xbt/hash.h"
#include "msg/msg.h"
#include "msg/datatypes.h"
#include "xbt/hash.h"
#include "msg/msg.h"
#include "msg/datatypes.h"
-#include "simix/datatypes.h"
/****************************** Snapshots ***********************************/
/****************************** Snapshots ***********************************/
@@
-39,7
+38,6
@@
extern char *prog_name;
void MC_take_snapshot(mc_snapshot_t);
void MC_take_snapshot_liveness(mc_snapshot_t s);
void MC_take_snapshot(mc_snapshot_t);
void MC_take_snapshot_liveness(mc_snapshot_t s);
-void MC_take_snapshot_to_restore_liveness(mc_snapshot_t s);
void MC_restore_snapshot(mc_snapshot_t);
void MC_free_snapshot(mc_snapshot_t);
void MC_restore_snapshot(mc_snapshot_t);
void MC_free_snapshot(mc_snapshot_t);
@@
-139,7
+137,6
@@
void MC_print_statistics_pairs(mc_stats_pair_t);
extern void *std_heap;
extern void *raw_heap;
extern void *std_heap;
extern void *raw_heap;
-/* extern int raw_heap_fd; */ /* unused */
#define STD_HEAP_SIZE 20480000 /* Maximum size of the system's heap */
/* FIXME: Horrible hack! because the mmalloc library doesn't provide yet of */
#define STD_HEAP_SIZE 20480000 /* Maximum size of the system's heap */
/* FIXME: Horrible hack! because the mmalloc library doesn't provide yet of */
@@
-174,11
+171,11
@@
typedef struct s_map_region {
unsigned long inode; /* Inode in the device */
char *pathname; /* Path name of the mapped file */
unsigned long inode; /* Inode in the device */
char *pathname; /* Path name of the mapped file */
-} s_map_region;
+} s_map_region
_t
;
typedef struct s_memory_map {
typedef struct s_memory_map {
- s_map_region
*regions;
/* Pointer to an array of regions */
+ s_map_region
_t *regions;
/* Pointer to an array of regions */
int mapsize; /* Number of regions in the memory */
} s_memory_map_t, *memory_map_t;
int mapsize; /* Number of regions in the memory */
} s_memory_map_t, *memory_map_t;
@@
-220,6
+217,7
@@
typedef struct s_mc_pair{
}s_mc_pair_t, *mc_pair_t;
typedef struct s_mc_pair_reached{
}s_mc_pair_t, *mc_pair_t;
typedef struct s_mc_pair_reached{
+ int nb;
xbt_state_t automaton_state;
xbt_dynar_t prop_ato;
mc_snapshot_t system_state;
xbt_state_t automaton_state;
xbt_dynar_t prop_ato;
mc_snapshot_t system_state;
@@
-255,7
+253,9
@@
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);
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* s_heap);
+int data_program_region_compare(void *d1, void *d2, size_t size);
+int data_libsimgrid_region_compare(void *d1, void *d2, size_t size);
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);
@@
-266,7
+266,6
@@
void set_pair_visited_hash(xbt_state_t st, int search_cycle);
unsigned int hash_region(char *str, int str_len);
int rdv_points_compare(xbt_dict_t d1, xbt_dict_t d2);
unsigned int hash_region(char *str, int str_len);
int rdv_points_compare(xbt_dict_t d1, xbt_dict_t d2);
-
/* **** Double-DFS stateless **** */
typedef struct s_mc_pair_stateless{
/* **** Double-DFS stateless **** */
typedef struct s_mc_pair_stateless{