Some new files of the cxx version of the MSG API

[simgrid.git] / src / simix / smx_config.c

diff --git a/src/simix/smx_config.c b/src/simix/smx_config.c
index 0d46693..51837d1 100644 (file)
--- 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,10 +55,19 @@ 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);
 }
 
+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)