return min;
}
-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_trace);
-XBT_LOG_EXTERNAL_CATEGORY(surf_parse);
-XBT_LOG_EXTERNAL_CATEGORY(surf_timer);
-XBT_LOG_EXTERNAL_CATEGORY(surf_workstation);
-XBT_LOG_EXTERNAL_CATEGORY(surf_config);
-XBT_LOG_EXTERNAL_CATEGORY(surf_route);
-
-#ifdef HAVE_GTNETS
-XBT_LOG_EXTERNAL_CATEGORY(surf_network_gtnets);
-#endif
+static XBT_INLINE void routing_asr_host_free(void *p)
+{
+ network_element_t elm = p;
+ free(elm->name);
+ xbt_free(elm);
+}
void surf_init(int *argc, char **argv)
{
link_lib = xbt_lib_new();
as_router_lib = xbt_lib_new();
storage_lib = xbt_lib_new();
+ storage_type_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);
- // FOR NOW UNUSED
-// ROUTING_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,NULL);
+ ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,routing_asr_host_free);
+ ROUTING_ASR_LEVEL = xbt_lib_add_level(as_router_lib,routing_asr_host_free);
+ ROUTING_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,xbt_free);
+ ROUTING_STORAGE_HOST_LEVEL = xbt_lib_add_level(storage_lib,routing_storage_host_free);
+ ROUTING_STORAGE_TYPE_LEVEL = xbt_lib_add_level(storage_type_lib,routing_storage_type_free);
XBT_DEBUG("ADD SURF LEVELS");
SURF_CPU_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free);
SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_resource_free);
/* Connect our log channels: that must be done manually under windows */
+ XBT_LOG_CONNECT(surf_config, surf);
XBT_LOG_CONNECT(surf_cpu, surf);
XBT_LOG_CONNECT(surf_kernel, surf);
+
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, surf);
- XBT_LOG_CONNECT(surf_trace, surf);
- XBT_LOG_CONNECT(surf_parse, surf);
- XBT_LOG_CONNECT(surf_timer, surf);
- XBT_LOG_CONNECT(surf_workstation, surf);
- XBT_LOG_CONNECT(surf_config, surf);
- XBT_LOG_CONNECT(surf_route, surf);
-
#ifdef HAVE_GTNETS
XBT_LOG_CONNECT(surf_network_gtnets, surf);
#endif
+ XBT_LOG_CONNECT(surf_parse, surf);
+ XBT_LOG_CONNECT(surf_route, surf);
+ XBT_LOG_CONNECT(surf_trace, surf);
+ XBT_LOG_CONNECT(surf_workstation, surf);
xbt_init(argc, argv);
if (!model_list)
xbt_lib_free(&link_lib);
xbt_lib_free(&as_router_lib);
xbt_lib_free(&storage_lib);
+ xbt_lib_free(&storage_type_lib);
tmgr_finalize();
surf_parse_lex_destroy();
static void surf_share_resources(surf_model_t model)
{
+ double next_action_end = -1.0;
+ int i = __sync_fetch_and_add(&surf_min_index, 1);
if (strcmp(model->name,"network NS3")) {
XBT_DEBUG("Running for Resource [%s]", model->name);
- double next_action_end = model->model_private->share_resources(NOW);
+ next_action_end = model->model_private->share_resources(NOW);
XBT_DEBUG("Resource [%s] : next action end = %f",
model->name, next_action_end);
- int i = __sync_fetch_and_add(&surf_min_index, 1);
- surf_mins[i] = next_action_end;
}
+ surf_mins[i] = next_action_end;
}
static void surf_update_actions_state(surf_model_t model)