static void link_free(void *nw_link)
{
free(((link_CM02_t) nw_link)->name);
+ xbt_dict_free(&(((link_CM02_t)nw_link)->properties));
free(nw_link);
}
src_id = network_card_new(A_surfxml_route_src);
dst_id = network_card_new(A_surfxml_route_dst);
route_action = A_surfxml_route_action;
- route_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
}
static void parse_route_set_route(void)
}
route_new(src_id, dst_id, link_list, nb_link);
}
-
- xbt_dict_free(&route_table);
-
}
static void count_hosts(void)
link->lat_event = tmgr_history_add_trace(history, trace, 0.0, 0, link);
}
-
- xbt_dict_free(&trace_connect_list_host_avail);
- xbt_dict_free(&trace_connect_list_power);
- xbt_dict_free(&trace_connect_list_link_avail);
- xbt_dict_free(&trace_connect_list_bandwidth);
- xbt_dict_free(&trace_connect_list_latency);
-
- xbt_dict_free(&traces_set_list);
}
static void define_callbacks(const char *file)
/* Figuring out the network links */
surfxml_add_callback(STag_surfxml_host_cb_list, &count_hosts);
surfxml_add_callback(STag_surfxml_link_cb_list, &parse_link_init);
- surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
surfxml_add_callback(STag_surfxml_route_cb_list, &parse_route_set_endpoints);
- surfxml_add_callback(ETag_surfxml_link_c_ctn_cb_list, &parse_route_elem);
surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route);
- surfxml_add_callback(STag_surfxml_platform_cb_list, &init_data);
surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces);
surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_route);
surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_loopback);
- surfxml_add_callback(STag_surfxml_set_cb_list, &parse_sets);
- surfxml_add_callback(STag_surfxml_route_c_multi_cb_list, &parse_route_multi_set_endpoints);
- surfxml_add_callback(ETag_surfxml_route_c_multi_cb_list, &parse_route_multi_set_route);
- surfxml_add_callback(STag_surfxml_foreach_cb_list, &parse_foreach);
- surfxml_add_callback(STag_surfxml_cluster_cb_list, &parse_cluster);
- surfxml_add_callback(STag_surfxml_trace_cb_list, &parse_trace_init);
- surfxml_add_callback(ETag_surfxml_trace_cb_list, &parse_trace_finalize);
- surfxml_add_callback(STag_surfxml_trace_c_connect_cb_list, &parse_trace_c_connect);
}
static void *name_service(const char *name)
return ((link_CM02_t) link)->lat_current;
}
+static int link_shared(const void *link)
+{
+ return lmm_constraint_is_shared(((link_CM02_t) link)->constraint);
+}
+
static xbt_dict_t get_properties(void *link)
{
return ((link_CM02_t) link)->properties;
free(routing_table_size);
routing_table_size = NULL;
host_number = 0;
+ lmm_system_free(network_maxmin_system);
+ network_maxmin_system = NULL;
}
static void surf_network_model_init_internal(void)
get_link_bandwidth;
surf_network_model->extension_public->get_link_latency =
get_link_latency;
+ surf_network_model->extension_public->link_shared =
+ link_shared;
surf_network_model->common_public->get_properties = get_properties;
}
#ifdef HAVE_SDP
-void surf_network_model_init_SDP(const char *filename)
+ void surf_network_model_init_SDP(const char *filename)
{
if (surf_network_model)
return;
(surf_model_t) surf_network_model);
}
#endif
-
-#ifdef HAVE_GTNETS
-void surf_network_model_init_GTNETS(const char *filename)
-{
- if (surf_network_model)
- return;
- surf_network_model_init_internal();
- define_callbacks(filename);
- xbt_dynar_push(model_list, &surf_network_model);
-
- update_model_description(surf_network_model_description,
- "GTNets",
- (surf_model_t) surf_network_model);
-}
-#endif