Starting to code a "constant" network model.

[simgrid.git] / src / surf / surf.c

diff --git a/src/surf/surf.c b/src/surf/surf.c
index b46ade3..166c134 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -126,6 +126,7 @@ const char *surf_action_state_names[6] = {
 };
 
 s_surf_model_description_t surf_network_model_description[surf_network_model_description_size] = {
+  {"Constant", NULL, surf_network_model_init_Constant},
   {"CM02", NULL, surf_network_model_init_CM02},
 #ifdef HAVE_GTNETS
   {"GTNets", NULL, surf_network_model_init_GTNETS},
@@ -143,7 +144,7 @@ s_surf_model_description_t surf_cpu_model_description[surf_cpu_model_description
 
 s_surf_model_description_t surf_workstation_model_description[surf_workstation_model_description_size] = {
   {"CLM03", NULL, surf_workstation_model_init_CLM03, create_workstations},
-  {"compound", NULL, surf_workstation_model_init_compound, NULL},
+  {"compound", NULL, surf_workstation_model_init_compound, create_workstations},
   {"ptask_L07", NULL, surf_workstation_model_init_ptask_L07, NULL}
 };
 
@@ -300,6 +301,24 @@ void surf_action_set_data(surf_action_t action, void *data)
   action->data = data;
 }
 
+XBT_LOG_EXTERNAL_CATEGORY(surf_cpu);
+XBT_LOG_EXTERNAL_CATEGORY(surf_kernel);
+XBT_LOG_EXTERNAL_CATEGORY(surf_lagrange);
+XBT_LOG_EXTERNAL_CATEGORY(surf_lagrange_dichotomy);
+XBT_LOG_EXTERNAL_CATEGORY(surf_maxmin);
+XBT_LOG_EXTERNAL_CATEGORY(surf_network);
+XBT_LOG_EXTERNAL_CATEGORY(surf_parse);
+XBT_LOG_EXTERNAL_CATEGORY(surf_timer);
+XBT_LOG_EXTERNAL_CATEGORY(surf_workstation);
+
+#ifdef HAVE_SDP
+  XBT_LOG_EXTERNAL_CATEGORY(surf_sdp_out);
+  XBT_LOG_EXTERNAL_CATEGORY(surf_sdp);
+#endif
+#ifdef HAVE_GTNETS
+  XBT_LOG_EXTERNAL_CATEGORY(surf_network_gtnets);
+#endif
+
 void surf_init(int *argc, char **argv)
 {
   int i, j;
@@ -310,16 +329,21 @@ void surf_init(int *argc, char **argv)
   /* Connect our log channels: that must be done manually under windows */
   XBT_LOG_CONNECT(surf_cpu, surf);
   XBT_LOG_CONNECT(surf_kernel, surf);
-  XBT_LOG_CONNECT(surf_lagrange_dichotomy, surf_lagrange);
   XBT_LOG_CONNECT(surf_lagrange, surf);
+    XBT_LOG_CONNECT(surf_lagrange_dichotomy, surf_lagrange);
   XBT_LOG_CONNECT(surf_maxmin, surf);
-  XBT_LOG_CONNECT(surf_network_gtnets, surf);
   XBT_LOG_CONNECT(surf_network, surf);
   XBT_LOG_CONNECT(surf_parse, surf);
-  XBT_LOG_CONNECT(surf_sdp_out, surf);
-  XBT_LOG_CONNECT(surf_sdp, surf);
   XBT_LOG_CONNECT(surf_timer, surf);
   XBT_LOG_CONNECT(surf_workstation, surf);
+
+#ifdef HAVE_SDP
+  XBT_LOG_CONNECT(surf_sdp_out, surf);
+  XBT_LOG_CONNECT(surf_sdp, surf);
+#endif
+#ifdef HAVE_GTNETS
+  XBT_LOG_CONNECT(surf_network_gtnets, surf);
+#endif
    
   xbt_init(argc, argv);
   if (!surf_path) {