git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9836
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
#endif
XBT_DEBUG("ADD SD LEVELS");
#endif
XBT_DEBUG("ADD SD LEVELS");
- SD_HOST_LEVEL = xbt_lib_add_level(host_lib,free);
- SD_LINK_LEVEL = xbt_lib_add_level(link_lib,free);
+ SD_HOST_LEVEL = xbt_lib_add_level(host_lib,__SD_workstation_destroy);
+ SD_LINK_LEVEL = xbt_lib_add_level(link_lib,__SD_link_destroy);
#ifdef HAVE_TRACING
TRACE_surf_release();
#endif
#ifdef HAVE_TRACING
TRACE_surf_release();
#endif
if (SD_INITIALISED()) {
XBT_DEBUG("Destroying workstation and link dictionaries...");
if (SD_INITIALISED()) {
XBT_DEBUG("Destroying workstation and link dictionaries...");
XBT_DEBUG("Exiting Surf...");
surf_exit();
XBT_DEBUG("Exiting Surf...");
surf_exit();
} else {
XBT_WARN("SD_exit() called, but SimDag is not running");
/* we cannot use exceptions here because xbt is not running! */
} else {
XBT_WARN("SD_exit() called, but SimDag is not running");
/* we cannot use exceptions here because xbt is not running! */
}
XBT_DEBUG("ADD SIMIX LEVELS");
}
XBT_DEBUG("ADD SIMIX LEVELS");
- SIMIX_HOST_LEVEL = xbt_lib_add_level(host_lib,free);
+ SIMIX_HOST_LEVEL = xbt_lib_add_level(host_lib,SIMIX_host_destroy);
as_router_lib = xbt_lib_new();
XBT_DEBUG("ADD ROUTING LEVEL");
as_router_lib = xbt_lib_new();
XBT_DEBUG("ADD ROUTING LEVEL");
- ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,free);
- ROUTING_ASR_LEVEL = xbt_lib_add_level(as_router_lib,free);
+ 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");
XBT_DEBUG("ADD SURF LEVELS");
- SURF_CPU_LEVEL = xbt_lib_add_level(host_lib,free);
- SURF_WKS_LEVEL = xbt_lib_add_level(host_lib,free);
- SURF_LINK_LEVEL = xbt_lib_add_level(link_lib,free);
+ 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);
XBT_DEBUG("ADD COORD LEVEL");
XBT_DEBUG("ADD COORD LEVEL");
- COORD_HOST_LEVEL = xbt_lib_add_level(host_lib,free);
- COORD_ASR_LEVEL = xbt_lib_add_level(as_router_lib,free);
+ COORD_HOST_LEVEL = xbt_lib_add_level(host_lib,xbt_dynar_free_voidp);
+ COORD_ASR_LEVEL = xbt_lib_add_level(as_router_lib,xbt_dynar_free_voidp);
/* Connect our log channels: that must be done manually under windows */
XBT_LOG_CONNECT(surf_cpu, surf);
/* Connect our log channels: that must be done manually under windows */
XBT_LOG_CONNECT(surf_cpu, surf);