X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ee7e9c2e455536ab817ae0136acfbb53822eecd..702ac78afa738128143f0b2a03bad8484001407c:/src/surf/surf.c diff --git a/src/surf/surf.c b/src/surf/surf.c index 0ef93c9b8e..4b431467ee 100644 --- a/src/surf/surf.c +++ b/src/surf/surf.c @@ -203,8 +203,7 @@ int find_model_description(s_surf_model_description_t * table, strcat(name_list, ", "); strcat(name_list, table[i].name); } - xbt_assert2(0, "Model '%s' is invalid! Valid models are: %s.", name, - name_list); + xbt_die("Model '%s' is invalid! Valid models are: %s.", name, name_list); return -1; } @@ -285,6 +284,20 @@ XBT_LOG_EXTERNAL_CATEGORY(surf_network_gtnets); void surf_init(int *argc, char **argv) { + XBT_DEBUG("Create all Libs"); + host_lib = xbt_lib_new(); + link_lib = xbt_lib_new(); + as_router_lib = xbt_lib_new(); + + XBT_DEBUG("ADD ROUTING LEVEL"); + ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,xbt_free); + ROUTING_ASR_LEVEL = xbt_lib_add_level(as_router_lib,xbt_free); + + XBT_DEBUG("ADD SURF LEVELS"); + SURF_CPU_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free); + SURF_WKS_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free); + SURF_LINK_LEVEL = xbt_lib_add_level(link_lib,surf_resource_free); + /* Connect our log channels: that must be done manually under windows */ XBT_LOG_CONNECT(surf_cpu, surf); XBT_LOG_CONNECT(surf_kernel, surf);