surf_network_model_t surf_network_model = NULL;
static lmm_system_t network_maxmin_system = NULL;
static void (*network_solve) (lmm_system_t) = NULL;
-
xbt_dict_t link_set = NULL;
xbt_dict_t network_card_set = NULL;
if (!card) {
card = xbt_new0(s_network_card_CM02_t, 1);
card->name = xbt_strdup(card_name);
- card->id = card_number++;
+ card->id = host_number++;
xbt_dict_set(network_card_set, card_name, card, network_card_free);
}
return card->id;
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)
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);
network_maxmin_system,
network_solve);
+#define VARIABLE(action) (*((lmm_variable_t*)(((char *) (action)) + xbt_swag_offset(s_action, variable) )))
+
xbt_swag_foreach(action, running_actions) {
if (action->latency > 0) {
if (min < 0)
surf_network_model = NULL;
loopback = NULL;
- for (i = 0; i < card_number; i++)
- for (j = 0; j < card_number; j++)
+ for (i = 0; i < host_number; i++)
+ for (j = 0; j < host_number; j++)
free(ROUTE(i, j));
free(routing_table);
routing_table = NULL;
free(routing_table_size);
routing_table_size = NULL;
- card_number = 0;
+ host_number = 0;
+ lmm_system_free(network_maxmin_system);
+ network_maxmin_system = NULL;
}
static void surf_network_model_init_internal(void)
network_solve = lmm_solve;
update_model_description(surf_network_model_description,
- surf_network_model_description_size,
- "CM02",
- (surf_model_t) surf_network_model);
+ "CM02",
+ (surf_model_t) surf_network_model);
}
void surf_network_model_init_Reno(const char *filename)
network_solve = lagrange_solve;
update_model_description(surf_network_model_description,
- surf_network_model_description_size,
- "Reno",
- (surf_model_t) surf_network_model);
+ "Reno",
+ (surf_model_t) surf_network_model);
+}
+
+
+void surf_network_model_init_Reno2(const char *filename)
+{
+ if (surf_network_model)
+ return;
+ surf_network_model_init_internal();
+ define_callbacks(filename);
+
+ xbt_dynar_push(model_list, &surf_network_model);
+ lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp,
+ func_reno2_fpi);
+ network_solve = lagrange_solve;
+
+ update_model_description(surf_network_model_description,
+ "Reno2",
+ (surf_model_t) surf_network_model);
}
void surf_network_model_init_Vegas(const char *filename)
network_solve = lagrange_solve;
update_model_description(surf_network_model_description,
- surf_network_model_description_size,
- "Vegas",
- (surf_model_t) surf_network_model);
+ "Vegas",
+ (surf_model_t) surf_network_model);
}
#ifdef HAVE_SDP
network_solve = sdp_solve;
update_model_description(surf_network_model_description,
- surf_network_model_description_size,
- "SDP",
- (surf_model_t) surf_network_model);
+ "SDP",
+ (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