link_count++;
/*
- 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)
XBT_IN1("(%s)", name);
/* KF: Check that we haven't seen the network card before */
- network_card_GTNETS_t card = xbt_dict_get_or_null(network_card_set, name);
+ network_card_GTNETS_t card =
+ surf_model_resource_by_name(surf_network_model, name);
if (!card) {
/* KF: Increment the card counter for GTNetS */
card = xbt_new0(s_network_card_GTNETS_t, 1);
card->name = xbt_strdup(name);
card->id = card_count;
- xbt_dict_set(network_card_set, name, card, network_card_free);
+ xbt_dict_set(surf_model_resource_set(surf_network_model), name, card,
+ network_card_free);
}
LOG1(xbt_log_priority_trace, " return %d", card->id);
surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_route);
}
-static void *name_service(const char *name)
-{
- return xbt_dict_get_or_null(network_card_set, name);
-}
-
static const char *get_resource_name(void *resource_id)
{
return ((network_card_GTNETS_t) resource_id)->name;
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->generic_action.state_set =
surf_network_model->common_public.states.running_action_set;
static void finalize(void)
{
- 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);
surf_network_model = xbt_new0(s_surf_network_model_t, 1);
- surf_model_init((surf_model_t)surf_network_model);
+ surf_model_init(surf_network_model);
surf_network_model->extension_public =
xbt_new0(s_surf_network_model_extension_public_t, 1);
surf_network_model->common_public.action_free = action_free;
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.get_properties = get_properties;
link_set = xbt_dict_new();
- network_card_set = xbt_dict_new();
/* KF: Added the initialization for GTNetS interface */
if (gtnets_initialize()) {
xbt_dynar_push(model_list, &surf_network_model);
update_model_description(surf_network_model_description,
- "GTNets", (surf_model_t) surf_network_model);
+ "GTNets", surf_network_model);
}
#endif