X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9189fe94c14ef9e31142d1603a1979ea7e731a0a..4b8075e2de516f0340edb430731f336ce2540a3d:/src/msg/msg_config.c

diff --git a/src/msg/msg_config.c b/src/msg/msg_config.c
index 0e895027fb..8cfed135da 100644
--- a/src/msg/msg_config.c
+++ b/src/msg/msg_config.c
@@ -10,11 +10,7 @@
 
 #include "private.h"
 #include "xbt/sysdep.h"
-#include "xbt/error.h"
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_cfg, msg,
-				"Configuration support in \ref MSG_API");
-
+#include "xbt/log.h"
 
 int _msg_init_status = 0; /* 0: beginning of time; 
                              1: pre-inited (cfg_set created); 
@@ -47,20 +43,28 @@ void msg_config_init(void) {
                     "surf_workstation_model", xbt_cfgelm_string, 1,1,
                     &_msg_cfg_cb__surf_workstation_model,NULL);
                     
-  xbt_cfg_set_string(_msg_cfg_set,"surf_workstation_model", "CLM03");
+  xbt_cfg_set_string(_msg_cfg_set,"surf_workstation_model", "KCCFLN05");
+}
+
+void msg_config_finalize(void) {
+
+  if (!_msg_init_status) 
+    return; /* Not initialized yet. Nothing to do */
+
+  xbt_cfg_free(&_msg_cfg_set);
+  _msg_init_status = 0;
 }
 
 /** \brief set a configuration variable
  * 
  * Currently existing configuation variable:
  *   - surf_workstation_model (string): Model of workstation to use.  
- *     Possible values (defaults to "CLM03"):
+ *     Possible values (defaults to "KCCFLN05"):
  *     - "CLM03": realistic TCP behavior + basic CPU model (see [CML03 at CCGrid03])
- *     - "KCCFLN05": simple network model (no latency) but interference 
- *       between computations and communications (UNSTABLE, DONT USE)
+ *     - "KCCFLN05": realistic TCP behavior + basic CPU model (see [CML03 at CCGrid03]) + failure handling + interference between communications and computations if precised in the platform file.
  * 
  * Example:
- * MSG_config("surf_workstation_model","CLM03");
+ * MSG_config("surf_workstation_model","KCCFLN05");
  */
 void
 MSG_config(const char *name, ...) {