};
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},
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}
};
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;
/* 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) {