X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ee7e9c2e455536ab817ae0136acfbb53822eecd..3f20dab4d9cff3906de20b1e7ffdcd54827b7c28:/src/surf/surf_config.c

diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c
index 964d7dd2f5..65ffb94e35 100644
--- a/src/surf/surf_config.c
+++ b/src/surf/surf_config.c
@@ -9,6 +9,7 @@
 #include "xbt/config.h"
 #include "xbt/str.h"
 #include "surf/surf_private.h"
+#include "surf/surf_routing.h"	/* COORD_HOST_LEVEL and COORD_ASR_LEVEL */
 #include "simix/context.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf,
@@ -36,24 +37,18 @@ static void surf_config_cmd_line(int *argc, char **argv)
       printf
           ("Description of the configuration accepted by this simulator:\n");
       xbt_cfg_help(_surf_cfg_set);
-      printf
-          ("\nYou can also use --help-models to see the details of all models known by this simulator.\n");
+      printf("\nYou can also use --help-models to see the details of all models known by this simulator.\n");
 #ifdef HAVE_TRACING
-      printf
-          ("\nYou can also use --help-tracing to see the details of all tracing options known by this simulator.\n");
+      printf("\nYou can also use --help-tracing to see the details of all tracing options known by this simulator.\n");
 #endif
       exit(0);
-    } else
-        if (!strncmp
-            (argv[i], "--help-models", strlen("--help-models") + 1)) {
+    } 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);
 #ifdef HAVE_TRACING
