XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf,
"Logging specific to the SURF network module");
-surf_network_model_t surf_network_model = NULL;
+surf_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;
double latency_factor = 1.0; /* default value */
double bandwidth_factor = 1.0; /* default value */
xbt_assert1(!xbt_dict_get_or_null(link_set, name),
"Link '%s' declared several times in the platform file.", name);
- nw_link->model = (surf_model_t) surf_network_model;
+ nw_link->model = surf_network_model;
nw_link->name = name;
nw_link->bw_current = bw_initial;
if (bw_trace)
static int network_card_new(const char *card_name)
{
network_card_CM02_t card =
- xbt_dict_get_or_null(network_card_set, card_name);
+ surf_model_resource_by_name(surf_network_model, card_name);
if (!card) {
card = xbt_new0(s_network_card_CM02_t, 1);
card->name = xbt_strdup(card_name);
card->id = host_number++;
- xbt_dict_set(network_card_set, card_name, card, network_card_free);
+ xbt_dict_set(surf_model_resource_set(surf_network_model), card_name, card,
+ network_card_free);
}
return card->id;
}
surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_loopback);
}
-static void *name_service(const char *name)
-{
- network_card_CM02_t card = xbt_dict_get_or_null(network_card_set, name);
- return card;
-}
-
static const char *get_resource_name(void *resource_id)
{
return ((network_card_CM02_t) resource_id)->name;
else
lmm_update_variable_bound(network_maxmin_system, action->variable,
min(action->rate,
- sg_tcp_gamma / (2.0 * action->lat_current)));
+ sg_tcp_gamma / (2.0 *
+ action->lat_current)));
if (!(action->suspended))
lmm_update_variable_weight(network_maxmin_system, action->variable,
action->weight);
action->generic_action.max_duration = NO_MAX_DURATION;
action->generic_action.start = surf_get_clock();
action->generic_action.finish = -1.0;
- action->generic_action.model_type = (surf_model_t) surf_network_model;
+ action->generic_action.model_type = surf_network_model;
action->suspended = 0; /* Should be useless because of the
calloc but it seems to help valgrind... */
action->generic_action.state_set =
if (action->lat_current > 0)
lmm_update_variable_bound(network_maxmin_system, action->variable,
min(action->rate,
- sg_tcp_gamma / (2.0 * action->lat_current)));
+ sg_tcp_gamma / (2.0 *
+ action->lat_current)));
else
lmm_update_variable_bound(network_maxmin_system, action->variable,
action->rate);
{
int i, j;
- xbt_dict_free(&network_card_set);
xbt_dict_free(&link_set);
- surf_model_exit((surf_model_t)surf_network_model);
+ surf_model_exit(surf_network_model);
- free(surf_network_model->extension_public);
free(surf_network_model);
surf_network_model = NULL;
static void surf_network_model_init_internal(void)
{
- surf_network_model = xbt_new0(s_surf_network_model_t, 1);
-
- surf_model_init((surf_model_t)surf_network_model);
+ surf_network_model = xbt_new0(s_surf_model_t, 1);
- surf_network_model->extension_public =
- xbt_new0(s_surf_network_model_extension_public_t, 1);
+ surf_model_init(surf_network_model);
- surf_network_model->common_public.name_service = name_service;
surf_network_model->common_public.get_resource_name = get_resource_name;
surf_network_model->common_public.action_get_state = surf_action_get_state;
surf_network_model->common_public.action_get_start_time =
surf_network_model->common_public.action_use = action_use;
surf_network_model->common_public.action_cancel = action_cancel;
surf_network_model->common_public.action_recycle = action_recycle;
- surf_network_model->common_public.action_change_state =
- action_change_state;
+ surf_network_model->common_public.action_change_state = action_change_state;
surf_network_model->common_public.action_set_data = surf_action_set_data;
surf_network_model->common_public.name = "network";
surf_network_model->common_public.is_suspended = action_is_suspended;
surf_cpu_model->common_public.set_max_duration = action_set_max_duration;
- surf_network_model->extension_public->communicate = communicate;
- surf_network_model->extension_public->get_route = get_route;
- surf_network_model->extension_public->get_route_size = get_route_size;
- surf_network_model->extension_public->get_link_name = get_link_name;
- surf_network_model->extension_public->get_link_bandwidth =
+ surf_network_model->extension.network.communicate = communicate;
+ surf_network_model->extension.network.get_route = get_route;
+ surf_network_model->extension.network.get_route_size = get_route_size;
+ surf_network_model->extension.network.get_link_name = get_link_name;
+ surf_network_model->extension.network.get_link_bandwidth =
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->extension.network.get_link_latency = get_link_latency;
+ surf_network_model->extension.network.link_shared = link_shared;
surf_network_model->common_public.get_properties = get_properties;
link_set = xbt_dict_new();
- network_card_set = xbt_dict_new();
if (!network_maxmin_system)
network_maxmin_system = lmm_system_new();
weight_S_parameter = 8775;
update_model_description(surf_network_model_description,
- "LegrandVelho", (surf_model_t) surf_network_model);
+ "LegrandVelho", surf_network_model);
}
/***************************************************************************/
network_solve = lmm_solve;
update_model_description(surf_network_model_description,
- "CM02", (surf_model_t) surf_network_model);
+ "CM02", surf_network_model);
}
void surf_network_model_init_Reno(const char *filename)
weight_S_parameter = 8775;
update_model_description(surf_network_model_description,
- "Reno", (surf_model_t) surf_network_model);
+ "Reno", surf_network_model);
}
weight_S_parameter = 8775;
update_model_description(surf_network_model_description,
- "Reno2", (surf_model_t) surf_network_model);
+ "Reno2", surf_network_model);
}
void surf_network_model_init_Vegas(const char *filename)
weight_S_parameter = 8775;
update_model_description(surf_network_model_description,
- "Vegas", (surf_model_t) surf_network_model);
+ "Vegas", surf_network_model);
}
#ifdef HAVE_SDP
network_solve = sdp_solve;
update_model_description(surf_network_model_description,
- "SDP", (surf_model_t) surf_network_model);
+ "SDP", surf_network_model);
}
#endif