new option to any SimGrid-based simulator: --cfg=model-check:1 (for now, that's a...

[simgrid.git] / src / surf / surf_config.c

diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c
index 60da0de..68fb17e 100644 (file)
--- a/src/surf/surf_config.c
+++ b/src/surf/surf_config.c
@@ -1,4 +1,5 @@
-/* Copyright (c) 2009-2010 The SimGrid team. All rights reserved.           */
+/* Copyright (c) 2009, 2010. 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. */
@@ -34,7 +35,12 @@ static void surf_config_cmd_line(int *argc, char **argv)
                !strncmp(argv[i], "--help", strlen("--help") + 1)) {
       printf("Description of the configuration accepted by this simulator:\n");
       xbt_cfg_help(_surf_cfg_set);
-      remove_it = 1;
+      printf("\nYou can also use --help-models to see the details of all models known by this simulator.\n");
+      exit(0);
+    } else if (!strncmp(argv[i], "--help-models", strlen("--help-models")+1)) {
+      model_help("workstation",surf_workstation_model_description);
+      model_help("CPU",surf_cpu_model_description);
+      model_help("network",surf_network_model_description);
       exit(0);
     }
     if (remove_it) {            /*remove this from argv */
@@ -64,8 +70,10 @@ static void _surf_cfg_cb__workstation_model(const char *name, int pos)
 
   val = xbt_cfg_get_string(_surf_cfg_set, name);
 
-  if (!strcmp(val,"help"))
+  if (!strcmp(val,"help")) {
     model_help("workstation",surf_workstation_model_description);
+    exit(0);
+  }
 
   /* Make sure that the model exists */
   find_model_description(surf_workstation_model_description, val);
@@ -81,8 +89,10 @@ static void _surf_cfg_cb__cpu_model(const char *name, int pos)
 
   val = xbt_cfg_get_string(_surf_cfg_set, name);
 
-  if (!strcmp(val,"help"))
+  if (!strcmp(val,"help")) {
     model_help("CPU",surf_cpu_model_description);
+    exit(0);
+  }
 
   /* New Module missing */
   find_model_description(surf_cpu_model_description, val);
@@ -98,8 +108,10 @@ static void _surf_cfg_cb__network_model(const char *name, int pos)
 
   val = xbt_cfg_get_string(_surf_cfg_set, name);
 
-  if (!strcmp(val,"help"))
+  if (!strcmp(val,"help")) {
     model_help("network",surf_network_model_description);
+    exit(0);
+  }
 
   /* New Module missing */
   find_model_description(surf_network_model_description, val);
@@ -129,6 +141,12 @@ static void _surf_cfg_cb__surf_path(const char *name, int pos) {
   xbt_dynar_push(surf_path, &path);
 }
 
+/* callback to decide if we want to use the model-checking */
+int _surf_do_model_check = 0; /* this variable is used accros the lib */
+
+static void _surf_cfg_cb_model_check(const char *name, int pos) {
+  _surf_do_model_check = 1;
+}
 
 #ifdef HAVE_GTNETS
 static void _surf_cfg_cb__gtnets_jitter(const char *name, int pos){
@@ -204,7 +222,7 @@ void surf_config_init(int *argc, char **argv)
                      xbt_cfgelm_string, &default_value, 1, 1, NULL, NULL);
 
     xbt_cfg_register(&_surf_cfg_set, "TCP_gamma",
-                     "Size of the biggest TCP window (cat /proc/sys/net/ipv4/tcp_[rw]mem for recv/send window; middle value=default value => you probably want default send value)",
+                     "Size of the biggest TCP window (cat /proc/sys/net/ipv4/tcp_[rw]mem for recv/send window; Use the last given value, which is the max window size)",
                      xbt_cfgelm_double, NULL, 1, 1, _surf_cfg_cb__tcp_gamma, NULL);
     xbt_cfg_set_double(_surf_cfg_set, "TCP_gamma", 20000.0);
 
@@ -233,6 +251,12 @@ void surf_config_init(int *argc, char **argv)
                      "Update the constraint set propagating recursively to others constraints",
                      xbt_cfgelm_int, &default_value_int, 0, 1, _surf_cfg_cb__surf_maxmin_selective_update, NULL);
 
+    /* do model-check */
+    default_value_int = 0;
+    xbt_cfg_register(&_surf_cfg_set, "model-check",
+                     "Activate the model-checking of the \"simulated\" system (EXPERIMENTAL -- msg only for now)",
+                     xbt_cfgelm_int, &default_value_int, 0, 1, _surf_cfg_cb_model_check, NULL);
+
 #ifdef HAVE_GTNETS
     xbt_cfg_register(&_surf_cfg_set, "gtnets_jitter",
                      "Double value to oscillate the link latency, uniformly in random interval [-latency*gtnets_jitter,latency*gtnets_jitter)", xbt_cfgelm_double,