-    }else
-        if (!strncmp
-            (argv[i], "--help-tracing", strlen("--help-tracing") + 1)) {
+    } else if (!strncmp(argv[i], "--help-tracing", strlen("--help-tracing") + 1)) {
       TRACE_help (1);
       exit(0);
 #endif
@@ -80,7 +75,7 @@ static void _surf_cfg_cb__workstation_model(const char *name, int pos)
 {
   char *val;
 
-  xbt_assert0(_surf_init_status < 2,
+  xbt_assert(_surf_init_status < 2,
               "Cannot change the model after the initialization");
 
   val = xbt_cfg_get_string(_surf_cfg_set, name);
@@ -99,7 +94,7 @@ static void _surf_cfg_cb__cpu_model(const char *name, int pos)
 {
   char *val;
 
-  xbt_assert0(_surf_init_status < 2,
+  xbt_assert(_surf_init_status < 2,
               "Cannot change the model after the initialization");
 
   val = xbt_cfg_get_string(_surf_cfg_set, name);
@@ -113,12 +108,31 @@ static void _surf_cfg_cb__cpu_model(const char *name, int pos)
   find_model_description(surf_cpu_model_description, val);
 }
 
+/* callback of the cpu/model variable */
+static void _surf_cfg_cb__optimization_mode(const char *name, int pos)
+{
+  char *val;
+
+  xbt_assert(_surf_init_status < 2,
+              "Cannot change the model after the initialization");
+
+  val = xbt_cfg_get_string(_surf_cfg_set, name);
+
+  if (!strcmp(val, "help")) {
+    model_help("optimization", surf_optimization_mode_description);
+    exit(0);
+  }
+
+  /* New Module missing */
+  find_model_description(surf_optimization_mode_description, val);
+}
+
 /* callback of the workstation_model variable */
 static void _surf_cfg_cb__network_model(const char *name, int pos)
 {
   char *val;
 
-  xbt_assert0(_surf_init_status < 2,
+  xbt_assert(_surf_init_status < 2,
               "Cannot change the model after the initialization");
 
   val = xbt_cfg_get_string(_surf_cfg_set, name);
@@ -164,12 +178,6 @@ 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);
-}
-
 /* callback of the inclusion path */
 static void _surf_cfg_cb__surf_path(const char *name, int pos)
 {
@@ -192,6 +200,14 @@ static void _surf_cfg_cb_model_check(const char *name, int pos)
   }
 }
 
+extern int _surf_do_verbose_exit;
+
+static void _surf_cfg_cb_verbose_exit(const char *name, int pos)
+{
+  _surf_do_verbose_exit = xbt_cfg_get_int(_surf_cfg_set, name);
+}
+
+
 static void _surf_cfg_cb_context_factory(const char *name, int pos)
 {
   smx_context_factory_name = xbt_cfg_get_string(_surf_cfg_set, name);
@@ -212,10 +228,45 @@ static void _surf_cfg_cb_contexts_parallel_threshold(const char *name, int pos)
   SIMIX_context_set_parallel_threshold(xbt_cfg_get_int(_surf_cfg_set, name));
 }
 
-static void _surf_cfg_cb__surf_network_fullduplex(const char *name,
+static void _surf_cfg_cb_contexts_parallel_mode(const char *name, int pos)
+{
+  const char* mode_name = xbt_cfg_get_string(_surf_cfg_set, name);
+  if (!strcmp(mode_name, "posix")) {
+    SIMIX_context_set_parallel_mode(XBT_PARMAP_POSIX);
+  }
+  else if (!strcmp(mode_name, "futex")) {
+    SIMIX_context_set_parallel_mode(XBT_PARMAP_FUTEX);
+  }
+  else if (!strcmp(mode_name, "busy_wait")) {
+    SIMIX_context_set_parallel_mode(XBT_PARMAP_BUSY_WAIT);
+  }
+  else {
+    XBT_WARN("Command line setting of the parallel synchronization mode should "
+        "be one of \"posix\", \"futex\" or \"busy_wait\"");
+  }
+}
+
+static void _surf_cfg_cb__surf_network_coordinates(const char *name,
+                                                   int pos)
+{
+  char *val = xbt_cfg_get_string(_surf_cfg_set, name);
+  if (!strcmp(val, "yes")) {
+    if (!COORD_HOST_LEVEL) {
+      COORD_HOST_LEVEL = xbt_lib_add_level(host_lib,xbt_dynar_free_voidp);
+      COORD_ASR_LEVEL  = xbt_lib_add_level(as_router_lib,xbt_dynar_free_voidp);
+    }
+  } else if (!strcmp(val, "no")) {
+    if (COORD_HOST_LEVEL)
+      XBT_WARN("Setting of whether to use coordinate cannot be disabled once set.");
+  } else {
+    XBT_WARN("Command line setting of whether to use coordinates must be either \"yes\" or \"no\"");
+  }
+}
+
+static void _surf_cfg_cb__surf_network_crosstraffic(const char *name,
                                                   int pos)
 {
-  sg_network_fullduplex = xbt_cfg_get_int(_surf_cfg_set, name);
+  sg_network_crosstraffic = xbt_cfg_get_int(_surf_cfg_set, name);
 }
 
 #ifdef HAVE_GTNETS
@@ -257,6 +308,20 @@ void surf_config_init(int *argc, char **argv)
                      "cpu/model", description, xbt_cfgelm_string,
                      &default_value, 1, 1, &_surf_cfg_cb__cpu_model, NULL);
 
+    sprintf(description,
+            "The optimization modes to use for the CPU. Possible values: ");
+    p = description;
+    while (*(++p) != '\0');
+    for (i = 0; surf_optimization_mode_description[i].name; i++)
+      p += sprintf(p, "%s%s", (i == 0 ? "" : ", "),
+                   surf_optimization_mode_description[i].name);
+    sprintf(p,
+            ".\n       (use 'help' as a value to see the long description of each optimization mode)");
+    default_value = xbt_strdup("Lazy");
+    xbt_cfg_register(&_surf_cfg_set,
+                     "cpu/optim", description, xbt_cfgelm_string,
+                     &default_value, 1, 1, &_surf_cfg_cb__optimization_mode, NULL);
+
     sprintf(description,
             "The model to use for the network. Possible values: ");
     p = description;
@@ -272,6 +337,20 @@ void surf_config_init(int *argc, char **argv)
                      &default_value, 1, 1, &_surf_cfg_cb__network_model,
                      NULL);
 
+    sprintf(description,
+            "The optimization modes to use for the network. Possible values: ");
+    p = description;
+    while (*(++p) != '\0');
+    for (i = 0; surf_optimization_mode_description[i].name; i++)
+      p += sprintf(p, "%s%s", (i == 0 ? "" : ", "),
+                   surf_optimization_mode_description[i].name);
+    sprintf(p,
+            ".\n       (use 'help' as a value to see the long description of each optimization mode)");
+    default_value = xbt_strdup("Lazy");
+    xbt_cfg_register(&_surf_cfg_set,
+                     "network/optim", description, xbt_cfgelm_string,
+                     &default_value, 1, 1, &_surf_cfg_cb__optimization_mode, NULL);
+
     sprintf(description,
             "The model to use for the workstation. Possible values: ");
     p = description;
@@ -336,10 +415,15 @@ void surf_config_init(int *argc, char **argv)
                      _surf_cfg_cb__surf_path, NULL);
 
     default_value_int = 0;
-    xbt_cfg_register(&_surf_cfg_set, "maxmin_selective_update",
-                     "Update the constraint set propagating recursively to others constraints",
+    xbt_cfg_register(&_surf_cfg_set, "cpu/maxmin_selective_update",
+                     "Update the constraint set propagating recursively to others constraints (1 by default when optim is set to lazy)",
+                     xbt_cfgelm_int, &default_value_int, 0, 1,
+                     NULL, NULL);
+    default_value_int = 0;
+    xbt_cfg_register(&_surf_cfg_set, "network/maxmin_selective_update",
+                     "Update the constraint set propagating recursively to others constraints (1 by default when optim is set to lazy)",
                      xbt_cfgelm_int, &default_value_int, 0, 1,
-                     _surf_cfg_cb__surf_maxmin_selective_update, NULL);
+                     NULL, NULL);
 
     /* do model-check */
     default_value_int = 0;
@@ -347,12 +431,21 @@ void surf_config_init(int *argc, char **argv)
                      "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)
+       _surf_cfg_cb_model_check which sets it's value to 1 (instead of the default value 0)
        xbt_cfg_set_int(_surf_cfg_set, "model-check", default_value_int); */
 
+    /* do verbose-exit */
+    default_value_int = 0;
+    xbt_cfg_register(&_surf_cfg_set, "verbose-exit",
+                     "Activate the \"do nothing\" mode in Ctrl-C",
+                     xbt_cfgelm_int, &default_value_int, 0, 1,
+                     _surf_cfg_cb_verbose_exit, NULL);
+    
+    
     /* context factory */
     default_value = xbt_strdup("ucontext");
     xbt_cfg_register(&_surf_cfg_set, "contexts/factory",
@@ -376,16 +469,30 @@ void surf_config_init(int *argc, char **argv)
     /* minimal number of user contexts to be run in parallel */
     default_value_int = 1;
     xbt_cfg_register(&_surf_cfg_set, "contexts/parallel_threshold",
-        "Minimal number of user contexts to be run in parallel",
+        "Minimal number of user contexts to be run in parallel (raw contexts only)",
         xbt_cfgelm_int, &default_value_int, 1, 1,
         _surf_cfg_cb_contexts_parallel_threshold, NULL);
 
+    /* minimal number of user contexts to be run in parallel */
+    default_value = xbt_strdup("futex");
+    xbt_cfg_register(&_surf_cfg_set, "contexts/parallel_mode",
+        "Synchronization mode to use when running contexts in parallel",
+        xbt_cfgelm_string, &default_value, 1, 1,
+        _surf_cfg_cb_contexts_parallel_mode, NULL);
+
+    default_value = xbt_strdup("no");
+    xbt_cfg_register(&_surf_cfg_set, "coordinates",
+                     "\"yes\" or \"no\" (FIXME: document)",
+                     xbt_cfgelm_string, &default_value, 1, 1,
+                     _surf_cfg_cb__surf_network_coordinates, NULL);
+    xbt_cfg_setdefault_string(_surf_cfg_set, "coordinates", default_value);
+
     default_value_int = 0;
-    xbt_cfg_register(&_surf_cfg_set, "fullduplex",
-                     "Activate the interferences between uploads and downloads for fluid max-min models (LV08, CM03)",
+    xbt_cfg_register(&_surf_cfg_set, "network/crosstraffic",
+                     "Activate the interferences between uploads and downloads for fluid max-min models (LV08, CM02)",
                      xbt_cfgelm_int, &default_value_int, 0, 1,
-                     _surf_cfg_cb__surf_network_fullduplex, NULL);
-    xbt_cfg_setdefault_int(_surf_cfg_set, "fullduplex", default_value_int);
+                     _surf_cfg_cb__surf_network_crosstraffic, NULL);
+    xbt_cfg_setdefault_int(_surf_cfg_set, "network/crosstraffic", default_value_int);
 
 #ifdef HAVE_GTNETS
     xbt_cfg_register(&_surf_cfg_set, "gtnets_jitter",
@@ -400,11 +507,17 @@ void surf_config_init(int *argc, char **argv)
                      xbt_cfgelm_int, &default_value_int, 0, 1,
                      _surf_cfg_cb__gtnets_jitter_seed, NULL);
 #endif
-
+#ifdef HAVE_NS3
+    xbt_cfg_register(&_surf_cfg_set, "ns3/TcpModel",
+                     "The ns3 tcp model can be : NewReno or Reno or Tahoe",
+                     xbt_cfgelm_string, NULL, 1, 1,
+                     NULL, NULL);
+    xbt_cfg_setdefault_string(_surf_cfg_set, "ns3/TcpModel", "default");
+#endif
     if (!surf_path) {
       /* retrieves the current directory of the        current process */
       const char *initial_path = __surf_get_initial_path();
-      xbt_assert0((initial_path),
+      xbt_assert((initial_path),
                   "__surf_get_initial_path() failed! Can't resolves current Windows directory");
 
       surf_path = xbt_dynar_new(sizeof(char *), NULL);
@@ -427,7 +540,8 @@ void surf_config_finalize(void)
   _surf_init_status = 0;
 }
 
-void surf_config_models_setup(const char *platform_file)
+/* Pick the right models for CPU, net and workstation, and call their model_init_preparse */
+void surf_config_models_setup()
 {
   char *workstation_model_name;
   int workstation_id = -1;
@@ -443,14 +557,16 @@ void surf_config_models_setup(const char *platform_file)
    * 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";
-    XBT_INFO
-        ("Switching workstation model to compound since you changed the network and/or cpu model(s)");
-    xbt_cfg_set_string(_surf_cfg_set, "workstation/model", val);
-    workstation_model_name = (char *) "compound";
+
+  if((!xbt_cfg_is_default_value(_surf_cfg_set, "network/model") ||
+	  !xbt_cfg_is_default_value(_surf_cfg_set, "cpu/model")) &&
+	  xbt_cfg_is_default_value(_surf_cfg_set, "workstation/model"))
+  {
+	    const char *val = "compound";
+	    XBT_INFO
+	        ("Switching workstation model to compound since you changed the network and/or cpu model(s)");
+	    xbt_cfg_set_string(_surf_cfg_set, "workstation/model", val);
+	    workstation_model_name = (char *) "compound";
   }
 
   XBT_DEBUG("Workstation model: %s", workstation_model_name);
@@ -461,10 +577,10 @@ void surf_config_models_setup(const char *platform_file)
     int network_id = -1;
     int cpu_id = -1;
 
-    xbt_assert0(cpu_model_name,
+    xbt_assert(cpu_model_name,
                 "Set a cpu model to use with the 'compound' workstation model");
 
-    xbt_assert0(network_model_name,
+    xbt_assert(network_model_name,
                 "Set a network model to use with the 'compound' workstation model");
 
     network_id =
@@ -473,25 +589,10 @@ void surf_config_models_setup(const char *platform_file)
     cpu_id =
         find_model_description(surf_cpu_model_description, cpu_model_name);
 
-    surf_cpu_model_description[cpu_id].model_init_preparse(platform_file);
-    surf_network_model_description[network_id].model_init_preparse
-        (platform_file);
+    surf_cpu_model_description[cpu_id].model_init_preparse();
+    surf_network_model_description[network_id].model_init_preparse();
   }
 
   XBT_DEBUG("Call workstation_model_init");
-  surf_workstation_model_description[workstation_id].model_init_preparse
-      (platform_file);
-}
-
-void surf_config_models_create_elms(void)
-{
-  char *workstation_model_name =
-      xbt_cfg_get_string(_surf_cfg_set, "workstation/model");
-  int workstation_id =
-      find_model_description(surf_workstation_model_description,
-                             workstation_model_name);
-  if (surf_workstation_model_description
-      [workstation_id].model_init_postparse != NULL)
-    surf_workstation_model_description[workstation_id].model_init_postparse
-        ();
+  surf_workstation_model_description[workstation_id].model_init_preparse();
 }