/* KF: Insert entry in the dictionary */
gtnets_link = xbt_new0(s_network_link_GTNETS_t, 1);
/* KF: Insert entry in the dictionary */
gtnets_link = xbt_new0(s_network_link_GTNETS_t, 1);
gtnets_link->bw_current = bw;
gtnets_link->lat_current = lat;
gtnets_link->id = link_count;
gtnets_link->bw_current = bw;
gtnets_link->lat_current = lat;
gtnets_link->id = link_count;
/* KF: just use the dictionary to map link names to link indices */
card = xbt_new0(s_network_card_GTNETS_t, 1);
/* KF: just use the dictionary to map link names to link indices */
card = xbt_new0(s_network_card_GTNETS_t, 1);
- xbt_dict_set(surf_model_resource_set(surf_network_model), name, card, network_card_free);
+ xbt_dict_set(surf_model_resource_set(surf_network_model), name, card,
+ surf_resource_free);
action->generic_action.max_duration = NO_MAX_DURATION;
action->generic_action.start = surf_get_clock();
action->generic_action.finish = -1.0;
action->generic_action.max_duration = NO_MAX_DURATION;
action->generic_action.start = surf_get_clock();
action->generic_action.finish = -1.0;
/* KF: Add a flow to the GTNets Simulation, associated to this action */
if (gtnets_create_flow(card_src->id, card_dst->id, size, (void *) action)
< 0) {
/* KF: Add a flow to the GTNets Simulation, associated to this action */
if (gtnets_create_flow(card_src->id, card_dst->id, size, (void *) action)
< 0) {
- xbt_assert2(0, "Not route between host %s and host %s", card_src->name,
- card_dst->name);
+ xbt_assert2(0, "Not route between host %s and host %s", card_src->generic_resource.name,
+ card_dst->generic_resource.name);
- surf_model_init((surf_model_t)surf_network_model);
-
- 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.action_get_state = surf_action_get_state;
surf_network_model->common_public.action_use = action_use;
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_get_state = surf_action_get_state;
surf_network_model->common_public.action_use = action_use;
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_set_data = surf_action_set_data;
surf_network_model->common_public.name = "network";
surf_network_model->common_public.action_set_data = surf_action_set_data;
surf_network_model->common_public.name = "network";
- surf_network_model->common_private->resource_used = resource_used;
- surf_network_model->common_private->share_resources = share_resources;
- surf_network_model->common_private->update_actions_state =
+ surf_network_model->model_private->resource_used = resource_used;
+ surf_network_model->model_private->share_resources = share_resources;
+ surf_network_model->model_private->update_actions_state =
surf_network_model->common_public.suspend = action_suspend;
surf_network_model->common_public.resume = action_resume;
surf_network_model->common_public.is_suspended = action_is_suspended;
surf_network_model->common_public.suspend = action_suspend;
surf_network_model->common_public.resume = action_resume;
surf_network_model->common_public.is_suspended = action_is_suspended;
xbt_dynar_push(model_list, &surf_network_model);
update_model_description(surf_network_model_description,
xbt_dynar_push(model_list, &surf_network_model);
update_model_description(surf_network_model_description,