From: Paul Bédaride <paul.bedaride@gmail.com>
Date: Mon, 17 Dec 2012 10:04:19 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3_9_rc1~86^2~110
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7d9a2608433e246294b7c4b339371fd4d3530ba6?hp=3ee5e2ac47abb878c628539714f57dbb4898032b

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
---

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 170a986334..6252c8bd24 100644
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -4,6 +4,7 @@ set(EXTRA_DIST
   src/include/mc/datatypes.h
   src/include/mc/mc.h
   src/include/simgrid/platf_interface.h
+  src/include/simgrid/sg_config.h
   src/include/surf/datatypes.h
   src/include/surf/maxmin.h
   src/include/surf/random_mgr.h
@@ -311,6 +312,7 @@ set(LUA_SRC
   )
 
 set(TRACING_SRC
+  src/simgrid/sg_config.c
   src/instr/instr_config.c
   src/instr/instr_interface.c
   src/instr/instr_msg_process.c
diff --git a/include/simgrid/modelchecker.h b/include/simgrid/modelchecker.h
index d5f8bca700..ae58a10401 100644
--- a/include/simgrid/modelchecker.h
+++ b/include/simgrid/modelchecker.h
@@ -14,9 +14,9 @@
 
 #ifdef HAVE_MC
 
-extern int _surf_do_model_check; /* please don't use directly: we inline MC_is_active, but that's what you should use */
+extern int _sg_do_model_check; /* please don't use directly: we inline MC_is_active, but that's what you should use */
 
-#define MC_is_active() _surf_do_model_check
+#define MC_is_active() _sg_do_model_check
 
 XBT_PUBLIC(void) MC_assert(int);
 XBT_PUBLIC(int) MC_random(int min, int max);
diff --git a/src/include/simgrid/sg_config.h b/src/include/simgrid/sg_config.h
new file mode 100644
index 0000000000..bd61488975
--- /dev/null
+++ b/src/include/simgrid/sg_config.h
@@ -0,0 +1,15 @@
+
+#include "xbt/config.h"
+
+/*******************************************/
+/*** Config Globals **************************/
+/*******************************************/
+XBT_PUBLIC_DATA(xbt_cfg_t) _sg_cfg_set;
+XBT_PUBLIC(int) sg_cfg_get_int(const char* name);
+XBT_PUBLIC(double) sg_cfg_get_double(const char* name);
+XBT_PUBLIC(char*) sg_cfg_get_string(const char* name);
+XBT_PUBLIC(void) sg_cfg_get_peer(const char *name, char **peer, int *port);
+XBT_PUBLIC(xbt_dynar_t) sg_cfg_get_dynar(const char* name);
+
+void sg_config_init(int *argc, char **argv);
+void sg_config_finalize(void);
diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index f5de0740f2..26c43930d3 100644
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -672,12 +672,6 @@ XBT_PUBLIC_DATA(xbt_dynar_t) model_list;
 /*******************************************/
 /*** SURF Globals **************************/
 /*******************************************/
-XBT_PUBLIC_DATA(xbt_cfg_t) _surf_cfg_set;
-XBT_PUBLIC(int) surf_cfg_get_int(const char* name);
-XBT_PUBLIC(double) surf_cfg_get_double(const char* name);
-XBT_PUBLIC(char*) surf_cfg_get_string(const char* name);
-XBT_PUBLIC(void) surf_cfg_get_peer(const char *name, char **peer, int *port);
-XBT_PUBLIC(xbt_dynar_t) surf_cfg_get_dynar(const char* name);
 
 /** \ingroup SURF_simulation
  *  \brief Initialize SURF
diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c
index 06f2fb6ae5..9da8976b8b 100644
--- a/src/instr/instr_config.c
+++ b/src/instr/instr_config.c
@@ -5,6 +5,7 @@
   * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "instr/instr_private.h"
+#include "simgrid/sg_config.h"
 
 #ifdef HAVE_TRACING
 
@@ -49,19 +50,19 @@ static int trace_active = 0;
 
 static void TRACE_getopts(void)
 {
-  trace_enabled = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING);
-  trace_platform = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_PLATFORM);
-  trace_platform_topology = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_TOPOLOGY);
-  trace_smpi_enabled = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI);
-  trace_smpi_grouped = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI_GROUP);
-  trace_smpi_computing = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI_COMPUTING);
-  trace_categorized = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_CATEGORIZED);
-  trace_uncategorized = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_UNCATEGORIZED);
-  trace_msg_process_enabled = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_PROCESS);
-  trace_buffer = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_BUFFER);
-  trace_onelink_only = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_ONELINK_ONLY);
-  trace_disable_destroy = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_DISABLE_DESTROY);
-  trace_basic = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_BASIC);
+  trace_enabled = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING);
+  trace_platform = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_PLATFORM);
+  trace_platform_topology = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_TOPOLOGY);
+  trace_smpi_enabled = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_SMPI);
+  trace_smpi_grouped = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_SMPI_GROUP);
+  trace_smpi_computing = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_SMPI_COMPUTING);
+  trace_categorized = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_CATEGORIZED);
+  trace_uncategorized = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_UNCATEGORIZED);
+  trace_msg_process_enabled = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_MSG_PROCESS);
+  trace_buffer = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_BUFFER);
+  trace_onelink_only = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_ONELINK_ONLY);
+  trace_disable_destroy = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_DISABLE_DESTROY);
+  trace_basic = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_BASIC);
 }
 
 int TRACE_start()
@@ -214,153 +215,153 @@ int TRACE_basic (void)
 
 char *TRACE_get_comment (void)
 {
-  return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_COMMENT);
+  return xbt_cfg_get_string(_sg_cfg_set, OPT_TRACING_COMMENT);
 }
 
 char *TRACE_get_comment_file (void)
 {
-  return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_COMMENT_FILE);
+  return xbt_cfg_get_string(_sg_cfg_set, OPT_TRACING_COMMENT_FILE);
 }
 
 char *TRACE_get_filename(void)
 {
-  return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_FILENAME);
+  return xbt_cfg_get_string(_sg_cfg_set, OPT_TRACING_FILENAME);
 }
 
 char *TRACE_get_viva_uncat_conf (void)
 {
-  return xbt_cfg_get_string(_surf_cfg_set, OPT_VIVA_UNCAT_CONF);
+  return xbt_cfg_get_string(_sg_cfg_set, OPT_VIVA_UNCAT_CONF);
 }
 
 char *TRACE_get_viva_cat_conf (void)
 {
-  return xbt_cfg_get_string(_surf_cfg_set, OPT_VIVA_CAT_CONF);
+  return xbt_cfg_get_string(_sg_cfg_set, OPT_VIVA_CAT_CONF);
 }
 
 void TRACE_global_init(int *argc, char **argv)
 {
   /* name of the tracefile */
   char *default_tracing_filename = xbt_strdup("simgrid.trace");
-  xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_FILENAME,
+  xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_FILENAME,
                    "Trace file created by the instrumented SimGrid.",
                    xbt_cfgelm_string, &default_tracing_filename, 1, 1,
                    NULL, NULL);
 
   /* tracing */
   int default_tracing = 0;
-  xbt_cfg_register(&_surf_cfg_set, OPT_TRACING,
+  xbt_cfg_register(&_sg_cfg_set, OPT_TRACING,
                    "Enable Tracing.",
                    xbt_cfgelm_int, &default_tracing, 0, 1,
                    NULL, NULL);
 
   /* register platform in the trace */
   int default_tracing_platform = 0;
-  xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_PLATFORM,
+  xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_PLATFORM,
                    "Register the platform in the trace as a hierarchy.",
                    xbt_cfgelm_int, &default_tracing_platform, 0, 1,
                    NULL, NULL);
 
   /* register platform in the trace */
   int default_tracing_platform_topology = 1;
-  xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_TOPOLOGY,
+  xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_TOPOLOGY,
                    "Register the platform topology in the trace as a graph.",
                    xbt_cfgelm_int, &default_tracing_platform_topology, 0, 1,
                    NULL, NULL);
 
   /* smpi */
   int default_tracing_smpi = 0;
-  xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_SMPI,
+  xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_SMPI,
                    "Tracing of the SMPI interface.",
                    xbt_cfgelm_int, &default_tracing_smpi, 0, 1,
                    NULL, NULL);
 
   /* smpi grouped */
   int default_tracing_smpi_grouped = 0;
-  xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_SMPI_GROUP,
+  xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_SMPI_GROUP,
                    "Group MPI processes by host.",
                    xbt_cfgelm_int, &default_tracing_smpi_grouped, 0, 1,
                    NULL, NULL);
 
   /* smpi computing */
   int default_tracing_smpi_computing = 0;
-  xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_SMPI_COMPUTING,
+  xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_SMPI_COMPUTING,
                    "Generate states for timing out of SMPI parts of the application",
                    xbt_cfgelm_int, &default_tracing_smpi_computing, 0, 1,
                    NULL, NULL);
 
   /* tracing categorized resource utilization traces */
   int default_tracing_categorized = 0;
-  xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_CATEGORIZED,
+  xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_CATEGORIZED,
                    "Tracing categorized resource utilization of hosts and links.",
                    xbt_cfgelm_int, &default_tracing_categorized, 0, 1,
                    NULL, NULL);
 
   /* tracing uncategorized resource utilization */
   int default_tracing_uncategorized = 0;
-  xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_UNCATEGORIZED,
+  xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_UNCATEGORIZED,
                    "Tracing uncategorized resource utilization of hosts and links.",
                    xbt_cfgelm_int, &default_tracing_uncategorized, 0, 1,
                    NULL, NULL);
 
   /* msg process */
   int default_tracing_msg_process = 0;
-  xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_MSG_PROCESS,
+  xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_MSG_PROCESS,
                    "Tracing of MSG process behavior.",
                    xbt_cfgelm_int, &default_tracing_msg_process, 0, 1,
                    NULL, NULL);
 
   /* tracing buffer */
   int default_buffer = 1;
-  xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_BUFFER,
+  xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_BUFFER,
                    "Buffer trace events to put them in temporal order.",
                    xbt_cfgelm_int, &default_buffer, 0, 1,
                    NULL, NULL);
 
   /* tracing one link only */
   int default_onelink_only = 0;
-  xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_ONELINK_ONLY,
+  xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_ONELINK_ONLY,
                    "Use only routes with one link to trace platform.",
                    xbt_cfgelm_int, &default_onelink_only, 0, 1,
                    NULL, NULL);
 
   /* disable destroy */
   int default_disable_destroy = 0;
-  xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_DISABLE_DESTROY,
+  xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_DISABLE_DESTROY,
                    "Disable platform containers destruction.",
                    xbt_cfgelm_int, &default_disable_destroy, 0, 1,
                    NULL, NULL);
 
   /* basic -- Avoid extended events (impoverished trace file) */
   int default_basic = 0;
-  xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_BASIC,
+  xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_BASIC,
                    "Avoid extended events (impoverished trace file).",
                    xbt_cfgelm_int, &default_basic, 0, 1,
                    NULL, NULL);
 
   /* comment */
   char *default_tracing_comment = xbt_strdup ("");
