X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/073f8bce5afb1febdc3580607be8819b90705280..10f23d04cb0a60324df495c7b2e57704b57874b8:/src/simix/smx_config.c

diff --git a/src/simix/smx_config.c b/src/simix/smx_config.c
index 8ca058bb14..51837d126b 100644
--- a/src/simix/smx_config.c
+++ b/src/simix/smx_config.c
@@ -59,6 +59,15 @@ static void _simix_cfg_cb__network_model(const char *name, int pos)
 			    surf_network_model_description_size, val);
 }
 
+XBT_LOG_EXTERNAL_CATEGORY(simix);
+XBT_LOG_EXTERNAL_CATEGORY(simix_action);
+XBT_LOG_EXTERNAL_CATEGORY(simix_deployment);
+XBT_LOG_EXTERNAL_CATEGORY(simix_environment);
+XBT_LOG_EXTERNAL_CATEGORY(simix_host);
+XBT_LOG_EXTERNAL_CATEGORY(simix_kernel);
+XBT_LOG_EXTERNAL_CATEGORY(simix_process);
+XBT_LOG_EXTERNAL_CATEGORY(simix_synchro);
+
 /* create the config set and register what should be */
 void simix_config_init(void)
 {
@@ -66,6 +75,15 @@ void simix_config_init(void)
   if (_simix_init_status)
     return;			/* Already inited, nothing to do */
 
+  /* Connect our log channels: that must be done manually under windows */
+  XBT_LOG_CONNECT(simix_action, simix);
+  XBT_LOG_CONNECT(simix_deployment, simix);
+  XBT_LOG_CONNECT(simix_environment, simix);
+  XBT_LOG_CONNECT(simix_host, simix);
+  XBT_LOG_CONNECT(simix_kernel, simix);
+  XBT_LOG_CONNECT(simix_process, simix);
+  XBT_LOG_CONNECT(simix_synchro, simix);
+  
   _simix_init_status = 1;
   _simix_cfg_set = xbt_cfg_new();
 
@@ -80,7 +98,7 @@ void simix_config_init(void)
 		   "network_model", xbt_cfgelm_string, 1, 1,
 		   &_simix_cfg_cb__network_model, NULL);
 
-  xbt_cfg_set_string(_simix_cfg_set, "workstation_model", "KCCFLN05");
+  xbt_cfg_set_string(_simix_cfg_set, "workstation_model", "CLM03");
 }
 
 void simix_config_finalize(void)