tmgr_trace_event_t power_event;
tmgr_trace_event_t state_event;
e_surf_resource_state_t state_current;
- int id; /* cpu and network card are a single object... */
+ sg_routing_edge_t info;
} s_cpu_L07_t, *cpu_L07_t;
/**************************************/
static xbt_dict_t ptask_parallel_task_link_set = NULL;
lmm_system_t ptask_maxmin_system = NULL;
-static surf_action_t die_impossible_communicate (const char *src_name, const char *dst_name, double size, double rate)
+static surf_action_t die_impossible_communicate (sg_routing_edge_t src,
+ sg_routing_edge_t dst,
+ double size, double rate)
{
DIE_IMPOSSIBLE;
return NULL;
}
-static xbt_dynar_t die_impossible_get_route(const char *src_name, const char *dst_name)
+static xbt_dynar_t die_impossible_get_route(void *src, void *dst)
{
DIE_IMPOSSIBLE;
return NULL;
if (action->communication_amount[i * workstation_nb + j] > 0) {
double lat = 0.0;
- routing_get_route_and_latency(surf_resource_name
- (action->workstation_list[i]),
- surf_resource_name(action->workstation_list[j]),
+ routing_get_route_and_latency(action->workstation_list[i]->info,
+ action->workstation_list[j]->info,
&route, &lat);
lat_current =
MAX(lat_current,
double
*computation_amount, double
*communication_amount,
- double amount,
double rate)
{
surf_action_workstation_L07_t action = NULL;
link_L07_t link;
routing_get_route_and_latency(
- surf_resource_name(workstation_list[i]),
- surf_resource_name(workstation_list[j]),
+ ((cpu_L07_t)workstation_list[i])->info,
+ ((cpu_L07_t)workstation_list[j])->info,
&route,&lat);
latency = MAX(latency, lat);
nb_host++;
action =
- surf_action_new(sizeof(s_surf_action_workstation_L07_t), amount,
+ surf_action_new(sizeof(s_surf_action_workstation_L07_t), 1,
surf_workstation_model, 0);
XBT_DEBUG("Creating a parallel task (%p) with %d cpus and %d links.",
action, workstation_nb, nb_link);
continue;
routing_get_route_and_latency(
- surf_resource_name(workstation_list[i]),
- surf_resource_name(workstation_list[j]),
+ ((cpu_L07_t)workstation_list[i])->info,
+ ((cpu_L07_t)workstation_list[j])->info,
&route,NULL);
xbt_dynar_foreach(route, cpt, link) {
return ptask_execute_parallel_task(1, workstation_list,
computation_amount,
- communication_amount, 1, -1);
+ communication_amount, -1);
}
static surf_action_t ptask_communicate(void *src, void *dst, double size,
res = ptask_execute_parallel_task(2, workstation_list,
computation_amount,
- communication_amount, 1, rate);
+ communication_amount, rate);
return res;
}
{
xbt_dynar_t route=NULL;
routing_get_route_and_latency(
- surf_resource_name(src), surf_resource_name(dst),
+ ((cpu_L07_t)src)->info, ((cpu_L07_t)dst)->info,
&route,NULL);
return route;
}
surf_workstation_model, name,cpu_properties);
cpu->type = SURF_WORKSTATION_RESOURCE_CPU;
- cpu->id = ptask_host_count++;
+ cpu->info = xbt_lib_get_or_null(host_lib, name, ROUTING_HOST_LEVEL);
+ if(!(cpu->info)) xbt_die("Don't find ROUTING_HOST_LEVEL for '%s'",name);
cpu->power_scale = power_scale;
xbt_assert(cpu->power_scale > 0, "Power has to be >0");
if (!ptask_maxmin_system)
ptask_maxmin_system = lmm_system_new(1);
- routing_model_create(sizeof(link_L07_t),
- ptask_link_create_resource("__loopback__",
+ routing_model_create(ptask_link_create_resource("__loopback__",
498000000, NULL,
0.000015, NULL,
SURF_RESOURCE_ON, NULL,