model-checker : rename cfg flag for state comparison reduction with storage of visite...

diff --git a/src/include/mc/mc.h b/src/include/mc/mc.h
index b4d9c71..ed3a990 100644 (file)
--- a/src/include/mc/mc.h
+++ b/src/include/mc/mc.h
@@ -31,7 +31,7 @@ void _mc_cfg_cb_checkpoint(const char *name, int pos);
 void _mc_cfg_cb_property(const char *name, int pos);
 void _mc_cfg_cb_timeout(const char *name, int pos);
 void _mc_cfg_cb_max_depth(const char *name, int pos);
-void _mc_cfg_cb_stateful(const char *name, int pos);
+void _mc_cfg_cb_visited(const char *name, int pos);
 
 XBT_PUBLIC(void) MC_do_the_modelcheck_for_real(void);
 

diff --git a/src/mc/mc_checkpoint.c b/src/mc/mc_checkpoint.c
index 7959f8a..ee78c2d 100644 (file)
--- a/src/mc/mc_checkpoint.c
+++ b/src/mc/mc_checkpoint.c
@@ -245,7 +245,7 @@ mc_snapshot_t MC_take_snapshot()
     }
   }
 
-  if(_surf_mc_stateful > 0 || _surf_mc_property_file)
+  if(_surf_mc_visited > 0 || _surf_mc_property_file)
     snapshot->stacks = take_snapshot_stacks(heap);
   
   free_memory_map(maps);

diff --git a/src/mc/mc_dpor.c b/src/mc/mc_dpor.c
index d8ab869..0947844 100644 (file)
--- a/src/mc/mc_dpor.c
+++ b/src/mc/mc_dpor.c
@@ -14,7 +14,7 @@ static int is_visited_state(void);
 
 static int is_visited_state(){
 
-  if(_surf_mc_stateful == 0)
+  if(_surf_mc_visited == 0)
     return 0;
 
   int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
@@ -57,7 +57,7 @@ static int is_visited_state(){
       }   
     }
 
-    if(xbt_dynar_length(visited_states) == _surf_mc_stateful){
+    if(xbt_dynar_length(visited_states) == _surf_mc_visited){
       mc_snapshot_t state_to_remove = NULL;
       xbt_dynar_shift(visited_states, &state_to_remove);
       MC_free_snapshot(state_to_remove);

diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index 4dfb227..72c537a 100644 (file)
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@ -71,11 +71,11 @@ void _mc_cfg_cb_max_depth(const char *name, int pos) {
   xbt_cfg_set_int(_surf_cfg_set,"model-check",1);
 }
 
-void _mc_cfg_cb_stateful(const char *name, int pos) {
+void _mc_cfg_cb_visited(const char *name, int pos) {
   if (_surf_init_status && !_surf_do_model_check) {
-    xbt_die("You are trying to change stateful mode after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry.");
+    xbt_die("You are specifying a number of stored visited states after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry.");
   }
-  _surf_mc_stateful= xbt_cfg_get_int(_surf_cfg_set, name);
+  _surf_mc_visited= xbt_cfg_get_int(_surf_cfg_set, name);
   xbt_cfg_set_int(_surf_cfg_set,"model-check",1);
 }
 
@@ -221,7 +221,7 @@ void MC_modelcheck_safety(void)
 
   MC_UNSET_RAW_MEM;
 
-  if(_surf_mc_stateful > 0){
+  if(_surf_mc_visited > 0){
     MC_init();
   }else{
     MC_init_memory_map_info();

diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c
index 5c90750..e9dcf49 100644 (file)
--- a/src/mc/mc_liveness.c
+++ b/src/mc/mc_liveness.c
@@ -311,7 +311,7 @@ void set_pair_reached(xbt_state_t st){
 
 int visited(xbt_state_t st){
 
-  if(_surf_mc_stateful == 0)
+  if(_surf_mc_visited == 0)
     return 0;
 
   int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
@@ -377,7 +377,7 @@ int visited(xbt_state_t st){
       }
     }
 
-    if(xbt_dynar_length(visited_pairs) == _surf_mc_stateful){
+    if(xbt_dynar_length(visited_pairs) == _surf_mc_visited){
       xbt_dynar_remove_at(visited_pairs, 0, NULL);
     }
 

diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h
index cc11df9..fcf5333 100644 (file)
--- a/src/mc/mc_private.h
+++ b/src/mc/mc_private.h
@@ -304,7 +304,7 @@ extern int _surf_mc_checkpoint;
 extern char* _surf_mc_property_file;
 extern int _surf_mc_timeout;
 extern int _surf_mc_max_depth;
-extern int _surf_mc_stateful;
+extern int _surf_mc_visited;
 
 /****** Core dump ******/
 

diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c
index f4f938a..3e9e813 100644 (file)
--- a/src/surf/surf_config.c
+++ b/src/surf/surf_config.c
@@ -535,12 +535,12 @@ void surf_config_init(int *argc, char **argv)
                      _mc_cfg_cb_max_depth, NULL);
     xbt_cfg_setdefault_int(_surf_cfg_set, "model-check/max_depth", 1000);
 
-    /* Set number of visited state stored in stateful mode */
-    xbt_cfg_register(&_surf_cfg_set, "model-check/stateful",
-                     "Specify the number of visited state stored in stateful mode. If value=5, the last 5 visited states are stored",
+    /* Set number of visited state stored for state comparison reduction*/
+    xbt_cfg_register(&_surf_cfg_set, "model-check/visited",
+                     "Specify the number of visited state stored for state comparison reduction. If value=5, the last 5 visited states are stored",
                      xbt_cfgelm_int, NULL, 0, 1,
-                     _mc_cfg_cb_stateful, NULL);
-    xbt_cfg_setdefault_int(_surf_cfg_set, "model-check/stateful", 0);
+                     _mc_cfg_cb_visited, NULL);
+    xbt_cfg_setdefault_int(_surf_cfg_set, "model-check/visited", 0);
 #endif
 
     /* do verbose-exit */

diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c
index 7687e5d..95546a0 100644 (file)
--- a/src/xbt/xbt_main.c
+++ b/src/xbt/xbt_main.c
@@ -34,7 +34,7 @@ int _surf_mc_checkpoint=0;
 char* _surf_mc_property_file=NULL;
 int _surf_mc_timeout=0;
 int _surf_mc_max_depth=1000;
-int _surf_mc_stateful=0;
+int _surf_mc_visited=0;
 
 /* Declare xbt_preinit and xbt_postexit as constructor/destructor of the library.
  * This is crude and rather compiler-specific, unfortunately.