-static void finalize(void)
-{
- int i,j;
-
- xbt_dict_free(&network_card_set);
- xbt_dict_free(&network_link_set);
- xbt_swag_free(surf_network_resource->common_public->states.
- ready_action_set);
- xbt_swag_free(surf_network_resource->common_public->states.
- running_action_set);
- xbt_swag_free(surf_network_resource->common_public->states.
- failed_action_set);
- xbt_swag_free(surf_network_resource->common_public->states.
- done_action_set);
- free(surf_network_resource->common_public);
- free(surf_network_resource->common_private);
- free(surf_network_resource->extension_public);
-
- free(surf_network_resource);
- surf_network_resource = NULL;
-
- loopback = NULL;
- for (i = 0; i < card_number; i++)
- for (j = 0; j < card_number; j++)
- free(ROUTE(i,j));
- free(routing_table);
- routing_table = NULL;
- free(routing_table_size);
- routing_table_size = NULL;
- card_number = 0;
-}
-
-static void surf_network_resource_init_internal(void)
-{
- s_surf_action_t action;
-
- surf_network_resource = xbt_new0(s_surf_network_resource_t, 1);
-
- surf_network_resource->common_private =
- xbt_new0(s_surf_resource_private_t, 1);
- surf_network_resource->common_public =
- xbt_new0(s_surf_resource_public_t, 1);
- surf_network_resource->extension_public =
- xbt_new0(s_surf_network_resource_extension_public_t, 1);
-
- surf_network_resource->common_public->states.ready_action_set =
- xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_network_resource->common_public->states.running_action_set =
- xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_network_resource->common_public->states.failed_action_set =
- xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_network_resource->common_public->states.done_action_set =
- xbt_swag_new(xbt_swag_offset(action, state_hookup));
-
- surf_network_resource->common_public->name_service = name_service;
- surf_network_resource->common_public->get_resource_name =
- get_resource_name;
- surf_network_resource->common_public->action_get_state =
- surf_action_get_state;
- surf_network_resource->common_public->action_get_start_time =
- surf_action_get_start_time;
- surf_network_resource->common_public->action_get_finish_time =
- surf_action_get_finish_time;
- surf_network_resource->common_public->action_free = action_free;
- surf_network_resource->common_public->action_use = action_use;
- surf_network_resource->common_public->action_cancel = action_cancel;
- surf_network_resource->common_public->action_recycle = action_recycle;
- surf_network_resource->common_public->action_change_state =
- action_change_state;
- surf_network_resource->common_public->action_set_data = surf_action_set_data;
- surf_network_resource->common_public->name = "network";
-
- surf_network_resource->common_private->resource_used = resource_used;
- surf_network_resource->common_private->share_resources = share_resources;
- surf_network_resource->common_private->update_actions_state =
- update_actions_state;
- surf_network_resource->common_private->update_resource_state =
- update_resource_state;
- surf_network_resource->common_private->finalize = finalize;
-
- surf_network_resource->common_public->suspend = action_suspend;
- surf_network_resource->common_public->resume = action_resume;
- surf_network_resource->common_public->is_suspended = action_is_suspended;
- surf_cpu_resource->common_public->set_max_duration = action_set_max_duration;
-
- surf_network_resource->extension_public->communicate = communicate;
- surf_network_resource->extension_public->get_route = get_route;
- surf_network_resource->extension_public->get_route_size = get_route_size;
- surf_network_resource->extension_public->get_link_name = get_link_name;
- surf_network_resource->extension_public->get_link_bandwidth = get_link_bandwidth;
- surf_network_resource->extension_public->get_link_latency = get_link_latency;
-
- network_link_set = xbt_dict_new();
- network_card_set = xbt_dict_new();
-
- if(!network_maxmin_system)
+
+/**
+ * FIXME : this should be done in the binding code !!
+ */
+void network_create_resource(char *name,
+ double initial_bandwidth,double initial_latency)
+{
+
+ char* name_link;
+ double bw_initial;
+ tmgr_trace_t bw_trace;
+ double lat_initial;
+ tmgr_trace_t lat_trace;
+ e_surf_resource_state_t state_initial_link = SURF_RESOURCE_ON;
+ e_surf_link_sharing_policy_t policy_initial_link = SURF_LINK_SHARED;
+ tmgr_trace_t state_trace;
+
+ name_link = xbt_strdup(name);
+ bw_initial = initial_bandwidth;
+ bw_trace = tmgr_trace_new("");
+ lat_initial = initial_latency;
+ lat_trace = tmgr_trace_new("");
+ // FIXME Hard Coded Values
+ //state_initial_link = SURF_RESOURCE_ON;
+ //policy_initial_link = SURF_LINK_SHARED;
+ state_trace = tmgr_trace_new("");
+
+ net_link_new(name_link, bw_initial, bw_trace,
+ lat_initial, lat_trace, state_initial_link, state_trace,
+ policy_initial_link, xbt_dict_new());
+}
+
+static void net_finalize(void)
+{
+ surf_model_exit(surf_network_model);
+ surf_network_model = NULL;
+
+ used_routing->finalize();
+ lmm_system_free(network_maxmin_system);
+ network_maxmin_system = NULL;
+}
+
+static void surf_network_model_init_internal(void)
+{
+ surf_network_model = surf_model_init();
+
+ surf_network_model->name = "network";
+ surf_network_model->action_unref = net_action_unref;
+ surf_network_model->action_cancel = net_action_cancel;
+ surf_network_model->action_recycle = net_action_recycle;
+ surf_network_model->get_remains = net_action_get_remains;
+ surf_network_model->get_latency_limited = net_get_link_latency;
+
+ surf_network_model->model_private->resource_used = net_resource_used;
+ surf_network_model->model_private->share_resources = net_share_resources;
+ surf_network_model->model_private->update_actions_state =
+ net_update_actions_state;
+ surf_network_model->model_private->update_resource_state =
+ net_update_resource_state;
+ surf_network_model->model_private->finalize = net_finalize;
+
+ surf_network_model->suspend = net_action_suspend;
+ surf_network_model->resume = net_action_resume;
+ surf_network_model->is_suspended = net_action_is_suspended;
+ surf_cpu_model->set_max_duration = net_action_set_max_duration;
+
+ surf_network_model->extension.network.communicate = net_communicate;
+ surf_network_model->extension.network.get_link_bandwidth =
+ net_get_link_bandwidth;
+ surf_network_model->extension.network.link_shared = net_link_shared;
+ surf_network_model->extension.network.create_resource = network_create_resource;
+ surf_network_model->extension.network.add_traces = net_add_traces;
+
+ if (!network_maxmin_system)