-  xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_COMMENT,
+  xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_COMMENT,
                    "Comment to be added on the top of the trace file.",
                    xbt_cfgelm_string, &default_tracing_comment, 1, 1,
                    NULL, NULL);
 
   /* comment_file */
   char *default_tracing_comment_file = xbt_strdup ("");
-  xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_COMMENT_FILE,
+  xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_COMMENT_FILE,
                    "The contents of the file are added to the top of the trace file as comment.",
                    xbt_cfgelm_string, &default_tracing_comment_file, 1, 1,
                    NULL, NULL);
 
   /* Viva graph configuration for uncategorized tracing */
   char *default_viva_uncat_conf_file = xbt_strdup ("");
-  xbt_cfg_register(&_surf_cfg_set, OPT_VIVA_UNCAT_CONF,
+  xbt_cfg_register(&_sg_cfg_set, OPT_VIVA_UNCAT_CONF,
                    "Viva Graph configuration file for uncategorized resource utilization traces.",
                    xbt_cfgelm_string, &default_viva_uncat_conf_file, 1, 1,
                    NULL, NULL);
 
   /* Viva graph configuration for uncategorized tracing */
   char *default_viva_cat_conf_file = xbt_strdup ("");
-  xbt_cfg_register(&_surf_cfg_set, OPT_VIVA_CAT_CONF,
+  xbt_cfg_register(&_sg_cfg_set, OPT_VIVA_CAT_CONF,
                    "Viva Graph configuration file for categorized resource utilization traces.",
                    xbt_cfgelm_string, &default_viva_cat_conf_file, 1, 1,
                    NULL, NULL);
diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index 8289f35484..f3555063f0 100644
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@ -24,12 +24,12 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc,
 e_mc_reduce_t mc_reduce_kind=e_mc_reduce_unset;
 
 
-extern int _surf_init_status;
+extern int _sg_init_status;
 void _mc_cfg_cb_reduce(const char *name, int pos) {
-  if (_surf_init_status && !_surf_do_model_check) {
+  if (_sg_init_status && !_sg_do_model_check) {
     xbt_die("You are specifying a reduction strategy after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry.");
   }
-  char *val= xbt_cfg_get_string(_surf_cfg_set, name);
+  char *val= xbt_cfg_get_string(_sg_cfg_set, name);
   if (!strcasecmp(val,"none")) {
     mc_reduce_kind = e_mc_reduce_none;
   } else if (!strcasecmp(val,"dpor")) {
@@ -40,37 +40,37 @@ void _mc_cfg_cb_reduce(const char *name, int pos) {
 }
 
 void _mc_cfg_cb_checkpoint(const char *name, int pos) {
-  if (_surf_init_status && !_surf_do_model_check) {
+  if (_sg_init_status && !_sg_do_model_check) {
     xbt_die("You are specifying a checkpointing value after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry.");
   }
-  _surf_mc_checkpoint = xbt_cfg_get_int(_surf_cfg_set, name);
+  _surf_mc_checkpoint = xbt_cfg_get_int(_sg_cfg_set, name);
 }
 void _mc_cfg_cb_property(const char *name, int pos) {
-  if (_surf_init_status && !_surf_do_model_check) {
+  if (_sg_init_status && !_sg_do_model_check) {
     xbt_die("You are specifying a property after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry.");
   }
-  _surf_mc_property_file= xbt_cfg_get_string(_surf_cfg_set, name);
+  _surf_mc_property_file= xbt_cfg_get_string(_sg_cfg_set, name);
 }
 
 void _mc_cfg_cb_timeout(const char *name, int pos) {
-  if (_surf_init_status && !_surf_do_model_check) {
+  if (_sg_init_status && !_sg_do_model_check) {
     xbt_die("You are specifying a value to enable/disable timeout for wait requests after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry.");
   }
-  _surf_mc_timeout= xbt_cfg_get_int(_surf_cfg_set, name);
+  _surf_mc_timeout= xbt_cfg_get_int(_sg_cfg_set, name);
 }
 
 void _mc_cfg_cb_max_depth(const char *name, int pos) {
-  if (_surf_init_status && !_surf_do_model_check) {
+  if (_sg_init_status && !_sg_do_model_check) {
     xbt_die("You are specifying a max depth value after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry.");
   }
-  _surf_mc_max_depth= xbt_cfg_get_int(_surf_cfg_set, name);
+  _surf_mc_max_depth= xbt_cfg_get_int(_sg_cfg_set, name);
 }
 
 void _mc_cfg_cb_visited(const char *name, int pos) {
-  if (_surf_init_status && !_surf_do_model_check) {
+  if (_sg_init_status && !_sg_do_model_check) {
     xbt_die("You are specifying a number of stored visited states after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry.");
   }
-  _surf_mc_visited= xbt_cfg_get_int(_surf_cfg_set, name);
+  _surf_mc_visited= xbt_cfg_get_int(_sg_cfg_set, name);
 }
 
 
diff --git a/src/msg/msg_config.c b/src/msg/msg_config.c
index fbbafb0a1d..e45bb5f393 100644
--- a/src/msg/msg_config.c
+++ b/src/msg/msg_config.c
@@ -5,6 +5,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "msg_private.h"
+#include "simgrid/sg_config.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 
@@ -25,7 +26,7 @@ void MSG_config(const char *name, ...)
     xbt_abort();
   }
   va_start(pa, name);
-  xbt_cfg_set_vargs(_surf_cfg_set, name, pa);
+  xbt_cfg_set_vargs(_sg_cfg_set, name, pa);
   va_end(pa);
   return;
 }
diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index 2294740e6c..d979db37be 100644
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -8,6 +8,7 @@
 #include "xbt/sysdep.h"
 #include "xbt/dynar.h"
 #include "surf/surf.h"
+#include "simgrid/sg_config.h"
 #include "xbt/ex.h"
 #include "xbt/log.h"
 #include "xbt/str.h"
@@ -80,7 +81,7 @@ void SD_init(int *argc, char **argv)
 
   surf_init(argc, argv);
 
-  xbt_cfg_setdefault_string(_surf_cfg_set, "workstation/model",
+  xbt_cfg_setdefault_string(_sg_cfg_set, "workstation/model",
                             "ptask_L07");
 
 #ifdef HAVE_TRACING
diff --git a/src/simgrid/sg_config.c b/src/simgrid/sg_config.c
new file mode 100644
index 0000000000..c39e34efbf
--- /dev/null
+++ b/src/simgrid/sg_config.c
@@ -0,0 +1,810 @@
+/* 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. */
+
+/* sg_config: configuration infrastructure for the simulation world       */
+
+#include "xbt/misc.h"
+#include "xbt/config.h"
+#include "xbt/log.h"
+#include "xbt/mallocator.h"
+#include "xbt/str.h"
+#include "surf/surf_private.h"
+#include "surf/surf_routing.h"  /* COORD_HOST_LEVEL and COORD_ASR_LEVEL */
+#include "simgrid/simix.h"
+#include "simgrid/sg_config.h"
+#include "mc/mc.h" 
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf,
+                                "About the configuration of simgrid");
+
+xbt_cfg_t _sg_cfg_set = NULL;
+
+int _sg_do_model_check = 0;
+int _surf_mc_checkpoint=0;
+char* _surf_mc_property_file=NULL;
+int _surf_mc_timeout=0;
+int _surf_mc_max_depth=1000;
+int _surf_mc_visited=0;
+
+int _sg_init_status = 0;      /* 0: beginning of time (config cannot be changed yet);
+                                  1: initialized: cfg_set created (config can now be changed);
+                                  2: configured: command line parsed and config part of platform file was integrated also, platform construction ongoing or done.
+                                     (Config cannot be changed anymore!) */
+
+/* Parse the command line, looking for options */
+static void sg_config_cmd_line(int *argc, char **argv)
+{
+  int shall_exit = 0;
+  int i, j;
+  char *opt;
+
+  for (j = i = 1; i < *argc; i++) {
+    if (!strncmp(argv[i], "--cfg=", strlen("--cfg="))) {
+      opt = strchr(argv[i], '=');
+      opt++;
+
+      xbt_cfg_set_parse(_sg_cfg_set, opt);
+      XBT_DEBUG("Did apply '%s' as config setting", opt);
+    } else if (!strcmp(argv[i], "--cfg-help") || !strcmp(argv[i], "--help")) {
+      printf
+          ("Description of the configuration accepted by this simulator:\n");
+      xbt_cfg_help(_sg_cfg_set);
+      printf(
+"\n"
+"Each of these configurations can be used by adding\n"
+"    --cfg=<option name>:<option value>\n"
+"to the command line.\n"
+"You can also use --help-models to see the details of all models known by this simulator.\n"
+#ifdef HAVE_TRACING
+"\n"
+"You can also use --help-tracing to see the details of all tracing options known by this simulator.\n"
+#endif
+"\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 (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;
+#ifdef HAVE_TRACING
+    } else if (!strcmp(argv[i], "--help-tracing")) {
+      TRACE_help (1);
+      shall_exit = 1;
+#endif
+    } else {
+      argv[j++] = argv[i];
+    }
+  }
+  if (j < *argc) {
+    argv[j] = NULL;
+    *argc = j;
+  }
+  if (shall_exit) {
+    _sg_init_status=1; // get everything cleanly cleaned on exit
+    exit(0);
+  }
+}
+
+
+/* callback of the workstation/model variable */
+static void _sg_cfg_cb__workstation_model(const char *name, int pos)
+{
+  char *val;
+
+  xbt_assert(_sg_init_status == 1,
+              "Cannot change the model after the initialization");
+
+  val = xbt_cfg_get_string(_sg_cfg_set, name);
+
+  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);
+}
+
+/* callback of the cpu/model variable */
+static void _sg_cfg_cb__cpu_model(const char *name, int pos)
+{
+  char *val;
+
+  xbt_assert(_sg_init_status == 1,
+              "Cannot change the model after the initialization");
+
+  val = xbt_cfg_get_string(_sg_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);
+}
+
+/* callback of the cpu/model variable */
+static void _sg_cfg_cb__optimization_mode(const char *name, int pos)
+{
+  char *val;
+
+  xbt_assert(_sg_init_status == 1,
+              "Cannot change the model after the initialization");
+
+  val = xbt_cfg_get_string(_sg_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 cpu/model variable */
+static void _sg_cfg_cb__storage_mode(const char *name, int pos)
+{
+  char *val;
+
+  xbt_assert(_sg_init_status == 1,
+              "Cannot change the model after the initialization");
+
+  val = xbt_cfg_get_string(_sg_cfg_set, name);
+
+  if (!strcmp(val, "help")) {
+    model_help("storage", surf_storage_model_description);
+    exit(0);
+  }
+
+  /* New Module missing */
+  find_model_description(surf_storage_model_description, val);
+}
+
+/* callback of the workstation_model variable */
+static void _sg_cfg_cb__network_model(const char *name, int pos)
+{
+  char *val;
+
+  xbt_assert(_sg_init_status == 1,
+              "Cannot change the model after the initialization");
+
+  val = xbt_cfg_get_string(_sg_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);
+}
+
+
+/* callbacks of the network models values */
+static void _sg_cfg_cb__tcp_gamma(const char *name, int pos)
+{
+  sg_tcp_gamma = xbt_cfg_get_double(_sg_cfg_set, name);
+}
+
+static void _sg_cfg_cb__maxmin_precision(const char* name, int pos)
+{
+  sg_maxmin_precision = xbt_cfg_get_double(_sg_cfg_set, name);
+}
+
+static void _sg_cfg_cb__sender_gap(const char* name, int pos)
+{
+  sg_sender_gap = xbt_cfg_get_double(_sg_cfg_set, name);
+}
+
+static void _sg_cfg_cb__latency_factor(const char *name, int pos)
+{
+  sg_latency_factor = xbt_cfg_get_double(_sg_cfg_set, name);
+}
+
+static void _sg_cfg_cb__bandwidth_factor(const char *name, int pos)
+{
+  sg_bandwidth_factor = xbt_cfg_get_double(_sg_cfg_set, name);
+}
+
+static void _sg_cfg_cb__weight_S(const char *name, int pos)
+{
+  sg_weight_S_parameter = xbt_cfg_get_double(_sg_cfg_set, name);
+}
+
+/* callback of the inclusion path */
+static void _sg_cfg_cb__surf_path(const char *name, int pos)
+{
+  char *path = xbt_cfg_get_string_at(_sg_cfg_set, name, pos);
+  xbt_dynar_push(surf_path, &path);
+}
+
+/* callback to decide if we want to use the model-checking */
+#include "xbt_modinter.h"
+extern int _sg_do_model_check;   /* this variable lives in xbt_main until I find a right location for it */
+
+static void _sg_cfg_cb_model_check(const char *name, int pos)
+{
+  _sg_do_model_check = xbt_cfg_get_int(_sg_cfg_set, name);
+
+#ifndef HAVE_MC
+  if (_sg_do_model_check) {
+    xbt_die("You tried to activate the model-checking from the command line, but it was not compiled in. Change your settings in cmake, recompile and try again");
+  }
+#endif
+}
+
+extern int _sg_do_verbose_exit;
+
+static void _sg_cfg_cb_verbose_exit(const char *name, int pos)
+{
+  _sg_do_verbose_exit = xbt_cfg_get_int(_sg_cfg_set, name);
+}
+
+
+static void _sg_cfg_cb_context_factory(const char *name, int pos) {
+  smx_context_factory_name = xbt_cfg_get_string(_sg_cfg_set, name);
+}
+
+static void _sg_cfg_cb_context_stack_size(const char *name, int pos)
+{
+  smx_context_stack_size_was_set = 1;
+  smx_context_stack_size = xbt_cfg_get_int(_sg_cfg_set, name) * 1024;
+}
+
+static void _sg_cfg_cb_contexts_nthreads(const char *name, int pos)
+{
+  SIMIX_context_set_nthreads(xbt_cfg_get_int(_sg_cfg_set, name));
+}
+
+static void _sg_cfg_cb_contexts_parallel_threshold(const char *name, int pos)
+{
+  SIMIX_context_set_parallel_threshold(xbt_cfg_get_int(_sg_cfg_set, name));
+}
+
+static void _sg_cfg_cb_contexts_parallel_mode(const char *name, int pos)
+{
+  const char* mode_name = xbt_cfg_get_string(_sg_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_die("Command line setting of the parallel synchronization mode should "
+        "be one of \"posix\", \"futex\" or \"busy_wait\"");
+  }
+}
+
+static void _sg_cfg_cb_surf_nthreads(const char *name, int pos)
+{
+  surf_set_nthreads(xbt_cfg_get_int(_sg_cfg_set, name));
+}
+
+static void _sg_cfg_cb__surf_network_coordinates(const char *name,
+                                                   int pos)
+{
+  char *val = xbt_cfg_get_string(_sg_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_die("Setting of whether to use coordinate cannot be disabled once set.");
+  } else {
+    xbt_die("Command line setting of whether to use coordinates must be either \"yes\" or \"no\"");
+  }
+}
+
+static void _sg_cfg_cb__surf_network_crosstraffic(const char *name,
+                                                  int pos)
+{
+  sg_network_crosstraffic = xbt_cfg_get_int(_sg_cfg_set, name);
+}
+
+#ifdef HAVE_GTNETS
+static void _sg_cfg_cb__gtnets_jitter(const char *name, int pos)
+{
+  sg_gtnets_jitter = xbt_cfg_get_double(_sg_cfg_set, name);
+}
+
+static void _sg_cfg_cb__gtnets_jitter_seed(const char *name, int pos)
+{
+  sg_gtnets_jitter_seed = xbt_cfg_get_int(_sg_cfg_set, name);
+}
+#endif
+
+/* create the config set, register what should be and parse the command line*/
+void sg_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;
+
+  /* Create the configuration support */
+  if (_sg_init_status == 0) { /* Only create stuff if not already inited */
+    sprintf(description,
+            "The model to use for the CPU. Possible values: ");
+    p = description;
+    while (*(++p) != '\0');
+    for (i = 0; surf_cpu_model_description[i].name; i++)
+      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(&_sg_cfg_set, "cpu/model", description, xbt_cfgelm_string,
+                     &default_value, 1, 1, &_sg_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(&_sg_cfg_set, "cpu/optim", description, xbt_cfgelm_string,
+                     &default_value, 1, 1, &_sg_cfg_cb__optimization_mode, NULL);
+
+    sprintf(description,
+            "The model to use for the storage. Possible values: ");
+    p = description;
+    while (*(++p) != '\0');
+    for (i = 0; surf_storage_model_description[i].name; i++)
+      p += sprintf(p, "%s%s", (i == 0 ? "" : ", "),
+                   surf_storage_model_description[i].name);
+    sprintf(p,
+            ".\n       (use 'help' as a value to see the long description of each model)");
+    default_value = xbt_strdup("default");
+    xbt_cfg_register(&_sg_cfg_set, "storage/model", description, xbt_cfgelm_string,
+                     &default_value, 1, 1, &_sg_cfg_cb__storage_mode,
+                     NULL);
+
+    /* ********************************************************************* */
+    /* TUTORIAL: New model                                                   */
+    sprintf(description,
+            "The model to use for the New model. Possible values: ");
+    p = description;
+    while (*(++p) != '\0');
+    for (i = 0; surf_new_model_description[i].name; i++)
+      p += sprintf(p, "%s%s", (i == 0 ? "" : ", "),
+                   surf_new_model_description[i].name);
+    sprintf(p,
+            ".\n       (use 'help' as a value to see the long description of each model)");
+    default_value = xbt_strdup("default");
+    xbt_cfg_register(&_sg_cfg_set, "new_model/model", description, xbt_cfgelm_string,
+                     &default_value, 1, 1, &_sg_cfg_cb__storage_mode,
+                     NULL);
+    /* ********************************************************************* */
+
+    sprintf(description,
+            "The model to use for the network. Possible values: ");
+    p = description;
+    while (*(++p) != '\0');
+    for (i = 0; surf_network_model_description[i].name; i++)
+      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(&_sg_cfg_set, "network/model", description, xbt_cfgelm_string,
+                     &default_value, 1, 1, &_sg_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(&_sg_cfg_set, "network/optim", description, xbt_cfgelm_string,
+                     &default_value, 1, 1, &_sg_cfg_cb__optimization_mode, NULL);
+
+    sprintf(description,
+            "The model to use for the workstation. Possible values: ");
+    p = description;
+    while (*(++p) != '\0');
+    for (i = 0; surf_workstation_model_description[i].name; i++)
+      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("default");
+    xbt_cfg_register(&_sg_cfg_set, "workstation/model", description, xbt_cfgelm_string,
+                     &default_value, 1, 1,
+                     &_sg_cfg_cb__workstation_model, NULL);
+
+    xbt_free(description);
+
+    xbt_cfg_register(&_sg_cfg_set, "network/TCP_gamma",
+                     "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,
+                     _sg_cfg_cb__tcp_gamma, NULL);
+    xbt_cfg_setdefault_double(_sg_cfg_set, "network/TCP_gamma", 4194304.0);
+
+    xbt_cfg_register(&_sg_cfg_set, "maxmin/precision",
+                     "Numerical precision used when updating simulation models (epsilon in double comparisons)",
+                     xbt_cfgelm_double, NULL, 1, 1, _sg_cfg_cb__maxmin_precision, NULL);
+    xbt_cfg_setdefault_double(_sg_cfg_set, "maxmin/precision", 0.00001); // FIXME use setdefault everywhere here!
+
+    /* The parameters of network models */
+
+    double_default_value = 0.0;
+    xbt_cfg_register(&_sg_cfg_set, "network/sender_gap",
+                     "Minimum gap between two overlapping sends",
+                     xbt_cfgelm_double, &double_default_value, 1, 1,
+                     _sg_cfg_cb__sender_gap, NULL);
+
+    double_default_value = 1.0;
+    xbt_cfg_register(&_sg_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,
+                     _sg_cfg_cb__latency_factor, NULL);
+    double_default_value = 1.0;
+    xbt_cfg_register(&_sg_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,
+                     _sg_cfg_cb__bandwidth_factor, NULL);
+    double_default_value = 0.0;
+    xbt_cfg_register(&_sg_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,
+                     _sg_cfg_cb__weight_S, NULL);
+
+    /* Inclusion path */
+    xbt_cfg_register(&_sg_cfg_set, "path",
+                     "Lookup path for inclusions in platform and deployment XML files",
+                     xbt_cfgelm_string, NULL, 0, 0,
+                     _sg_cfg_cb__surf_path, NULL);
+
+    default_value_int = 0;
+    xbt_cfg_register(&_sg_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(&_sg_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,
+                     NULL, NULL);
+
+#ifdef HAVE_MC
+    /* do model-checking */
+    xbt_cfg_register(&_sg_cfg_set, "model-check",
+                     "Verify the system through model-checking instead of simulating it (EXPERIMENTAL)",
+                     xbt_cfgelm_int, NULL, 0, 1,
+                     _sg_cfg_cb_model_check, NULL);
+    xbt_cfg_setdefault_int(_sg_cfg_set, "model-check", 0);
+
+    /* do stateful model-checking */
+    xbt_cfg_register(&_sg_cfg_set, "model-check/checkpoint",
+                     "Specify the amount of steps between checkpoints during stateful model-checking (default: 0 => stateless verification). "
+                     "If value=1, one checkpoint is saved for each step => faster verification, but huge memory consumption; higher values are good compromises between speed and memory consumption.",
+                     xbt_cfgelm_int, NULL, 0, 1,
+                     _mc_cfg_cb_checkpoint, NULL);
+    xbt_cfg_setdefault_int(_sg_cfg_set, "model-check/checkpoint", 0);
+    
+    /* do liveness model-checking */
+    xbt_cfg_register(&_sg_cfg_set, "model-check/property",
+                     "Specify the name of the file containing the property. It must be the result of the ltl2ba program.",
+                     xbt_cfgelm_string, NULL, 0, 1,
+                     _mc_cfg_cb_property, NULL);
+    xbt_cfg_setdefault_string(_sg_cfg_set, "model-check/property", "");
+
+    /* Specify the kind of model-checking reduction */
+    xbt_cfg_register(&_sg_cfg_set, "model-check/reduction",
+                     "Specify the kind of exploration reduction (either none or DPOR)",
+                     xbt_cfgelm_string, NULL, 0, 1,
+                     _mc_cfg_cb_reduce, NULL);
+    xbt_cfg_setdefault_string(_sg_cfg_set, "model-check/reduction", "dpor");
+
+    /* Enable/disable timeout for wait requests with model-checking */
+    xbt_cfg_register(&_sg_cfg_set, "model-check/timeout",
+                     "Enable/Disable timeout for wait requests",
+                     xbt_cfgelm_int, NULL, 0, 1,
+                     _mc_cfg_cb_timeout, NULL);
+    xbt_cfg_setdefault_int(_sg_cfg_set, "model-check/timeout", 0);
+
+    /* Set max depth exploration */
+    xbt_cfg_register(&_sg_cfg_set, "model-check/max_depth",
+                     "Specify the max depth of exploration (default : 1000)",
+                     xbt_cfgelm_int, NULL, 0, 1,
+                     _mc_cfg_cb_max_depth, NULL);
+    xbt_cfg_setdefault_int(_sg_cfg_set, "model-check/max_depth", 1000);
+
+    /* Set number of visited state stored for state comparison reduction*/
+    xbt_cfg_register(&_sg_cfg_set, "model-check/visited",
+                     "Specify the number of visited state stored for state comparison reduction. If value=5, the last 5 visited states are stored",
+                     xbt_cfgelm_int, NULL, 0, 1,
+                     _mc_cfg_cb_visited, NULL);
+    xbt_cfg_setdefault_int(_sg_cfg_set, "model-check/visited", 0);
+#endif
+
+    /* do verbose-exit */
+    default_value_int = 1;
+    xbt_cfg_register(&_sg_cfg_set, "verbose-exit",
+                     "Activate the \"do nothing\" mode in Ctrl-C",
+                     xbt_cfgelm_int, &default_value_int, 0, 1,
+                     _sg_cfg_cb_verbose_exit, NULL);
+    
+    
+    /* context factory */
+    default_value = xbt_strdup("ucontext");
+    xbt_cfg_register(&_sg_cfg_set, "contexts/factory",
+                     "Context factory to use in SIMIX (ucontext, thread or raw)",
+                     xbt_cfgelm_string, &default_value, 1, 1, _sg_cfg_cb_context_factory, NULL);
+
+    /* stack size of contexts in Ko */
+    default_value_int = 128;
+    xbt_cfg_register(&_sg_cfg_set, "contexts/stack_size",
+                     "Stack size of contexts in Kib (ucontext or raw only)",
+                     xbt_cfgelm_int, &default_value_int, 1, 1,
+                     _sg_cfg_cb_context_stack_size, NULL);
+
+    /* number of parallel threads for user processes */
+    default_value_int = 1;
+    xbt_cfg_register(&_sg_cfg_set, "contexts/nthreads",
+                     "Number of parallel threads used to execute user contexts",
+                     xbt_cfgelm_int, &default_value_int, 1, 1,
+                     _sg_cfg_cb_contexts_nthreads, NULL);
+
+    /* minimal number of user contexts to be run in parallel */
+    default_value_int = 2;
+    xbt_cfg_register(&_sg_cfg_set, "contexts/parallel_threshold",
+        "Minimal number of user contexts to be run in parallel (raw contexts only)",
+        xbt_cfgelm_int, &default_value_int, 1, 1,
+        _sg_cfg_cb_contexts_parallel_threshold, NULL);
+
+    /* synchronization mode for parallel user contexts */
+#ifdef HAVE_FUTEX_H
+    default_value = xbt_strdup("futex");
+#else //No futex on mac and posix is unimplememted yet
+    default_value = xbt_strdup("busy_wait");
+#endif
+    xbt_cfg_register(&_sg_cfg_set, "contexts/synchro",
+        "Synchronization mode to use when running contexts in parallel (either futex, posix or busy_wait)",
+        xbt_cfgelm_string, &default_value, 1, 1,
+        _sg_cfg_cb_contexts_parallel_mode, NULL);
+
+    /* number of parallel threads for Surf */
+    default_value_int = surf_get_nthreads();
+    xbt_cfg_register(&_sg_cfg_set, "surf/nthreads",
+                     "Number of parallel threads used to update Surf models",
+                     xbt_cfgelm_int, &default_value_int, 1, 1,
+                     _sg_cfg_cb_surf_nthreads, NULL);
+
+    default_value = xbt_strdup("no");
+    xbt_cfg_register(&_sg_cfg_set, "network/coordinates",
+                     "\"yes\" or \"no\", specifying whether we use a coordinate-based routing (as Vivaldi)",
+                     xbt_cfgelm_string, &default_value, 1, 1,
+                     _sg_cfg_cb__surf_network_coordinates, NULL);
+    xbt_cfg_setdefault_string(_sg_cfg_set, "network/coordinates", default_value);
+
+    default_value_int = 0;
+    xbt_cfg_register(&_sg_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,
+                     _sg_cfg_cb__surf_network_crosstraffic, NULL);
+    xbt_cfg_setdefault_int(_sg_cfg_set, "network/crosstraffic", default_value_int);
+
+#ifdef HAVE_GTNETS
+    xbt_cfg_register(&_sg_cfg_set, "gtnets/jitter",
+                     "Double value to oscillate the link latency, uniformly in random interval [-latency*gtnets_jitter,latency*gtnets_jitter)",
+                     xbt_cfgelm_double, NULL, 1, 1,
+                     _sg_cfg_cb__gtnets_jitter, NULL);
+    xbt_cfg_setdefault_double(_sg_cfg_set, "gtnets/jitter", 0.0);
+
+    default_value_int = 10;
+    xbt_cfg_register(&_sg_cfg_set, "gtnets/jitter_seed",
+                     "Use a positive seed to reproduce jitted results, value must be in [1,1e8], default is 10",
+                     xbt_cfgelm_int, &default_value_int, 0, 1,
+                     _sg_cfg_cb__gtnets_jitter_seed, NULL);
+#endif
+#ifdef HAVE_NS3
+    xbt_cfg_register(&_sg_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(_sg_cfg_set, "ns3/TcpModel", "default");
+#endif
+
+//SMPI
+    double default_reference_speed = 20000.0;
+    xbt_cfg_register(&_sg_cfg_set, "smpi/running_power",
+                     "Power of the host running the simulation (in flop/s). Used to bench the operations.",
+                     xbt_cfgelm_double, &default_reference_speed, 1, 1, NULL,
+                     NULL);
+
+    int default_display_timing = 0;
+    xbt_cfg_register(&_sg_cfg_set, "smpi/display_timing",
+                     "Boolean indicating whether we should display the timing after simulation.",
+                     xbt_cfgelm_int, &default_display_timing, 1, 1, NULL,
+                     NULL);
+
+    double default_threshold = 1e-6;
+    xbt_cfg_register(&_sg_cfg_set, "smpi/cpu_threshold",
+                     "Minimal computation time (in seconds) not discarded.",
+                     xbt_cfgelm_double, &default_threshold, 1, 1, NULL,
+                     NULL);
+
+    int default_small_messages_threshold = 0;
+    xbt_cfg_register(&_sg_cfg_set, "smpi/async_small_thres",
+                     "Maximal size of messages that are to be sent asynchronously, without waiting for the receiver",
+                     xbt_cfgelm_int, &default_small_messages_threshold, 1, 1, NULL,
+                     NULL);
+
+    //For smpi/bw_factor and smpi/lat_factor
+    //Default value have to be "threshold0:value0;threshold1:value1;...;thresholdN:valueN"
+    //test is if( size >= thresholdN ) return valueN;
+    //Values can be modified with command line --cfg=smpi/bw_factor:"threshold0:value0;threshold1:value1;...;thresholdN:valueN"
+    //  or with tag config put line <prop id="smpi/bw_factor" value="threshold0:value0;threshold1:value1;...;thresholdN:valueN"></prop>
+    xbt_cfg_register(&_sg_cfg_set, "smpi/bw_factor",
+                     "Bandwidth factors for smpi.",
+                     xbt_cfgelm_string, NULL, 1, 1, NULL,
+                     NULL);
+    xbt_cfg_setdefault_string(_sg_cfg_set, "smpi/bw_factor", "65472:0.940694;15424:0.697866;9376:0.58729;5776:1.08739;3484:0.77493;1426:0.608902;732:0.341987;257:0.338112;0:0.812084");
+
+    xbt_cfg_register(&_sg_cfg_set, "smpi/lat_factor",
+                     "Latency factors for smpi.",
+                     xbt_cfgelm_string, NULL, 1, 1, NULL,
+                     NULL);
+    xbt_cfg_setdefault_string(_sg_cfg_set, "smpi/lat_factor", "65472:11.6436;15424:3.48845;9376:2.59299;5776:2.18796;3484:1.88101;1426:1.61075;732:1.9503;257:1.95341;0:2.01467");
+//END SMPI
+
+
+    if (!surf_path) {
+      /* retrieves the current directory of the        current process */
+      const char *initial_path = __surf_get_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);
+      xbt_cfg_setdefault_string(_sg_cfg_set, "path", initial_path);
+    }
+
+    _sg_init_status = 1;
+
+    sg_config_cmd_line(argc, argv);
+
+    xbt_mallocator_initialization_is_done(SIMIX_context_is_parallel());
+
+  } else {
+    XBT_WARN("Call to sg_config_init() after initialization ignored");
+  }
+}
+
+void sg_config_finalize(void)
+{
+  if (!_sg_init_status)
+    return;                     /* Not initialized yet. Nothing to do */
+
+  xbt_cfg_free(&_sg_cfg_set);
+  _sg_init_status = 0;
+}
+
+/* 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;
+  char *network_model_name = NULL;
+  char *cpu_model_name = NULL;
+  int storage_id = -1;
+  char *storage_model_name = NULL;
+
+  workstation_model_name =
+      xbt_cfg_get_string(_sg_cfg_set, "workstation/model");
+  network_model_name = xbt_cfg_get_string(_sg_cfg_set, "network/model");
+  cpu_model_name = xbt_cfg_get_string(_sg_cfg_set, "cpu/model");
+  storage_model_name = xbt_cfg_get_string(_sg_cfg_set, "storage/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((!xbt_cfg_is_default_value(_sg_cfg_set, "network/model") ||
+    !xbt_cfg_is_default_value(_sg_cfg_set, "cpu/model")) &&
+    xbt_cfg_is_default_value(_sg_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(_sg_cfg_set, "workstation/model", val);
+      workstation_model_name = (char *) "compound";
+  }
+
+  XBT_DEBUG("Workstation model: %s", workstation_model_name);
+  workstation_id =
+      find_model_description(surf_workstation_model_description,
+                             workstation_model_name);
+  if (!strcmp(workstation_model_name, "compound")) {
+    int network_id = -1;
+    int cpu_id = -1;
+
+    xbt_assert(cpu_model_name,
+                "Set a cpu model to use with the 'compound' workstation model");
+
+    xbt_assert(network_model_name,
+                "Set a network model to use with the 'compound' workstation model");
+
+    network_id =
+        find_model_description(surf_network_model_description,
+                               network_model_name);
+    cpu_id =
+        find_model_description(surf_cpu_model_description, cpu_model_name);
+
+    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();
+
+  XBT_DEBUG("Call storage_model_init");
+  storage_id = find_model_description(surf_storage_model_description, storage_model_name);
+  surf_storage_model_description[storage_id].model_init_preparse();
+
+  /* ********************************************************************* */
+  /* TUTORIAL: New model                                                   */
+  int new_model_id = -1;
+  char *new_model_name = NULL;
+  new_model_name = xbt_cfg_get_string(_sg_cfg_set, "new_model/model");
+  XBT_DEBUG("Call new model_init");
+  new_model_id = find_model_description(surf_new_model_description, new_model_name);
+  surf_new_model_description[new_model_id].model_init_preparse();
+  /* ********************************************************************* */
+}
+
+int sg_cfg_get_int(const char* name)
+{
+	return xbt_cfg_get_int(_sg_cfg_set,name);
+}
+double sg_cfg_get_double(const char* name)
+{
+	return xbt_cfg_get_double(_sg_cfg_set,name);
+}
+char* sg_cfg_get_string(const char* name)
+{
+	return xbt_cfg_get_string(_sg_cfg_set,name);
+}
+void sg_cfg_get_peer(const char *name, char **peer, int *port)
+{
+	xbt_cfg_get_peer(_sg_cfg_set,name, peer, port);
+}
+xbt_dynar_t sg_cfg_get_dynar(const char* name)
+{
+	return xbt_cfg_get_dynar(_sg_cfg_set,name);
+}
diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index 8c1e1856e0..ba6d03f6aa 100644
--- a/src/simix/smx_context.c
+++ b/src/simix/smx_context.c
@@ -11,6 +11,7 @@
 #include "xbt/swag.h"
 #include "xbt/xbt_os_thread.h"
 #include "smx_private.h"
+#include "simgrid/sg_config.h"
 #include "internal_config.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix,
@@ -105,7 +106,7 @@ void SIMIX_context_mod_exit(void)
     finalize_factory = simix_global->context_factory->finalize;
     finalize_factory(&simix_global->context_factory);
   }
-  xbt_dict_remove((xbt_dict_t) _surf_cfg_set,"contexts/factory");
+  xbt_dict_remove((xbt_dict_t) _sg_cfg_set,"contexts/factory");
 }
 
 /**
diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index b82be914fe..3d72dd400b 100644
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -27,10 +27,10 @@ static void SIMIX_clean(void);
 /* FIXME: Yeah, I'll do it in a portable maner one day [Mt] */
 #include <signal.h>
 
-int _surf_do_verbose_exit = 1;
+int _sg_do_verbose_exit = 1;
 static void _XBT_CALL inthandler(int ignored)
 {
-  if ( _surf_do_verbose_exit ) {
+  if ( _sg_do_verbose_exit ) {
      XBT_INFO("CTRL-C pressed. Displaying status and bailing out");
      SIMIX_display_process_status();
   }
diff --git a/src/smpi/smpi_base.c b/src/smpi/smpi_base.c
index 594e4b74ca..e064be615c 100644
--- a/src/smpi/smpi_base.c
+++ b/src/smpi/smpi_base.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include "simix/smx_private.h"
 #include "surf/surf.h"
+#include "simgrid/sg_config.h"
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_base, smpi, "Logging specific to SMPI (base)");
@@ -182,7 +183,7 @@ void smpi_mpi_start(MPI_Request request)
              "Cannot (re)start a non-finished communication");
   if(request->flags & RECV) {
     print_request("New recv", request);
-    if (request->size < surf_cfg_get_int("smpi/async_small_thres"))
+    if (request->size < sg_cfg_get_int("smpi/async_small_thres"))
       mailbox = smpi_process_mailbox_small();
     else
       mailbox = smpi_process_mailbox();
@@ -198,7 +199,7 @@ void smpi_mpi_start(MPI_Request request)
 /*      return;*/
 /*    }*/
     print_request("New send", request);
-    if (request->size < surf_cfg_get_int("smpi/async_small_thres")) { // eager mode
+    if (request->size < sg_cfg_get_int("smpi/async_small_thres")) { // eager mode
       mailbox = smpi_process_remote_mailbox_small(receiver);
     }else{
       XBT_DEBUG("Send request %p is not in the permanent receive mailbox (buf: %p)",request,request->buf);
@@ -494,7 +495,7 @@ void smpi_mpi_iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status*
 
   print_request("New iprobe", request);
   // We have to test both mailboxes as we don't know if we will receive one one or another
-    if (surf_cfg_get_int("smpi/async_small_thres")>0){
+    if (sg_cfg_get_int("smpi/async_small_thres")>0){
         mailbox = smpi_process_mailbox_small();
         XBT_DEBUG("trying to probe the perm recv mailbox");
         request->action = simcall_comm_iprobe(mailbox, request->src, request->tag, &match_recv, (void*)request);
diff --git a/src/smpi/smpi_bench.c b/src/smpi/smpi_bench.c
index 2732ec9be7..ca628b9f22 100644
--- a/src/smpi/smpi_bench.c
+++ b/src/smpi/smpi_bench.c
@@ -9,6 +9,7 @@
 #include "xbt/sysdep.h"
 #include "xbt/ex.h"
 #include "surf/surf.h"
+#include "simgrid/sg_config.h"
 
 #ifndef WIN32
 #include <sys/mman.h>
@@ -136,13 +137,13 @@ void smpi_execute_flops(double flops) {
 static void smpi_execute(double duration)
 {
   /* FIXME: a global variable would be less expensive to consult than a call to xbt_cfg_get_double() right on the critical path */
-  if (duration >= surf_cfg_get_double("smpi/cpu_threshold")) {
+  if (duration >= sg_cfg_get_double("smpi/cpu_threshold")) {
     XBT_DEBUG("Sleep for %f to handle real computation time", duration);
     smpi_execute_flops(duration *
-    		surf_cfg_get_double("smpi/running_power"));
+    		sg_cfg_get_double("smpi/running_power"));
   } else {
     XBT_DEBUG("Real computation took %f while option smpi/cpu_threshold is set to %f => ignore it",
-        duration, surf_cfg_get_double("smpi/cpu_threshold"));
+        duration, sg_cfg_get_double("smpi/cpu_threshold"));
   }
 }
 
diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index 07b04a1f74..572cddae18 100644
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -13,6 +13,7 @@
 #include "mc/mc.h"
 #include "surf/surf.h"
 #include "simix/smx_private.h"
+#include "simgrid/sg_config.h"
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_kernel, smpi,
@@ -358,7 +359,7 @@ int smpi_main(int (*realmain) (int argc, char *argv[]),int argc, char *argv[])
   else
     SIMIX_run();
 
-  if (surf_cfg_get_int("smpi/display_timing"))
+  if (sg_cfg_get_int("smpi/display_timing"))
     XBT_INFO("Simulation time: %g seconds.", SIMIX_get_clock());
 
   smpi_global_destroy();
diff --git a/src/surf/cpu_cas01.c b/src/surf/cpu_cas01.c
index b427a5c839..10332f9a05 100644
--- a/src/surf/cpu_cas01.c
+++ b/src/surf/cpu_cas01.c
@@ -7,6 +7,7 @@
 #include "surf_private.h"
 #include "surf/surf_resource.h"
 #include "maxmin_private.h"
+#include "simgrid/sg_config.h"
 
 surf_model_t surf_cpu_model = NULL;
 
@@ -325,9 +326,9 @@ static void surf_cpu_model_init_internal()
   s_surf_action_t action;
   s_surf_action_cpu_Cas01_t comp;
 
-  char *optim = xbt_cfg_get_string(_surf_cfg_set, "cpu/optim");
+  char *optim = xbt_cfg_get_string(_sg_cfg_set, "cpu/optim");
   int select =
-      xbt_cfg_get_int(_surf_cfg_set, "cpu/maxmin_selective_update");
+      xbt_cfg_get_int(_sg_cfg_set, "cpu/maxmin_selective_update");
 
   surf_cpu_model = surf_model_init();
 
@@ -340,7 +341,7 @@ static void surf_cpu_model_init_internal()
     xbt_assert((select == 1)
                ||
                (xbt_cfg_is_default_value
-                (_surf_cfg_set, "cpu/maxmin_selective_update")),
+                (_sg_cfg_set, "cpu/maxmin_selective_update")),
                "Disabling selective update while using the lazy update mechanism is dumb!");
   } else {
     xbt_die("Unsupported optimization (%s) for this model", optim);
@@ -425,7 +426,7 @@ static void surf_cpu_model_init_internal()
 
 void surf_cpu_model_init_Cas01()
 {
-  char *optim = xbt_cfg_get_string(_surf_cfg_set, "cpu/optim");
+  char *optim = xbt_cfg_get_string(_sg_cfg_set, "cpu/optim");
 
   if (surf_cpu_model)
     return;
diff --git a/src/surf/network.c b/src/surf/network.c
index db352085f7..4b6d9259c1 100644
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -22,6 +22,7 @@
 #include "surf/surfxml_parse_values.h"
 #include "surf/surf_resource.h"
 #include "surf/surf_resource_lmm.h"
+#include "simgrid/sg_config.h"
 
 #undef GENERIC_LMM_ACTION
 #undef GENERIC_ACTION
@@ -118,7 +119,7 @@ static double smpi_bandwidth_factor(double size)
 {
   if (!smpi_bw_factor)
     smpi_bw_factor =
-        parse_factor(surf_cfg_get_string("smpi/bw_factor"));
+        parse_factor(sg_cfg_get_string("smpi/bw_factor"));
 
   unsigned int iter = 0;
   s_smpi_factor_t fact;
@@ -139,7 +140,7 @@ static double smpi_latency_factor(double size)
 {
   if (!smpi_lat_factor)
     smpi_lat_factor =
-        parse_factor(surf_cfg_get_string("smpi/lat_factor"));
+        parse_factor(sg_cfg_get_string("smpi/lat_factor"));
 
   unsigned int iter = 0;
   s_smpi_factor_t fact;
@@ -734,9 +735,9 @@ static void smpi_gap_remove(surf_action_lmm_t lmm_action)
 
 static void set_update_mechanism(void)
 {
-  char *optim = xbt_cfg_get_string(_surf_cfg_set, "network/optim");
+  char *optim = xbt_cfg_get_string(_sg_cfg_set, "network/optim");
   int select =
-      xbt_cfg_get_int(_surf_cfg_set, "network/maxmin_selective_update");
+      xbt_cfg_get_int(_sg_cfg_set, "network/maxmin_selective_update");
 
   if (!strcmp(optim, "Full")) {
     surf_network_model->model_private->update_mechanism = UM_FULL;
@@ -747,7 +748,7 @@ static void set_update_mechanism(void)
     xbt_assert((select == 1)
                ||
                (xbt_cfg_is_default_value
-                (_surf_cfg_set, "network/maxmin_selective_update")),
+                (_sg_cfg_set, "network/maxmin_selective_update")),
                "Disabling selective update while using the lazy update mechanism is dumb!");
   } else {
     xbt_die("Unsupported optimization (%s) for this model", optim);
@@ -855,8 +856,8 @@ void surf_network_model_init_SMPI(void)
   xbt_dynar_push(model_list, &surf_network_model);
   network_solve = lmm_solve;
 
-  xbt_cfg_setdefault_double(_surf_cfg_set, "network/sender_gap", 10e-6);
-  xbt_cfg_setdefault_double(_surf_cfg_set, "network/weight_S", 8775);
+  xbt_cfg_setdefault_double(_sg_cfg_set, "network/sender_gap", 10e-6);
+  xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
 }
 
 /************************************************************************/
@@ -883,11 +884,11 @@ void surf_network_model_init_LegrandVelho(void)
   xbt_dynar_push(model_list, &surf_network_model);
   network_solve = lmm_solve;
 
-  xbt_cfg_setdefault_double(_surf_cfg_set, "network/latency_factor",
+  xbt_cfg_setdefault_double(_sg_cfg_set, "network/latency_factor",
                             13.01);
-  xbt_cfg_setdefault_double(_surf_cfg_set, "network/bandwidth_factor",
+  xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor",
                             0.97);
-  xbt_cfg_setdefault_double(_surf_cfg_set, "network/weight_S", 20537);
+  xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 20537);
 }
 
 /***************************************************************************/
@@ -912,10 +913,10 @@ void surf_network_model_init_CM02(void)
   xbt_dynar_push(model_list, &surf_network_model);
   network_solve = lmm_solve;
 
-  xbt_cfg_setdefault_double(_surf_cfg_set, "network/latency_factor", 1.0);
-  xbt_cfg_setdefault_double(_surf_cfg_set, "network/bandwidth_factor",
+  xbt_cfg_setdefault_double(_sg_cfg_set, "network/latency_factor", 1.0);
+  xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor",
                             1.0);
-  xbt_cfg_setdefault_double(_surf_cfg_set, "network/weight_S", 0.0);
+  xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 0.0);
 }
 
 /***************************************************************************/
@@ -941,10 +942,10 @@ void surf_network_model_init_Reno(void)
                                     func_reno_fpi);
   network_solve = lagrange_solve;
 
-  xbt_cfg_setdefault_double(_surf_cfg_set, "network/latency_factor", 10.4);
-  xbt_cfg_setdefault_double(_surf_cfg_set, "network/bandwidth_factor",
+  xbt_cfg_setdefault_double(_sg_cfg_set, "network/latency_factor", 10.4);
+  xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor",
                             0.92);
-  xbt_cfg_setdefault_double(_surf_cfg_set, "network/weight_S", 8775);
+  xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
 }
 
 
@@ -961,10 +962,10 @@ void surf_network_model_init_Reno2(void)
                                     func_reno2_fpi);
   network_solve = lagrange_solve;
 
-  xbt_cfg_setdefault_double(_surf_cfg_set, "network/latency_factor", 10.4);
-  xbt_cfg_setdefault_double(_surf_cfg_set, "network/bandwidth_factor",
+  xbt_cfg_setdefault_double(_sg_cfg_set, "network/latency_factor", 10.4);
+  xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor",
                             0.92);
-  xbt_cfg_setdefault_double(_surf_cfg_set, "network/weight_S_parameter",
+  xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S_parameter",
                             8775);
 }
 
@@ -981,8 +982,8 @@ void surf_network_model_init_Vegas(void)
                                     func_vegas_fpi);
   network_solve = lagrange_solve;
 
-  xbt_cfg_setdefault_double(_surf_cfg_set, "network/latency_factor", 10.4);
-  xbt_cfg_setdefault_double(_surf_cfg_set, "network/bandwidth_factor",
+  xbt_cfg_setdefault_double(_sg_cfg_set, "network/latency_factor", 10.4);
+  xbt_cfg_setdefault_double(_sg_cfg_set, "network/bandwidth_factor",
                             0.92);
-  xbt_cfg_setdefault_double(_surf_cfg_set, "network/weight_S", 8775);
+  xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
 }
diff --git a/src/surf/surf.c b/src/surf/surf.c
index fbf2ae3c71..22aeea5247 100644
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -10,6 +10,7 @@
 #include "simix/smx_host_private.h"
 #include "surf/surf_resource.h"
 #include "xbt/xbt_os_thread.h"
+#include "simgrid/sg_config.h"
 
 #include <ctype.h>
 
@@ -55,26 +56,6 @@ static const char *disk_drives_letter_table[MAX_DRIVE] = {
 };
 #endif                          /* #ifdef _XBT_WIN32 */
 
-int surf_cfg_get_int(const char* name)
-{
-	return xbt_cfg_get_int(_surf_cfg_set,name);
-}
-double surf_cfg_get_double(const char* name)
-{
-	return xbt_cfg_get_double(_surf_cfg_set,name);
-}
-char* surf_cfg_get_string(const char* name)
-{
-	return xbt_cfg_get_string(_surf_cfg_set,name);
-}
-void surf_cfg_get_peer(const char *name, char **peer, int *port)
-{
-	xbt_cfg_get_peer(_surf_cfg_set,name, peer, port);
-}
-xbt_dynar_t surf_cfg_get_dynar(const char* name)
-{
-	return xbt_cfg_get_dynar(_surf_cfg_set,name);
-}
 /*
  * Returns the initial path. On Windows the initial path is
  * the current directory for the current process in the other
@@ -437,7 +418,7 @@ void surf_init(int *argc, char **argv)
   if (!history)
     history = tmgr_history_new();
 
-  surf_config_init(argc, argv);
+  sg_config_init(argc, argv);
 
   surf_action_init();
   if (MC_is_active())
@@ -479,7 +460,7 @@ void surf_exit(void)
   unsigned int iter;
   surf_model_t model = NULL;
 
-  surf_config_finalize();
+  sg_config_finalize();
 
   xbt_dynar_foreach(model_list, iter, model)
       model->model_private->finalize();
diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c
index 29f17ea630..8b13789179 100644
--- a/src/surf/surf_config.c
+++ b/src/surf/surf_config.c
@@ -1,782 +1 @@
-/* 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. */
-
-/* surf_config: configuration infrastructure for the simulation world       */
-
-#include "xbt/misc.h"
-#include "xbt/config.h"
-#include "xbt/log.h"
-#include "xbt/mallocator.h"
-#include "xbt/str.h"
-#include "surf/surf_private.h"
-#include "surf/surf_routing.h"  /* COORD_HOST_LEVEL and COORD_ASR_LEVEL */
-#include "simgrid/simix.h"
-#include "mc/mc.h" /* configuration callbacks of model-checking */
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf,
-                                "About the configuration of surf (and the rest of the simulation)");
-
-xbt_cfg_t _surf_cfg_set = NULL;
-
-int _surf_init_status = 0;      /* 0: beginning of time (config cannot be changed yet);
-                                   1: initialized: cfg_set created (config can now be changed);
-                                   2: configured: command line parsed and config part of platform file was integrated also, platform construction ongoing or done.
-                                      (Config cannot be changed anymore!) */
-
-
-/* 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 (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);
-    } 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(
-"\n"
-"Each of these configurations can be used by adding\n"
-"    --cfg=<option name>:<option value>\n"
-"to the command line.\n"
-"You can also use --help-models to see the details of all models known by this simulator.\n"
-#ifdef HAVE_TRACING
-"\n"
-"You can also use --help-tracing to see the details of all tracing options known by this simulator.\n"
-#endif
-"\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 (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;
-#ifdef HAVE_TRACING
-    } else if (!strcmp(argv[i], "--help-tracing")) {
-      TRACE_help (1);
-      shall_exit = 1;
-#endif
-    } else {
-      argv[j++] = argv[i];
-    }
-  }
-  if (j < *argc) {
-    argv[j] = NULL;
-    *argc = j;
-  }
-  if (shall_exit) {
-    _surf_init_status=1; // get everything cleanly cleaned on exit
-    exit(0);
-  }
-}
-
-
-/* callback of the workstation/model variable */
-static void _surf_cfg_cb__workstation_model(const char *name, int pos)
-{
-  char *val;
-
-  xbt_assert(_surf_init_status == 1,
-              "Cannot change the model after the initialization");
-
-  val = xbt_cfg_get_string(_surf_cfg_set, name);
-
-  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);
-}
-
-/* callback of the cpu/model variable */
-static void _surf_cfg_cb__cpu_model(const char *name, int pos)
-{
-  char *val;
-
-  xbt_assert(_surf_init_status == 1,
-              "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);
-}
-
-/* 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 == 1,
-              "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 cpu/model variable */
-static void _surf_cfg_cb__storage_mode(const char *name, int pos)
-{
-  char *val;
-
-  xbt_assert(_surf_init_status == 1,
-              "Cannot change the model after the initialization");
-
-  val = xbt_cfg_get_string(_surf_cfg_set, name);
-
-  if (!strcmp(val, "help")) {
-    model_help("storage", surf_storage_model_description);
-    exit(0);
-  }
-
-  /* New Module missing */
-  find_model_description(surf_storage_model_description, val);
-}
-
-/* callback of the workstation_model variable */
-static void _surf_cfg_cb__network_model(const char *name, int pos)
-{
-  char *val;
-
-  xbt_assert(_surf_init_status == 1,
-              "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);
-}
-
-
-/* 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__maxmin_precision(const char* name, int pos)
-{
-  sg_maxmin_precision = xbt_cfg_get_double(_surf_cfg_set, name);
-}
-
-static void _surf_cfg_cb__sender_gap(const char* name, int pos)
-{
-  sg_sender_gap = 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);
-}
-
-/* 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);
-}
-
-/* callback to decide if we want to use the model-checking */
-#include "xbt_modinter.h"
-extern int _surf_do_model_check;   /* this variable lives in xbt_main until I find a right location for it */
-
-static void _surf_cfg_cb_model_check(const char *name, int pos)
-{
-  _surf_do_model_check = xbt_cfg_get_int(_surf_cfg_set, name);
-
-#ifndef HAVE_MC
-  if (_surf_do_model_check) {
-    xbt_die("You tried to activate the model-checking from the command line, but it was not compiled in. Change your settings in cmake, recompile and try again");
-  }
-#endif
-}
-
-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);
-}
-
-static void _surf_cfg_cb_context_stack_size(const char *name, int pos)
-{
-  smx_context_stack_size_was_set = 1;
-  smx_context_stack_size = xbt_cfg_get_int(_surf_cfg_set, name) * 1024;
-}
-
-static void _surf_cfg_cb_contexts_nthreads(const char *name, int pos)
-{
-  SIMIX_context_set_nthreads(xbt_cfg_get_int(_surf_cfg_set, name));
-}
-
-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_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_die("Command line setting of the parallel synchronization mode should "
-        "be one of \"posix\", \"futex\" or \"busy_wait\"");
-  }
-}
-
-static void _surf_cfg_cb_surf_nthreads(const char *name, int pos)
-{
-  surf_set_nthreads(xbt_cfg_get_int(_surf_cfg_set, name));
-}
-
-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_die("Setting of whether to use coordinate cannot be disabled once set.");
-  } else {
-    xbt_die("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_crosstraffic = xbt_cfg_get_int(_surf_cfg_set, name);
-}
-
-#ifdef HAVE_GTNETS
-static void _surf_cfg_cb__gtnets_jitter(const char *name, int pos)
-{
-  sg_gtnets_jitter = xbt_cfg_get_double(_surf_cfg_set, name);
-}
-
-static void _surf_cfg_cb__gtnets_jitter_seed(const char *name, int pos)
-{
-  sg_gtnets_jitter_seed = xbt_cfg_get_int(_surf_cfg_set, name);
-}
-#endif
-
-/* create the config set, register what should be and parse the command line*/
-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;
-
-  /* Create the configuration support */
-  if (_surf_init_status == 0) { /* Only create stuff if not already inited */
-    sprintf(description,
-            "The model to use for the CPU. Possible values: ");
-    p = description;
-    while (*(++p) != '\0');
-    for (i = 0; surf_cpu_model_description[i].name; i++)
-      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,
-                     &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 storage. Possible values: ");
-    p = description;
-    while (*(++p) != '\0');
-    for (i = 0; surf_storage_model_description[i].name; i++)
-      p += sprintf(p, "%s%s", (i == 0 ? "" : ", "),
-                   surf_storage_model_description[i].name);
-    sprintf(p,
-            ".\n       (use 'help' as a value to see the long description of each model)");
-    default_value = xbt_strdup("default");
-    xbt_cfg_register(&_surf_cfg_set, "storage/model", description, xbt_cfgelm_string,
-                     &default_value, 1, 1, &_surf_cfg_cb__storage_mode,
-                     NULL);
-
-    /* ********************************************************************* */
-    /* TUTORIAL: New model                                                   */
-    sprintf(description,
-            "The model to use for the New model. Possible values: ");
-    p = description;
-    while (*(++p) != '\0');
-    for (i = 0; surf_new_model_description[i].name; i++)
-      p += sprintf(p, "%s%s", (i == 0 ? "" : ", "),
-                   surf_new_model_description[i].name);
-    sprintf(p,
-            ".\n       (use 'help' as a value to see the long description of each model)");
-    default_value = xbt_strdup("default");
-    xbt_cfg_register(&_surf_cfg_set, "new_model/model", description, xbt_cfgelm_string,
-                     &default_value, 1, 1, &_surf_cfg_cb__storage_mode,
-                     NULL);
-    /* ********************************************************************* */
-
-    sprintf(description,
-            "The model to use for the network. Possible values: ");
-    p = description;
-    while (*(++p) != '\0');
-    for (i = 0; surf_network_model_description[i].name; i++)
-      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,
-                     &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;
-    while (*(++p) != '\0');
-    for (i = 0; surf_workstation_model_description[i].name; i++)
-      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("default");
-    xbt_cfg_register(&_surf_cfg_set, "workstation/model", description, xbt_cfgelm_string,
-                     &default_value, 1, 1,
-                     &_surf_cfg_cb__workstation_model, NULL);
-
-    xbt_free(description);
-
-    xbt_cfg_register(&_surf_cfg_set, "network/TCP_gamma",
-                     "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_setdefault_double(_surf_cfg_set, "network/TCP_gamma", 4194304.0);
-
-    xbt_cfg_register(&_surf_cfg_set, "maxmin/precision",
-                     "Numerical precision used when updating simulation models (epsilon in double comparisons)",
-                     xbt_cfgelm_double, NULL, 1, 1, _surf_cfg_cb__maxmin_precision, NULL);
-    xbt_cfg_setdefault_double(_surf_cfg_set, "maxmin/precision", 0.00001); // FIXME use setdefault everywhere here!
-
-    /* The parameters of network models */
-
-    double_default_value = 0.0;
-    xbt_cfg_register(&_surf_cfg_set, "network/sender_gap",
-                     "Minimum gap between two overlapping sends",
-                     xbt_cfgelm_double, &double_default_value, 1, 1,
-                     _surf_cfg_cb__sender_gap, NULL);
-
-    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, NULL);
-
-    default_value_int = 0;
-    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,
-                     NULL, NULL);
-
-#ifdef HAVE_MC
-    /* do model-checking */
-    xbt_cfg_register(&_surf_cfg_set, "model-check",
-                     "Verify the system through model-checking instead of simulating it (EXPERIMENTAL)",
-                     xbt_cfgelm_int, NULL, 0, 1,
-                     _surf_cfg_cb_model_check, NULL);
-    xbt_cfg_setdefault_int(_surf_cfg_set, "model-check", 0);
-
-    /* do stateful model-checking */
-    xbt_cfg_register(&_surf_cfg_set, "model-check/checkpoint",
-                     "Specify the amount of steps between checkpoints during stateful model-checking (default: 0 => stateless verification). "
-                     "If value=1, one checkpoint is saved for each step => faster verification, but huge memory consumption; higher values are good compromises between speed and memory consumption.",
-                     xbt_cfgelm_int, NULL, 0, 1,
-                     _mc_cfg_cb_checkpoint, NULL);
-    xbt_cfg_setdefault_int(_surf_cfg_set, "model-check/checkpoint", 0);
-    
-    /* do liveness model-checking */
-    xbt_cfg_register(&_surf_cfg_set, "model-check/property",
-                     "Specify the name of the file containing the property. It must be the result of the ltl2ba program.",
-                     xbt_cfgelm_string, NULL, 0, 1,
-                     _mc_cfg_cb_property, NULL);
-    xbt_cfg_setdefault_string(_surf_cfg_set, "model-check/property", "");
-
-    /* Specify the kind of model-checking reduction */
-    xbt_cfg_register(&_surf_cfg_set, "model-check/reduction",
-                     "Specify the kind of exploration reduction (either none or DPOR)",
-                     xbt_cfgelm_string, NULL, 0, 1,
-                     _mc_cfg_cb_reduce, NULL);
-    xbt_cfg_setdefault_string(_surf_cfg_set, "model-check/reduction", "dpor");
-
-    /* Enable/disable timeout for wait requests with model-checking */
-    xbt_cfg_register(&_surf_cfg_set, "model-check/timeout",
-                     "Enable/Disable timeout for wait requests",
-                     xbt_cfgelm_int, NULL, 0, 1,
-                     _mc_cfg_cb_timeout, NULL);
-    xbt_cfg_setdefault_int(_surf_cfg_set, "model-check/timeout", 0);
-
-    /* Set max depth exploration */
-    xbt_cfg_register(&_surf_cfg_set, "model-check/max_depth",
-                     "Specify the max depth of exploration (default : 1000)",
-                     xbt_cfgelm_int, NULL, 0, 1,
-                     _mc_cfg_cb_max_depth, NULL);
-    xbt_cfg_setdefault_int(_surf_cfg_set, "model-check/max_depth", 1000);
-
-    /* Set number of visited state stored for state comparison reduction*/
-    xbt_cfg_register(&_surf_cfg_set, "model-check/visited",
-                     "Specify the number of visited state stored for state comparison reduction. If value=5, the last 5 visited states are stored",
-                     xbt_cfgelm_int, NULL, 0, 1,
-                     _mc_cfg_cb_visited, NULL);
-    xbt_cfg_setdefault_int(_surf_cfg_set, "model-check/visited", 0);
-#endif
-
-    /* do verbose-exit */
-    default_value_int = 1;
-    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",
-                     "Context factory to use in SIMIX (ucontext, thread or raw)",
-                     xbt_cfgelm_string, &default_value, 1, 1, _surf_cfg_cb_context_factory, NULL);
-
-    /* stack size of contexts in Ko */
-    default_value_int = 128;
-    xbt_cfg_register(&_surf_cfg_set, "contexts/stack_size",
-                     "Stack size of contexts in Kib (ucontext or raw only)",
-                     xbt_cfgelm_int, &default_value_int, 1, 1,
-                     _surf_cfg_cb_context_stack_size, NULL);
-
-    /* number of parallel threads for user processes */
-    default_value_int = 1;
-    xbt_cfg_register(&_surf_cfg_set, "contexts/nthreads",
-                     "Number of parallel threads used to execute user contexts",
-                     xbt_cfgelm_int, &default_value_int, 1, 1,
-                     _surf_cfg_cb_contexts_nthreads, NULL);
-
-    /* minimal number of user contexts to be run in parallel */
-    default_value_int = 2;
-    xbt_cfg_register(&_surf_cfg_set, "contexts/parallel_threshold",
-        "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);
-
-    /* synchronization mode for parallel user contexts */
-#ifdef HAVE_FUTEX_H
-    default_value = xbt_strdup("futex");
-#else //No futex on mac and posix is unimplememted yet
-    default_value = xbt_strdup("busy_wait");
-#endif
-    xbt_cfg_register(&_surf_cfg_set, "contexts/synchro",
-        "Synchronization mode to use when running contexts in parallel (either futex, posix or busy_wait)",
-        xbt_cfgelm_string, &default_value, 1, 1,
-        _surf_cfg_cb_contexts_parallel_mode, NULL);
-
-    /* number of parallel threads for Surf */
-    default_value_int = surf_get_nthreads();
-    xbt_cfg_register(&_surf_cfg_set, "surf/nthreads",
-                     "Number of parallel threads used to update Surf models",
-                     xbt_cfgelm_int, &default_value_int, 1, 1,
-                     _surf_cfg_cb_surf_nthreads, NULL);
-
-    default_value = xbt_strdup("no");
-    xbt_cfg_register(&_surf_cfg_set, "network/coordinates",
-                     "\"yes\" or \"no\", specifying whether we use a coordinate-based routing (as Vivaldi)",
-                     xbt_cfgelm_string, &default_value, 1, 1,
-                     _surf_cfg_cb__surf_network_coordinates, NULL);
-    xbt_cfg_setdefault_string(_surf_cfg_set, "network/coordinates", default_value);
-
-    default_value_int = 0;
-    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_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",
-                     "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);
-
-    default_value_int = 10;
-    xbt_cfg_register(&_surf_cfg_set, "gtnets/jitter_seed",
-                     "Use a positive seed to reproduce jitted results, value must be in [1,1e8], default is 10",
-                     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
-
-//SMPI
-    double default_reference_speed = 20000.0;
-    xbt_cfg_register(&_surf_cfg_set, "smpi/running_power",
-                     "Power of the host running the simulation (in flop/s). Used to bench the operations.",
-                     xbt_cfgelm_double, &default_reference_speed, 1, 1, NULL,
-                     NULL);
-
-    int default_display_timing = 0;
-    xbt_cfg_register(&_surf_cfg_set, "smpi/display_timing",
-                     "Boolean indicating whether we should display the timing after simulation.",
-                     xbt_cfgelm_int, &default_display_timing, 1, 1, NULL,
-                     NULL);
-
-    double default_threshold = 1e-6;
-    xbt_cfg_register(&_surf_cfg_set, "smpi/cpu_threshold",
-                     "Minimal computation time (in seconds) not discarded.",
-                     xbt_cfgelm_double, &default_threshold, 1, 1, NULL,
-                     NULL);
-
-    int default_small_messages_threshold = 0;
-    xbt_cfg_register(&_surf_cfg_set, "smpi/async_small_thres",
-                     "Maximal size of messages that are to be sent asynchronously, without waiting for the receiver",
-                     xbt_cfgelm_int, &default_small_messages_threshold, 1, 1, NULL,
-                     NULL);
-
-    //For smpi/bw_factor and smpi/lat_factor
-    //Default value have to be "threshold0:value0;threshold1:value1;...;thresholdN:valueN"
-    //test is if( size >= thresholdN ) return valueN;
-    //Values can be modified with command line --cfg=smpi/bw_factor:"threshold0:value0;threshold1:value1;...;thresholdN:valueN"
-    //  or with tag config put line <prop id="smpi/bw_factor" value="threshold0:value0;threshold1:value1;...;thresholdN:valueN"></prop>
-    xbt_cfg_register(&_surf_cfg_set, "smpi/bw_factor",
-                     "Bandwidth factors for smpi.",
-                     xbt_cfgelm_string, NULL, 1, 1, NULL,
-                     NULL);
-    xbt_cfg_setdefault_string(_surf_cfg_set, "smpi/bw_factor", "65472:0.940694;15424:0.697866;9376:0.58729;5776:1.08739;3484:0.77493;1426:0.608902;732:0.341987;257:0.338112;0:0.812084");
-
-    xbt_cfg_register(&_surf_cfg_set, "smpi/lat_factor",
-                     "Latency factors for smpi.",
-                     xbt_cfgelm_string, NULL, 1, 1, NULL,
-                     NULL);
-    xbt_cfg_setdefault_string(_surf_cfg_set, "smpi/lat_factor", "65472:11.6436;15424:3.48845;9376:2.59299;5776:2.18796;3484:1.88101;1426:1.61075;732:1.9503;257:1.95341;0:2.01467");
-//END SMPI
-
-
-    if (!surf_path) {
-      /* retrieves the current directory of the        current process */
-      const char *initial_path = __surf_get_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);
-      xbt_cfg_setdefault_string(_surf_cfg_set, "path", initial_path);
-    }
-
-    _surf_init_status = 1;
-
-    surf_config_cmd_line(argc, argv);
-
-    xbt_mallocator_initialization_is_done(SIMIX_context_is_parallel());
-
-  } else {
-    XBT_WARN("Call to surf_config_init() after initialization ignored");
-  }
-}
-
-void surf_config_finalize(void)
-{
-  if (!_surf_init_status)
-    return;                     /* Not initialized yet. Nothing to do */
-
-  xbt_cfg_free(&_surf_cfg_set);
-  _surf_init_status = 0;
-}
-
-/* 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;
-  char *network_model_name = NULL;
-  char *cpu_model_name = NULL;
-  int storage_id = -1;
-  char *storage_model_name = NULL;
-
-  workstation_model_name =
-      xbt_cfg_get_string(_surf_cfg_set, "workstation/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");
-  storage_model_name = xbt_cfg_get_string(_surf_cfg_set, "storage/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((!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);
-  workstation_id =
-      find_model_description(surf_workstation_model_description,
-                             workstation_model_name);
-  if (!strcmp(workstation_model_name, "compound")) {
-    int network_id = -1;
-    int cpu_id = -1;
-
-    xbt_assert(cpu_model_name,
-                "Set a cpu model to use with the 'compound' workstation model");
-
-    xbt_assert(network_model_name,
-                "Set a network model to use with the 'compound' workstation model");
-
-    network_id =
-        find_model_description(surf_network_model_description,
-                               network_model_name);
-    cpu_id =
-        find_model_description(surf_cpu_model_description, cpu_model_name);
-
-    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();
-
-  XBT_DEBUG("Call storage_model_init");
-  storage_id = find_model_description(surf_storage_model_description, storage_model_name);
-  surf_storage_model_description[storage_id].model_init_preparse();
-
-  /* ********************************************************************* */
-  /* TUTORIAL: New model                                                   */
-  int new_model_id = -1;
-  char *new_model_name = NULL;
-  new_model_name = xbt_cfg_get_string(_surf_cfg_set, "new_model/model");
-  XBT_DEBUG("Call new model_init");
-  new_model_id = find_model_description(surf_new_model_description, new_model_name);
-  surf_new_model_description[new_model_id].model_init_preparse();
-  /* ********************************************************************* */
-}
diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 19b2b58817..530bf960b5 100644
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -102,9 +102,9 @@ FILE *surf_fopen(const char *name, const char *mode);
 extern tmgr_history_t history;
 extern xbt_dynar_t surf_path;
 
-void surf_config_init(int *argc, char **argv);
-void surf_config_finalize(void);
-void surf_config(const char *name, va_list pa);
+//void surf_config_init(int *argc, char **argv);
+//void surf_config_finalize(void);
+//void surf_config(const char *name, va_list pa);
 
 void net_action_recycle(surf_action_t action);
 double net_action_get_remains(surf_action_t action);
diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index eb7ac3348f..bd98946b08 100644
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -319,7 +319,7 @@ static void routing_parse_trace_connect(sg_platf_trace_connect_cbarg_t trace_con
   }
 }
 
