for (i = 0; i < workstation_nb; i++) {
for (j = 0; j < workstation_nb; j++) {
- cpu_L07_t card_src = action->workstation_list[i];
- cpu_L07_t card_dst = action->workstation_list[j];
- xbt_dynar_t route = used_routing->get_route(card_src->id, card_dst->id);
+ xbt_dynar_t route = global_routing->get_route(surf_resource_name(action->workstation_list[i]),
+ surf_resource_name(action->workstation_list[j]));
+
double lat = 0.0;
if (action->communication_amount[i * workstation_nb + j] > 0) {
surf_workstation_model = NULL;
surf_model_exit(surf_network_model);
surf_network_model = NULL;
- used_routing->finalize();
+ global_routing->finalize();
ptask_host_count = 0;
/* Compute the number of affected resources... */
for (i = 0; i < workstation_nb; i++) {
for (j = 0; j < workstation_nb; j++) {
- cpu_L07_t card_src = workstation_list[i];
- cpu_L07_t card_dst = workstation_list[j];
link_L07_t link;
- xbt_dynar_t route = used_routing->get_route(card_src->id, card_dst->id);
+ xbt_dynar_t route = global_routing->get_route(surf_resource_name(workstation_list[i]),
+ surf_resource_name(workstation_list[j]));
double lat = 0.0;
if (communication_amount[i * workstation_nb + j] > 0)
for (i = 0; i < workstation_nb; i++) {
for (j = 0; j < workstation_nb; j++) {
- cpu_L07_t card_src = workstation_list[i];
- cpu_L07_t card_dst = workstation_list[j];
link_L07_t link;
- xbt_dynar_t route = used_routing->get_route(card_src->id, card_dst->id);
+ xbt_dynar_t route = global_routing->get_route(surf_resource_name(workstation_list[i]),
+ surf_resource_name(workstation_list[j]));
if (communication_amount[i * workstation_nb + j] == 0.0)
continue;
static xbt_dynar_t ptask_get_route(void *src, void *dst)
{
- cpu_L07_t host_src = src;
- cpu_L07_t host_dst = dst;
-
- return used_routing->get_route(host_src->id, host_dst->id);
+ return global_routing->get_route( surf_resource_name(src), surf_resource_name(dst));
}
static double ptask_get_link_bandwidth(const void *link)
current_property_set);
}
-/**
- * FIXME : still improvable
- */
-void workstation_link_create_resource(char *name,
- double initial_bandwidth,double initial_latency)
+static void ptask_link_create_resource(char *name,
+ double bw_initial,
+ tmgr_trace_t bw_trace,
+ double lat_initial,
+ tmgr_trace_t lat_trace,
+ e_surf_resource_state_t
+ state_initial,
+ tmgr_trace_t state_trace,
+ e_surf_link_sharing_policy_t
+ policy, xbt_dict_t properties)
{
- 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("");
-
- ptask_link_new(name_link, bw_initial, bw_trace,
- lat_initial, lat_trace, state_initial_link, state_trace,
- policy_initial_link, xbt_dict_new());
+ ptask_link_new(name, bw_initial, bw_trace,
+ lat_initial, lat_trace, state_initial, state_trace,policy, xbt_dict_new());
}
surf_workstation_model->extension.workstation.link_shared = ptask_link_shared;
surf_workstation_model->extension.workstation.get_properties =
surf_resource_properties;
- //FIXME
- /*surf_workstation_model->extension.workstation.link_create_resource =
- workstation_link_create_resource;
+ surf_workstation_model->extension.workstation.link_create_resource =
+ ptask_link_create_resource;
surf_workstation_model->extension.workstation.cpu_create_resource =
ptask_cpu_create_resource;
- surf_workstation_model->extension.workstation.add_traces = ptask_add_traces;*/
+ surf_workstation_model->extension.workstation.add_traces = ptask_add_traces;
if (!ptask_maxmin_system)
ptask_maxmin_system = lmm_system_new();