X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/65ed12738b3113afdcb29e4c5fd177cbae2ac856..705cfaaca24189a574c15159cbdd919574cae96e:/src/surf/surf_config.c

diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c
index 3b28a5114f..dab8332b20 100644
--- 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. */
@@ -32,10 +33,14 @@ static void surf_config_cmd_line(int *argc, char **argv)
       remove_it = 1;
     } else if (!strncmp(argv[i], "--cfg-help", strlen("--cfg-help") + 1) ||
                !strncmp(argv[i], "--help", strlen("--help") + 1)) {
-      printf
-        ("Description of the configuration accepted by this simulator:\n");
+      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 +69,13 @@ static void _surf_cfg_cb__workstation_model(const char *name, int pos)
               "Cannot change the model after the initialization");
 
   val = xbt_cfg_get_string(_surf_cfg_set, name);
-  /* New Module missing */
 
+  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);
 }
 
@@ -78,6 +88,12 @@ static void _surf_cfg_cb__cpu_model(const char *name, int pos)
               "Cannot change the model after the initialization");
 
   val = xbt_cfg_get_string(_surf_cfg_set, name);
+
+  if (!strcmp(val,"help")) {
+    model_help("CPU",surf_cpu_model_description);
+    exit(0);
+  }
+
   /* New Module missing */
   find_model_description(surf_cpu_model_description, val);
 }
@@ -91,6 +107,12 @@ static void _surf_cfg_cb__network_model(const char *name, int pos)
               "Cannot change the model after the initialization");
 
   val = xbt_cfg_get_string(_surf_cfg_set, name);
+
+  if (!strcmp(val,"help")) {
+    model_help("network",surf_network_model_description);
+    exit(0);
+  }
+
   /* New Module missing */
   find_model_description(surf_network_model_description, val);
 }
@@ -119,6 +141,21 @@ 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 */
+#include "xbt_modinter.h"
+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;
+  /* Tell modules using mallocators that they shouldn't. MC don't like them */
+  xbt_fifo_preinit();
+  xbt_dict_preinit();
+}
+
+static void _surf_cfg_cb__surf_network_fullduplex(const char *name, int pos)
+{
+	sg_network_fullduplex = xbt_cfg_get_int(_surf_cfg_set, name);
+}
 
 #ifdef HAVE_GTNETS
 static void _surf_cfg_cb__gtnets_jitter(const char *name, int pos){
@@ -132,17 +169,16 @@ static void _surf_cfg_cb__gtnets_jitter_seed(const char *name, int pos){
 /* create the config set, register what should be and parse the command line*/
 void surf_config_init(int *argc, char **argv)
 {
-
-  /* Create the configuration support */
-  if (_surf_init_status == 0) { /* Only create stuff if not already inited */
-    _surf_init_status = 1;
-
     char *description = xbt_malloc(1024), *p = description;
     char *default_value;
     double double_default_value;
 	int default_value_int;
     int i;
 
+  /* Create the configuration support */
+  if (_surf_init_status == 0) { /* Only create stuff if not already inited */
+    _surf_init_status = 1;
+
     sprintf(description, "The model to use for the CPU. Possible values: ");
     p = description;
     while (*(++p) != '\0');
@@ -150,6 +186,7 @@ void surf_config_init(int *argc, char **argv)
       p +=
         sprintf(p, "%s%s", (i == 0 ? "" : ", "),
                 surf_cpu_model_description[i].name);
+    sprintf(p,".\n       (use 'help' as a value to see the long description of each model)");
     default_value = xbt_strdup("Cas01");
     xbt_cfg_register(&_surf_cfg_set,
                      "cpu/model", description, xbt_cfgelm_string,
@@ -163,6 +200,7 @@ void surf_config_init(int *argc, char **argv)
       p +=
         sprintf(p, "%s%s", (i == 0 ? "" : ", "),
                 surf_network_model_description[i].name);
+    sprintf(p,".\n       (use 'help' as a value to see the long description of each model)");
     default_value = xbt_strdup("LV08");
     xbt_cfg_register(&_surf_cfg_set,
                      "network/model", description, xbt_cfgelm_string,
@@ -177,6 +215,7 @@ void surf_config_init(int *argc, char **argv)
       p +=
         sprintf(p, "%s%s", (i == 0 ? "" : ", "),
                 surf_workstation_model_description[i].name);
+    sprintf(p,".\n       (use 'help' as a value to see the long description of each model)");
     default_value = xbt_strdup("CLM03");
     xbt_cfg_register(&_surf_cfg_set,
                      "workstation/model", description, xbt_cfgelm_string,
@@ -191,7 +230,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);
 
@@ -220,6 +259,23 @@ 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);
+    /*
+     FIXME: this function is not setting model-check to it's default value because
+     internally it calls to variable->cb_set that in this case is the function 
+     _surf_cfg_cb_model_check which sets it's value to 1 (instead of the defalut value 0)
+     xbt_cfg_set_int(_surf_cfg_set, "model-check", default_value_int); */
+
+    default_value_int = 0;
+    xbt_cfg_register(&_surf_cfg_set, "fullduplex",
+		     "Update the constraint set propagating recursively to others constraints",
+		     xbt_cfgelm_int, &default_value_int, 0, 1, _surf_cfg_cb__surf_network_fullduplex, NULL);
+    xbt_cfg_set_int(_surf_cfg_set, "fullduplex", default_value_int);
+
 #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,
@@ -244,6 +300,8 @@ void surf_config_init(int *argc, char **argv)
 
 
     surf_config_cmd_line(argc, argv);
+  } else {
+    WARN0("Call to surf_config_init() after initialization ignored");
   }
 }
 
@@ -260,14 +318,19 @@ void surf_config_models_setup(const char *platform_file)
 {
   char *workstation_model_name;
   int workstation_id = -1;
-
+  char *network_model_name = NULL;
+  char *cpu_model_name = NULL;
   surf_timer_model_init(platform_file);
 
   workstation_model_name =
     xbt_cfg_get_string(_surf_cfg_set, "workstation/model");
-  char *network_model_name = xbt_cfg_get_string(_surf_cfg_set, "network/model");
-  char *cpu_model_name = xbt_cfg_get_string(_surf_cfg_set, "cpu/model");
+  network_model_name = xbt_cfg_get_string(_surf_cfg_set, "network/model");
+  cpu_model_name = xbt_cfg_get_string(_surf_cfg_set, "cpu/model");
 
+  /* Check whether we use a net/cpu model differing from the default ones, in which case
+   * we should switch to the "compound" workstation model to correctly dispatch stuff to
+   * the right net/cpu models.
+   */
   if ((strcmp(network_model_name,"LV08") || strcmp(cpu_model_name,"Cas01"))
       && !strcmp(workstation_model_name, "CLM03")){
     const char *val = "compound";