X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b69e984a013e4e9e2d98fc4013cd1721bf2f0245..bff077b4621c68455a86e60292cb0bf872a879d5:/src/simix/smx_config.c?ds=sidebyside

diff --git a/src/simix/smx_config.c b/src/simix/smx_config.c
index 0d4669318e..77d690fb10 100644
--- a/src/simix/smx_config.c
+++ b/src/simix/smx_config.c
@@ -26,8 +26,8 @@ static void _simix_cfg_cb__workstation_model(const char *name, int pos)
   val = xbt_cfg_get_string(_simix_cfg_set, name);
   /* New Module missing */
 
-  find_resource_description(surf_workstation_resource_description,
-			    surf_workstation_resource_description_size,
+  find_model_description(surf_workstation_model_description,
+			    surf_workstation_model_description_size,
 			    val);
 }
 
@@ -41,8 +41,8 @@ static void _simix_cfg_cb__cpu_model(const char *name, int pos)
 
   val = xbt_cfg_get_string(_simix_cfg_set, name);
   /* New Module missing */
-  find_resource_description(surf_cpu_resource_description,
-			    surf_cpu_resource_description_size, val);
+  find_model_description(surf_cpu_model_description,
+			    surf_cpu_model_description_size, val);
 }
 
 /* callback of the workstation_model variable */
@@ -55,8 +55,8 @@ static void _simix_cfg_cb__network_model(const char *name, int pos)
 
   val = xbt_cfg_get_string(_simix_cfg_set, name);
   /* New Module missing */
-  find_resource_description(surf_network_resource_description,
-			    surf_network_resource_description_size, val);
+  find_model_description(surf_network_model_description,
+			    surf_network_model_description_size, val);
 }
 
 /* create the config set and register what should be */
@@ -66,6 +66,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 +89,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)