double value = -1;
#define VARIABLE(action) (*((lmm_variable_t*)(((char *) (action)) + (offset))))
- xbt_assert0(solve, "Give me a real solver function!");
+ xbt_assert(solve, "Give me a real solver function!");
solve(sys);
xbt_swag_foreach(action, running_actions) {
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");
- 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);
-
- 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);
+ 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);
surf_parse_lex_destroy();
surf_parse_free_callbacks();
NOW = 0; /* Just in case the user plans to restart the simulation afterward */
- // Exit the LIB host_lib
- xbt_lib_free(&host_lib);
- xbt_lib_free(&link_lib);
- xbt_lib_free(&as_router_lib);
}
void surf_presolve(void)