X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5e52cdafc655354a1c98193c817fc205d5be353e..226d3997c4e356a1935b7d51b310034b4833afb9:/src/surf/workstation_ptask_L07.c diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c index 5d94ad59fb..b8fbf90f4d 100644 --- a/src/surf/workstation_ptask_L07.c +++ b/src/surf/workstation_ptask_L07.c @@ -13,7 +13,7 @@ typedef enum { SURF_WORKSTATION_RESOURCE_CPU, - SURF_WORKSTATION_RESOURCE_LINK, + SURF_WORKSTATION_RESOURCE_LINK } e_surf_workstation_model_type_t; /**************************************/ @@ -26,9 +26,9 @@ typedef struct cpu_L07 { double power_scale; double power_current; tmgr_trace_event_t power_event; - e_surf_resource_state_t state_current; tmgr_trace_event_t state_event; - int id; /* cpu and network card are a single object... */ + e_surf_resource_state_t state_current; + sg_routing_edge_t info; } s_cpu_L07_t, *cpu_L07_t; /**************************************/ @@ -69,6 +69,19 @@ 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 (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(void *src, void *dst) +{ + DIE_IMPOSSIBLE; + return NULL; +} static void ptask_update_action_bound(surf_action_workstation_L07_t action) { @@ -76,28 +89,19 @@ static void ptask_update_action_bound(surf_action_workstation_L07_t action) double lat_current = 0.0; double lat_bound = -1.0; int i, j; - unsigned int cpt; - link_L07_t link; for (i = 0; i < workstation_nb; i++) { for (j = 0; j < workstation_nb; j++) { - 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; + xbt_dynar_t route=NULL; if (action->communication_amount[i * workstation_nb + j] > 0) { - xbt_dynar_foreach(route, cpt, link) { - lat += link->lat_current; - } + double lat = 0.0; + routing_get_route_and_latency(action->workstation_list[i]->info, + action->workstation_list[j]->info, + &route, &lat); lat_current = MAX(lat_current, - lat * action->communication_amount[i * workstation_nb + - j]); + lat * action->communication_amount[i * workstation_nb + j]); } } } @@ -195,8 +199,8 @@ static void ptask_action_set_priority(surf_action_t action, static double ptask_action_get_remains(surf_action_t action) { XBT_IN("(%p)", action); - return action->remains; XBT_OUT(); + return action->remains; } /**************************************/ @@ -454,28 +458,30 @@ static surf_action_t ptask_execute_parallel_task(int workstation_nb, double latency = 0.0; if (ptask_parallel_task_link_set == NULL) - ptask_parallel_task_link_set = xbt_dict_new(); + ptask_parallel_task_link_set = xbt_dict_new_homogeneous(NULL); xbt_dict_reset(ptask_parallel_task_link_set); /* Compute the number of affected resources... */ for (i = 0; i < workstation_nb; i++) { for (j = 0; j < workstation_nb; j++) { - link_L07_t link; - 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) + xbt_dynar_t route=NULL; + + if (communication_amount[i * workstation_nb + j] > 0) { + double lat=0.0; + unsigned int cpt; + link_L07_t link; + + routing_get_route_and_latency( + ((cpu_L07_t)workstation_list[i])->info, + ((cpu_L07_t)workstation_list[j])->info, + &route,&lat); + latency = MAX(latency, lat); + xbt_dynar_foreach(route, cpt, link) { - lat += link->lat_current; - xbt_dict_set(ptask_parallel_task_link_set, - link->generic_resource.name, link, NULL); + xbt_dict_set(ptask_parallel_task_link_set,link->generic_resource.name,link,NULL); } - latency = MAX(latency, lat); + } } } @@ -516,14 +522,15 @@ static surf_action_t ptask_execute_parallel_task(int workstation_nb, for (i = 0; i < workstation_nb; i++) { for (j = 0; j < workstation_nb; j++) { link_L07_t link; - xbt_dynar_t route = - global_routing->get_route(surf_resource_name - (workstation_list[i]), - surf_resource_name(workstation_list - [j])); - + xbt_dynar_t route=NULL; if (communication_amount[i * workstation_nb + j] == 0.0) continue; + + routing_get_route_and_latency( + ((cpu_L07_t)workstation_list[i])->info, + ((cpu_L07_t)workstation_list[j])->info, + &route,NULL); + xbt_dynar_foreach(route, cpt, link) { lmm_expand_add(ptask_maxmin_system, link->constraint, action->variable, @@ -589,10 +596,13 @@ static surf_action_t ptask_action_sleep(void *cpu, double duration) return (surf_action_t) action; } -static xbt_dynar_t ptask_get_route(void *src, void *dst) +static xbt_dynar_t ptask_get_route(void *src, void *dst) // FIXME: kill that callback kind? { - return global_routing->get_route(surf_resource_name(src), - surf_resource_name(dst)); + xbt_dynar_t route=NULL; + routing_get_route_and_latency( + ((cpu_L07_t)src)->info, ((cpu_L07_t)dst)->info, + &route,NULL); + return route; } static double ptask_get_link_bandwidth(const void *link) @@ -630,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"); @@ -726,7 +737,7 @@ static void ptask_parse_link_init(sg_platf_link_cbarg_t link) link->properties); xbt_free(link_id); link_id = bprintf("%s_DOWN", link->id); - ptask_link_create_resource(bprintf("%s_DOWN", link->id), + ptask_link_create_resource(link_id, link->bandwidth, link->bandwidth_trace, link->latency, @@ -887,15 +898,23 @@ static void ptask_model_init_internal(void) ptask_add_traces; if (!ptask_maxmin_system) - ptask_maxmin_system = lmm_system_new(); + 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, SURF_LINK_FATPIPE, NULL)); + surf_network_model = surf_model_init(); + + surf_network_model->extension.network.communicate = die_impossible_communicate; + surf_network_model->extension.network.get_route = die_impossible_get_route; + surf_network_model->extension.network.get_link_bandwidth = ptask_get_link_bandwidth; + 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; } /**************************************/ @@ -906,7 +925,6 @@ void surf_workstation_model_init_ptask_L07(void) XBT_INFO("surf_workstation_model_init_ptask_L07"); xbt_assert(!surf_cpu_model, "CPU model type already defined"); xbt_assert(!surf_network_model, "network model type already defined"); - surf_network_model = surf_model_init(); ptask_define_callbacks(); ptask_model_init_internal(); xbt_dynar_push(model_list, &surf_workstation_model);