X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cd8852187f491f7fa8049414d7ac2d0193518e23..c5ad8ca1a68bbaa9152471c8d0eeb99d762f0d86:/src/mc/private.h

diff --git a/src/mc/private.h b/src/mc/private.h
index 06af6e7c14..3c7006030e 100644
--- 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.                                          */
 
@@ -14,15 +12,20 @@
 #include "mc/mc.h"
 #include "mc/datatypes.h"
 #include "xbt/fifo.h"
-#include "xbt/setset.h"
 #include "xbt/config.h"
 #include "xbt/function_types.h"
 #include "xbt/mmalloc.h"
 #include "../simix/private.h"
+#include "xbt/automaton.h"
+#include "xbt/hash.h"
+#include "msg/msg.h"
+#include "msg/datatypes.h"
+#include "simix/datatypes.h"
 
 /****************************** Snapshots ***********************************/
 
 typedef struct s_mc_mem_region{
+  int type;
   void *start_addr;
   void *data;
   size_t size;
@@ -33,46 +36,81 @@ typedef struct s_mc_snapshot{
   mc_mem_region_t *regions;
 } s_mc_snapshot_t, *mc_snapshot_t;
 
+extern char *prog_name;
+
 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);
 
 /********************************* MC Global **********************************/
+extern double *mc_time;
 
 /* Bound of the MC depth-first search algorithm */
 #define MAX_DEPTH 1000
+#define MAX_DEPTH_LIVENESS 500
 
-void MC_show_stack(xbt_fifo_t stack);
-void MC_dump_stack(xbt_fifo_t stack);
+int MC_deadlock_check(void);
 void MC_replay(xbt_fifo_t stack);
+void MC_replay_liveness(xbt_fifo_t stack, int all_stack);
 void MC_wait_for_requests(void);
 void MC_get_enabled_processes();
-void MC_show_deadlock(smx_req_t req);
+void MC_show_deadlock(smx_simcall_t req);
+void MC_show_deadlock_stateful(smx_simcall_t req);
+void MC_show_stack_safety_stateless(xbt_fifo_t stack);
+void MC_dump_stack_safety_stateless(xbt_fifo_t stack);
+void MC_show_stack_safety_stateful(xbt_fifo_t stack);
+void MC_dump_stack_safety_stateful(xbt_fifo_t stack);
 
 /********************************* Requests ***********************************/
-int MC_request_depend(smx_req_t req1, smx_req_t req2);
-char* MC_request_to_string(smx_req_t req);
+int MC_request_depend(smx_simcall_t req1, smx_simcall_t req2);
+char* MC_request_to_string(smx_simcall_t req, int value);
+unsigned int MC_request_testany_fail(smx_simcall_t req);
+/*int MC_waitany_is_enabled_by_comm(smx_req_t req, unsigned int comm);*/
+int MC_request_is_visible(smx_simcall_t req);
+int MC_request_is_enabled(smx_simcall_t req);
+int MC_request_is_enabled_by_idx(smx_simcall_t req, unsigned int idx);
+int MC_process_is_enabled(smx_process_t process);
 
-/********************************** DPOR **************************************/
-void MC_dpor_init(void);
-void MC_dpor(void);
-void MC_dpor_exit(void);
 
 /******************************** States **************************************/
+/* Possible exploration status of a process in a state */
+typedef enum {
+  MC_NOT_INTERLEAVE=0,      /* Do not interleave (do not execute) */
+  MC_INTERLEAVE,            /* Interleave the process (one or more request) */
+  MC_DONE                   /* Already interleaved */
+} e_mc_process_state_t;
+
+/* On every state, each process has an entry of the following type */
+typedef struct mc_procstate{
+  e_mc_process_state_t state;       /* Exploration control information */
+  unsigned int interleave_count;    /* Number of times that the process was
+                                       interleaved */
+} s_mc_procstate_t, *mc_procstate_t;
+
+/* An exploration state is composed of: */
 typedef struct mc_state {
-  xbt_setset_set_t interleave;  /* processes to interleave by the mc */
-  xbt_setset_set_t done;        /* already executed processes */
-  s_smx_req_t executed;
+  unsigned long max_pid;            /* Maximum pid at state's creation time */
+  mc_procstate_t proc_status;       /* State's exploration status by process */
+  s_smx_action_t internal_comm;     /* To be referenced by the internal_req */
+  s_smx_simcall_t internal_req;         /* Internal translation of request */
+  s_smx_simcall_t executed_req;         /* The executed request of the state */
+  int req_num;                      /* The request number (in the case of a
+                                       multi-request like waitany ) */
 } s_mc_state_t, *mc_state_t;
 
