X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8870e4a485d50ed72f249b345c8338dd6ef1b7f7..c8936bbc125e2396d1573bb629dc9c32181b729f:/src/surf/surf_config.c

diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c
index 13abd42453..816709cb25 100644
--- a/src/surf/surf_config.c
+++ b/src/surf/surf_config.c
@@ -7,6 +7,7 @@
 /* surf_config: configuration infrastructure for the simulation world       */
 
 #include "xbt/config.h"
+#include "xbt/log.h"
 #include "xbt/str.h"
 #include "surf/surf_private.h"
 #include "surf/surf_routing.h"	/* COORD_HOST_LEVEL and COORD_ASR_LEVEL */
@@ -20,55 +21,69 @@ xbt_cfg_t _surf_cfg_set = NULL;
 /* Parse the command line, looking for options */
 static void surf_config_cmd_line(int *argc, char **argv)
 {
+  int shall_exit = 0;
   int i, j;
   char *opt;
 
-  for (i = 1; i < *argc; i++) {
-    int remove_it = 0;
+  for (j = i = 1; i < *argc; i++) {
     if (!strncmp(argv[i], "--cfg=", strlen("--cfg="))) {
       opt = strchr(argv[i], '=');
       opt++;
 
       xbt_cfg_set_parse(_surf_cfg_set, opt);
       XBT_DEBUG("Did apply '%s' as config setting", opt);
-      remove_it = 1;
-    } else if (!strncmp(argv[i], "--cfg-help", strlen("--cfg-help") + 1) ||
-               !strncmp(argv[i], "--help", strlen("--help") + 1)) {
+    } else if (!strcmp(argv[i], "--cfg-help") || !strcmp(argv[i], "--help")) {
       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(
+"\n"
+"You 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");
+"\n"
+"You 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)) {
+"\n"
+"You can also use --help-logs and --help-log-categories to see the details of logging output.\n"
+"\n"
+        );
+      shall_exit = 1;
+    } else if (!strcmp(argv[i], "--help-models")) {
+      int k;
+
       model_help("workstation", surf_workstation_model_description);
       printf("\n");
       model_help("CPU", surf_cpu_model_description);
       printf("\n");
       model_help("network", surf_network_model_description);
       printf("\nLong description of all optimization levels accepted by the models of this simulator:\n");
-      for (i = 0; surf_optimization_mode_description[i].name; i++)
-        printf("  %s: %s\n", surf_optimization_mode_description[i].name, surf_optimization_mode_description[i].description);
-      printf("Both network and CPU models have 'Lazy' as default optimization level\n");
-      exit(0);
+      for (k = 0; surf_optimization_mode_description[k].name; k++)
+        printf("  %s: %s\n",
+               surf_optimization_mode_description[k].name,
+               surf_optimization_mode_description[k].description);
+      printf("Both network and CPU models have 'Lazy' as default optimization level\n\n");
+      shall_exit = 1;
+    } else if (!strcmp(argv[i], "--help-logs")) {
+      xbt_log_help();
+      shall_exit = 1;
+    } else if (!strcmp(argv[i], "--help-log-categories")) {
+      xbt_log_help_categories();
+      shall_exit = 1;
 #ifdef HAVE_TRACING
-    } else if (!strncmp(argv[i], "--help-tracing", strlen("--help-tracing") + 1)) {
+    } else if (!strcmp(argv[i], "--help-tracing")) {
       TRACE_help (1);
-      exit(0);
+      shall_exit = 1;
 #endif
-    }
-    if (remove_it) {            /*remove this from argv */
-      for (j = i + 1; j < *argc; j++) {
-        argv[j - 1] = argv[j];
-      }
-
-      argv[j - 1] = NULL;
-      (*argc)--;
-      i--;                      /* compensate effect of next loop incrementation */
+    } else {
+      argv[j++] = argv[i];
     }
   }
+  if (j < *argc) {
+    argv[j] = NULL;
+    *argc = j;
+  }
+  if (shall_exit)
+    exit(0);
 }
 
 
@@ -544,7 +559,7 @@ void surf_config_init(int *argc, char **argv)
                      "Double value to oscillate the link latency, uniformly in random interval [-latency*gtnets_jitter,latency*gtnets_jitter)",
                      xbt_cfgelm_double, NULL, 1, 1,
                      _surf_cfg_cb__gtnets_jitter, NULL);
-    xbt_cfg_setdefault_double(_surf_cfg_set, "gtnets_jitter", 0.0);
+    xbt_cfg_setdefault_double(_surf_cfg_set, "gtnets/jitter", 0.0);
 
     default_value_int = 10;
     xbt_cfg_register(&_surf_cfg_set, "gtnets/jitter_seed",