X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9f54e5c450791e19b01f31e86c93e5a603fd0c4b..053352ba13737467be4fc66c9a1c92bd84118bee:/src/surf/surf_config.c

diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c
index e5b64aaf14..68fb17efe1 100644
--- a/src/surf/surf_config.c
+++ b/src/surf/surf_config.c
@@ -1,6 +1,5 @@
-/* 	$Id$	 */
-
-/* Copyright (c) 2009 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,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 */
@@ -66,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);
 }
 
@@ -80,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);
 }
@@ -93,25 +107,45 @@ 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);
 }
 
-/* callback of the tcp gamma variable */
-static void _surf_cfg_cb__tcp_gamma(const char *name, int pos)
-{
+
+/* callbacks of the network models values */
+static void _surf_cfg_cb__tcp_gamma(const char *name, int pos) {
   sg_tcp_gamma = xbt_cfg_get_double(_surf_cfg_set, name);
 }
+static void _surf_cfg_cb__latency_factor(const char *name, int pos) {
+  sg_latency_factor = xbt_cfg_get_double(_surf_cfg_set, name);
+}
+static void _surf_cfg_cb__bandwidth_factor(const char *name, int pos) {
+  sg_bandwidth_factor = xbt_cfg_get_double(_surf_cfg_set, name);
+}
+static void _surf_cfg_cb__weight_S(const char *name, int pos) {
+  sg_weight_S_parameter = xbt_cfg_get_double(_surf_cfg_set, name);
+}
+static void _surf_cfg_cb__surf_maxmin_selective_update(const char *name, int pos) {
+	sg_maxmin_selective_update = xbt_cfg_get_int(_surf_cfg_set, name);
+}
 
-static void _surf_cfg_cb__surf_path(const char *name, int pos)
-{
+/* callback of the inclusion path */
+static void _surf_cfg_cb__surf_path(const char *name, int pos) {
   char *path = xbt_cfg_get_string_at(_surf_cfg_set, name, pos);
   xbt_dynar_push(surf_path, &path);
 }
 
-static void _surf_cfg_cb__surf_maxmin_selective_update(const char *name, int pos)
-{
-	sg_maxmin_selective_update = xbt_cfg_get_int(_surf_cfg_set, name);
+/* 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
@@ -133,6 +167,7 @@ void surf_config_init(int *argc, char **argv)
 
     char *description = xbt_malloc(1024), *p = description;
     char *default_value;
+    double double_default_value;
 	int default_value_int;
     int i;
 
@@ -143,6 +178,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,
@@ -156,6 +192,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,
@@ -170,6 +207,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,
@@ -181,14 +219,28 @@ void surf_config_init(int *argc, char **argv)
     default_value = xbt_strdup("Full");
     xbt_cfg_register(&_surf_cfg_set, "routing",
                      "Model to use to store the routing information",
-                     xbt_cfgelm_string, &default_value, 1, 1, NULL,
-                     NULL);
+                     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)", xbt_cfgelm_double,
-                     NULL, 1, 1, _surf_cfg_cb__tcp_gamma, NULL);
+                     "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);
 
+    /* The parameters of network models */
+    double_default_value = 1.0;
+    xbt_cfg_register(&_surf_cfg_set, "network/latency_factor",
+                     "Correction factor to apply to the provided latency (default value set by network model)",
+                     xbt_cfgelm_double, &double_default_value, 1, 1, _surf_cfg_cb__latency_factor, NULL);
+    double_default_value = 1.0;
+    xbt_cfg_register(&_surf_cfg_set, "network/bandwidth_factor",
+                     "Correction factor to apply to the provided bandwidth (default value set by network model)",
+                     xbt_cfgelm_double, &double_default_value, 1, 1, _surf_cfg_cb__bandwidth_factor, NULL);
+    double_default_value = 0.0;
+    xbt_cfg_register(&_surf_cfg_set, "network/weight_S",
+                     "Correction factor to apply to the weight of competing streams(default value set by network model)",
+                     xbt_cfgelm_double, &double_default_value, 1, 1, _surf_cfg_cb__weight_S, NULL);
+
+    /* Inclusion path */
     xbt_cfg_register(&_surf_cfg_set, "path",
                      "Lookup path for inclusions in platform and deployment XML files",
                      xbt_cfgelm_string, NULL, 0, 0, _surf_cfg_cb__surf_path,
@@ -199,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,
@@ -223,6 +281,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");
   }
 }