-extern int _surf_init_status; /* yay, this is an horrible hack */
+extern int _sg_init_status; /* yay, this is an horrible hack */
 
 /**
  * \brief Make a new routing component to the platform
@@ -344,7 +344,7 @@ void routing_AS_begin(sg_platf_AS_cbarg_t AS)
              (as_router_lib, AS->id, ROUTING_ASR_LEVEL),
              "The AS \"%s\" already exists", AS->id);
 
-  _surf_init_status = 2; /* horrible hack: direct access to the global controlling the level of configuration to prevent any further config */
+  _sg_init_status = 2; /* horrible hack: direct access to the global controlling the level of configuration to prevent any further config */
 
   /* search the routing model */
   switch(AS->routing){
diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index 72e89ba87d..d6b89ce917 100644
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -12,6 +12,7 @@
 #include "xbt/dict.h"
 #include "surf/surfxml_parse.h"
 #include "surf/surf_private.h"
+#include "simgrid/sg_config.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_parse, surf,
                                 "Logging specific to the SURF parsing module");
@@ -694,13 +695,13 @@ void ETag_surfxml_AS(void){
   sg_platf_new_AS_end();
 }
 
-extern int _surf_init_status; /* FIXME: find a proper way to export this at some point */
+extern int _sg_init_status; /* FIXME: find a proper way to export this at some point */
 
 void STag_surfxml_config(void){
   AS_TAG = 0;
   xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)");
   XBT_DEBUG("START configuration name = %s",A_surfxml_config_id);
