X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9badad31f437c07e1b976176b032e1707dbbdbef..51dcb8e712855f3cb16800ddea745ef6fc8d79e9:/src/surf/workstation_ptask_L07.c diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c index 650f0cdec6..662b3844b0 100644 --- a/src/surf/workstation_ptask_L07.c +++ b/src/surf/workstation_ptask_L07.c @@ -28,7 +28,7 @@ typedef struct cpu_L07 { 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; /**************************************/ @@ -69,13 +69,15 @@ static int ptask_host_count = 0; 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; @@ -94,9 +96,8 @@ static void ptask_update_action_bound(surf_action_workstation_L07_t action) 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, @@ -301,19 +302,19 @@ static void ptask_update_actions_state(double now, double delta) i++))) { constraint_id = lmm_constraint_id(cnst); -/* if(((link_L07_t)constraint_id)->type== */ -/* SURF_WORKSTATION_RESOURCE_LINK) { */ -/* XBT_DEBUG("Checking for link %s (%p)", */ -/* ((link_L07_t)constraint_id)->name, */ -/* ((link_L07_t)constraint_id)); */ -/* } */ -/* if(((cpu_L07_t)constraint_id)->type== */ -/* SURF_WORKSTATION_RESOURCE_CPU) { */ -/* XBT_DEBUG("Checking for cpu %s (%p) : %s", */ -/* ((cpu_L07_t)constraint_id)->name, */ -/* ((cpu_L07_t)constraint_id), */ -/* ((cpu_L07_t)constraint_id)->state_current==SURF_CPU_OFF?"Off":"On"); */ -/* } */ +/* if(((link_L07_t)constraint_id)->type== */ +/* SURF_WORKSTATION_RESOURCE_LINK) { */ +/* XBT_DEBUG("Checking for link %s (%p)", */ +/* ((link_L07_t)constraint_id)->name, */ +/* ((link_L07_t)constraint_id)); */ +/* } */ +/* if(((cpu_L07_t)constraint_id)->type== */ +/* SURF_WORKSTATION_RESOURCE_CPU) { */ +/* XBT_DEBUG("Checking for cpu %s (%p) : %s", */ +/* ((cpu_L07_t)constraint_id)->name, */ +/* ((cpu_L07_t)constraint_id), */ +/* ((cpu_L07_t)constraint_id)->state_current==SURF_CPU_OFF?"Off":"On"); */ +/* } */ if (((((link_L07_t) constraint_id)->type == SURF_WORKSTATION_RESOURCE_LINK) && @@ -343,7 +344,8 @@ static void ptask_update_resource_state(void *id, link_L07_t nw_link = id; if (nw_link->type == SURF_WORKSTATION_RESOURCE_LINK) { - XBT_DEBUG("Updating link %s (%p)", surf_resource_name(nw_link), nw_link); + XBT_DEBUG("Updating link %s (%p) with value=%f", + surf_resource_name(nw_link), nw_link, value); if (event_type == nw_link->bw_event) { nw_link->bw_current = value; lmm_update_constraint_bound(ptask_maxmin_system, nw_link->constraint, @@ -446,7 +448,6 @@ static surf_action_t ptask_execute_parallel_task(int workstation_nb, double *computation_amount, double *communication_amount, - double amount, double rate) { surf_action_workstation_L07_t action = NULL; @@ -472,8 +473,8 @@ static surf_action_t ptask_execute_parallel_task(int workstation_nb, 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); @@ -492,7 +493,7 @@ static surf_action_t ptask_execute_parallel_task(int workstation_nb, 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); @@ -526,8 +527,8 @@ static surf_action_t ptask_execute_parallel_task(int workstation_nb, 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) { @@ -558,7 +559,7 @@ static surf_action_t ptask_execute(void *cpu, double size) 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, @@ -575,7 +576,7 @@ 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; } @@ -599,7 +600,7 @@ static xbt_dynar_t ptask_get_route(void *src, void *dst) // FIXME: kill that cal { 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; } @@ -639,7 +640,8 @@ static void* ptask_cpu_create_resource(const char *name, double power_scale, 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"); @@ -666,13 +668,13 @@ static void* ptask_cpu_create_resource(const char *name, double power_scale, static void ptask_parse_cpu_init(sg_platf_host_cbarg_t host) { ptask_cpu_create_resource( - host->id, - host->power_peak, - host->power_scale, - host->power_trace, - host->initial_state, - host->state_trace, - host->properties); + host->id, + host->power_peak, + host->power_scale, + host->power_trace, + host->initial_state, + host->state_trace, + host->properties); } static void* ptask_link_create_resource(const char *name, @@ -797,7 +799,7 @@ static void ptask_add_traces(void) xbt_dict_foreach(trace_connect_list_link_avail, cursor, trace_name, elm) { tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); link_L07_t link = - xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); + xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); xbt_assert(link, "Link %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); @@ -809,7 +811,7 @@ static void ptask_add_traces(void) xbt_dict_foreach(trace_connect_list_bandwidth, cursor, trace_name, elm) { tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); link_L07_t link = - xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); + xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); xbt_assert(link, "Link %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); @@ -820,7 +822,7 @@ static void ptask_add_traces(void) xbt_dict_foreach(trace_connect_list_latency, cursor, trace_name, elm) { tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); link_L07_t link = - xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); + xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); xbt_assert(link, "Link %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); @@ -888,18 +890,13 @@ static void ptask_model_init_internal(void) ptask_link_shared; surf_workstation_model->extension.workstation.get_properties = surf_resource_properties; - 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; 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, @@ -913,7 +910,6 @@ static void ptask_model_init_internal(void) surf_network_model->extension.network.get_link_latency = ptask_get_link_latency; surf_network_model->extension.network.link_shared = ptask_link_shared; surf_network_model->extension.network.add_traces = NULL; - surf_network_model->extension.network.create_resource = NULL; } /**************************************/