-extern xbt_fifo_t mc_stack;
-extern xbt_setset_t mc_setset;
+extern xbt_fifo_t mc_stack_safety_stateless;
 
 mc_state_t MC_state_new(void);
 void MC_state_delete(mc_state_t state);
-void MC_state_set_executed_request(mc_state_t state, smx_req_t req);
-smx_req_t MC_state_get_executed_request(mc_state_t state);
-smx_req_t MC_state_get_request(mc_state_t state);
+void MC_state_interleave_process(mc_state_t state, smx_process_t process);
+unsigned int MC_state_interleave_size(mc_state_t state);
+int MC_state_process_is_done(mc_state_t state, smx_process_t process);
+void MC_state_set_executed_request(mc_state_t state, smx_simcall_t req, int value);
+smx_simcall_t MC_state_get_executed_request(mc_state_t state, int *value);
+smx_simcall_t MC_state_get_internal_request(mc_state_t state);
+smx_simcall_t MC_state_get_request(mc_state_t state, int *value);
 
 /****************************** Statistics ************************************/
 typedef struct mc_stats {
@@ -82,9 +120,18 @@ typedef struct mc_stats {
   unsigned long executed_transitions;
 } s_mc_stats_t, *mc_stats_t;
 
+typedef struct mc_stats_pair {
+  //unsigned long pair_size;
+  unsigned long visited_pairs;
+  unsigned long expanded_pairs;
+  unsigned long executed_transitions;
+} s_mc_stats_pair_t, *mc_stats_pair_t;
+
 extern mc_stats_t mc_stats;
+extern mc_stats_pair_t mc_stats_pair;
 
 void MC_print_statistics(mc_stats_t);
+void MC_print_statistics_pairs(mc_stats_pair_t);
 
 /********************************** MEMORY ******************************/
 /* The possible memory modes for the modelchecker are standard and raw. */
@@ -93,7 +140,7 @@ void MC_print_statistics(mc_stats_t);
 
 extern void *std_heap;
 extern void *raw_heap;
-int raw_heap_fd;
+/* 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 */
@@ -140,4 +187,103 @@ typedef struct s_memory_map {
 memory_map_t get_memory_map(void);
 
 
+/********************************** DPOR for safety (stateless) **************************************/
+void MC_dpor_init(void);
+void MC_dpor(void);
+void MC_dpor_exit(void);
+
+/***** DPOR for safety (stateful) **** */
+
+typedef struct s_mc_state_with_snapshot{
+  mc_snapshot_t system_state;
+  mc_state_t graph_state;
+}s_mc_state_ws_t, *mc_state_ws_t;
+
+extern xbt_fifo_t mc_stack_safety_stateful;
+
+void MC_init_stateful(void);
+void MC_modelcheck_stateful(void);
+mc_state_ws_t new_state_ws(mc_snapshot_t s, mc_state_t gs);
+void MC_dpor_stateful_init(void);
+void MC_dpor_stateful(void);
+void MC_exit_stateful(void);
+
+
+/********************************** 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;
+  xbt_state_t automaton_state;
+}s_mc_pair_t, *mc_pair_t;
+
+typedef struct s_mc_pair_reached{
+  xbt_state_t automaton_state;
+  xbt_dynar_t prop_ato;
+  mc_snapshot_t system_state;
+  //xbt_dict_t rdv_points;
+}s_mc_pair_reached_t, *mc_pair_reached_t;
+
+typedef struct s_mc_pair_visited{
+  xbt_state_t automaton_state;
+  xbt_dynar_t prop_ato;
+  mc_snapshot_t system_state;
+  int search_cycle;
+}s_mc_pair_visited_t, *mc_pair_visited_t;
+
+typedef struct s_mc_pair_visited_hash{
+  xbt_state_t automaton_state;
+  xbt_dynar_t prop_ato;
+  unsigned int *hash_regions;
+  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 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);
+void MC_pair_delete(mc_pair_t pair);
+void MC_exit_liveness(void);
+mc_state_t MC_state_pair_new(void);
+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);
+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{
+  mc_state_t graph_state;
+  xbt_state_t automaton_state;
+  int requests;
+}s_mc_pair_stateless_t, *mc_pair_stateless_t;
+
+extern xbt_fifo_t mc_stack_liveness;
+
+mc_pair_stateless_t new_pair_stateless(mc_state_t sg, xbt_state_t st, int r);
+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);
+
+
 #endif