-  if (_surf_init_status == 2) {
+  if (_sg_init_status == 2) {
     surf_parse_error("All <config> tags must be given before any platform elements (such as <AS>, <host>, <cluster>, <link>, etc).");
   }
 }
@@ -711,8 +712,8 @@ void ETag_surfxml_config(void){
   char *cfg;
   xbt_dict_foreach(current_property_set, cursor, key, elem) {
     cfg = bprintf("%s:%s",key,elem);
-    if(xbt_cfg_is_default_value(_surf_cfg_set, key))
-      xbt_cfg_set_parse(_surf_cfg_set, cfg);
+    if(xbt_cfg_is_default_value(_sg_cfg_set, key))
+      xbt_cfg_set_parse(_sg_cfg_set, cfg);
     else
       XBT_INFO("The custom configuration '%s' is already defined by user!",key);
     free(cfg);
diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index 30d3365fe9..4be0041845 100644
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -10,6 +10,7 @@
 #include "surf_private.h"
 #include "storage_private.h"
 #include "surf/surf_resource.h"
+#include "simgrid/sg_config.h"
 
 typedef struct workstation_CLM03 {
   s_surf_resource_t generic_resource;   /* Must remain first to add this to a trace */
@@ -423,7 +424,7 @@ static void surf_workstation_model_init_internal(void)
 void surf_workstation_model_init_current_default(void)
 {
   surf_workstation_model_init_internal();
-  xbt_cfg_setdefault_int(_surf_cfg_set, "network/crosstraffic", 1);
+  xbt_cfg_setdefault_int(_sg_cfg_set, "network/crosstraffic", 1);
   surf_cpu_model_init_Cas01();
   surf_network_model_init_LegrandVelho();
 
diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c
index 653546adf7..89a67a6471 100644
--- a/src/xbt/xbt_main.c
+++ b/src/xbt/xbt_main.c
@@ -30,13 +30,6 @@ xbt_dynar_t xbt_cmdline = NULL; /* all we got in argv */
 
 int xbt_initialized = 0;
 
-int _surf_do_model_check = 0;
-int _surf_mc_checkpoint=0;
-char* _surf_mc_property_file=NULL;
-int _surf_mc_timeout=0;
-int _surf_mc_max_depth=1000;
-int _surf_mc_visited=0;
-
 /* Declare xbt_preinit and xbt_postexit as constructor/destructor of the library.
  * This is crude and rather compiler-specific, unfortunately.
  */
diff --git a/testsuite/surf/surf_usage.c b/testsuite/surf/surf_usage.c
index e95bd142d2..1224959352 100644
--- a/testsuite/surf/surf_usage.c
+++ b/testsuite/surf/surf_usage.c
@@ -11,6 +11,7 @@
 #endif
 
 #include <stdio.h>
+#include "simgrid/sg_config.h"
 #include "surf/surf.h"
 #include "surf/surf_resource.h"
 #include "surf/surfxml_parse.h" // for reset callback
@@ -52,8 +53,8 @@ void test(char *platform)
   e_surf_action_state_t stateActionB;
   e_surf_action_state_t stateActionC;
   double now = -1.0;
-  xbt_cfg_set_parse(_surf_cfg_set, "cpu/model:Cas01");
-  xbt_cfg_set_parse(_surf_cfg_set, "network/model:CM02");
+  xbt_cfg_set_parse(_sg_cfg_set, "cpu/model:Cas01");
+  xbt_cfg_set_parse(_sg_cfg_set, "network/model:CM02");
   parse_platform_file(platform);
 
   /*********************** CPU ***********************************/
diff --git a/testsuite/surf/surf_usage2.c b/testsuite/surf/surf_usage2.c
index a30f0e46d4..4c92bea7a8 100644
--- a/testsuite/surf/surf_usage2.c
+++ b/testsuite/surf/surf_usage2.c
@@ -10,6 +10,7 @@
 #endif
 
 #include <stdio.h>
+#include "simgrid/sg_config.h"
 #include "surf/surf.h"
 #include "surf/surf_resource.h"
 #include "surf/surfxml_parse.h" // for reset callback
@@ -46,8 +47,8 @@ void test(char *platform)
   double now = -1.0;
   int running;
 
-  xbt_cfg_set_parse(_surf_cfg_set, "network/model:CM02");
-  xbt_cfg_set_parse(_surf_cfg_set, "cpu/model:Cas01");
+  xbt_cfg_set_parse(_sg_cfg_set, "network/model:CM02");
+  xbt_cfg_set_parse(_sg_cfg_set, "cpu/model:Cas01");
   parse_platform_file(platform);
 
   /*********************** WORKSTATION ***********************************/