X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/90750b2b8f84e51c766470561fbaed1de51e91b0..9d75fc992b03f40a301c2e62781bde39979794e9:/src/surf/workstation_KCCFLN05.c diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c index f6a709e265..ab6ebc7a62 100644 --- a/src/surf/workstation_KCCFLN05.c +++ b/src/surf/workstation_KCCFLN05.c @@ -9,7 +9,7 @@ #include "xbt/dict.h" #include "workstation_KCCFLN05_private.h" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(workstation_KCCFLN05, surf, +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_workstation, surf, "Logging specific to the SURF workstation module (KCCFLN05)"); static int nb_workstation = 0; @@ -17,7 +17,7 @@ static s_route_KCCFLN05_t *routing_table = NULL; #define ROUTE(i,j) routing_table[(i)+(j)*nb_workstation] static network_link_KCCFLN05_t loopback = NULL; -static xbt_dict_t network_link_set = NULL; +/*xbt_dict_t network_link_set = NULL;*/ /* convenient function */ static void __update_cpu_usage(cpu_KCCFLN05_t cpu) @@ -466,6 +466,11 @@ static double get_speed(void *cpu, double load) return load*(((cpu_KCCFLN05_t) cpu)->power_scale); } +static double get_available_speed(void *cpu) +{ + return ((cpu_KCCFLN05_t) cpu)->power_current; +} + static surf_action_t communicate(void *src, void *dst, double size, double rate) { surf_action_workstation_KCCFLN05_t action = NULL; @@ -484,7 +489,7 @@ static surf_action_t communicate(void *src, void *dst, double size, double rate) action->generic_action.cost = size; action->generic_action.remains = size; action->generic_action.max_duration = NO_MAX_DURATION; - action->generic_action.start = -1.0; + action->generic_action.start = surf_get_clock(); action->generic_action.finish = -1.0; action->src = src; action->dst = dst; @@ -544,17 +549,124 @@ static surf_action_t communicate(void *src, void *dst, double size, double rate) } /* FIXME: execute_parallel_task */ -static surf_action_t execute_parallel_task(int cpu_nb, - void **cpu_list, +static surf_action_t execute_parallel_task(int workstation_nb, + void **workstation_list, double *computation_amount, double *communication_amount, double amount, double rate) { - DIE_IMPOSSIBLE; - return NULL; + surf_action_workstation_KCCFLN05_t action = NULL; + int i, j, k; + xbt_dict_t network_link_set = xbt_dict_new(); + xbt_dict_cursor_t cursor = NULL; + char *name = NULL; + int nb_link = 0; + int nb_host = 0; + network_link_KCCFLN05_t link; + + /* Compute the number of affected resources... */ + for(i=0; i< workstation_nb; i++) { + for(j=0; j< workstation_nb; j++) { + cpu_KCCFLN05_t card_src = workstation_list[i]; + cpu_KCCFLN05_t card_dst = workstation_list[j]; + int route_size = ROUTE(card_src->id, card_dst->id).size; + network_link_KCCFLN05_t *route = ROUTE(card_src->id, card_dst->id).links; + + if(communication_amount[i*workstation_nb+j]>0) + for(k=0; k< route_size; k++) { + xbt_dict_set(network_link_set, route[k]->name, route[k], NULL); + } + } + } + + xbt_dict_foreach(network_link_set, cursor, name, link) { + nb_link++; + } + + xbt_dict_free(&network_link_set); + + for (i = 0; i0) nb_host++; + + if(nb_link + workstation_nb == 0) + return NULL; + + action = xbt_new0(s_surf_action_workstation_KCCFLN05_t, 1); + action->generic_action.using = 1; + action->generic_action.cost = amount; + action->generic_action.remains = amount; + action->generic_action.max_duration = NO_MAX_DURATION; + action->generic_action.start = -1.0; + action->generic_action.finish = -1.0; + action->generic_action.resource_type = + (surf_resource_t) surf_workstation_resource; + action->suspended = 0; /* Should be useless because of the + calloc but it seems to help valgrind... */ + action->generic_action.state_set = + surf_workstation_resource->common_public->states.running_action_set; + + xbt_swag_insert(action, action->generic_action.state_set); + action->rate = rate; + + if(action->rate>0) + action->variable = lmm_variable_new(maxmin_system, action, 1.0, -1.0, + nb_host + nb_link); + else + action->variable = lmm_variable_new(maxmin_system, action, 1.0, action->rate, + nb_host + nb_link); + + for (i = 0; i0) + lmm_expand(maxmin_system, ((cpu_KCCFLN05_t) workstation_list[i])->constraint, + action->variable, computation_amount[i]); + + for (i=0; iid, card_dst->id).size; + network_link_KCCFLN05_t *route = ROUTE(card_src->id, card_dst->id).links; + + for(k=0; k< route_size; k++) { + if(communication_amount[i*workstation_nb+j]>0) { + lmm_expand_add(maxmin_system, route[k]->constraint, + action->variable, communication_amount[i*workstation_nb+j]); + } + } + } + } + + return (surf_action_t) action; } +/* returns an array of network_link_KCCFLN05_t */ +static const void** get_route(void *src, void *dst) { + cpu_KCCFLN05_t card_src = src; + cpu_KCCFLN05_t card_dst = dst; + route_KCCFLN05_t route = &(ROUTE(card_src->id, card_dst->id)); + + return (const void**) route->links; +} + +static int get_route_size(void *src, void *dst) { + cpu_KCCFLN05_t card_src = src; + cpu_KCCFLN05_t card_dst = dst; + route_KCCFLN05_t route = &(ROUTE(card_src->id, card_dst->id)); + return route->size; +} + +static const char *get_link_name(const void *link) { + return ((network_link_KCCFLN05_t) link)->name; +} + +static double get_link_bandwidth(const void *link) { + return ((network_link_KCCFLN05_t) link)->bw_current; +} + +static double get_link_latency(const void *link) { + return ((network_link_KCCFLN05_t) link)->lat_current; +} /**************************************/ /*** Resource Creation & Destruction **/ @@ -879,6 +991,10 @@ static void resource_init_internal(void) surf_workstation_resource->common_public->name_service = name_service; surf_workstation_resource->common_public->get_resource_name = get_resource_name; surf_workstation_resource->common_public->action_get_state = surf_action_get_state; + surf_workstation_resource->common_public->action_get_start_time = + surf_action_get_start_time; + surf_workstation_resource->common_public->action_get_finish_time = + surf_action_get_finish_time; surf_workstation_resource->common_public->action_use = action_use; surf_workstation_resource->common_public->action_free = action_free; surf_workstation_resource->common_public->action_cancel = action_cancel; @@ -902,8 +1018,14 @@ static void resource_init_internal(void) surf_workstation_resource->extension_public->sleep = action_sleep; surf_workstation_resource->extension_public->get_state = resource_get_state; surf_workstation_resource->extension_public->get_speed = get_speed; + surf_workstation_resource->extension_public->get_available_speed = get_available_speed; surf_workstation_resource->extension_public->communicate = communicate; surf_workstation_resource->extension_public->execute_parallel_task = execute_parallel_task; + surf_workstation_resource->extension_public->get_route = get_route; + surf_workstation_resource->extension_public->get_route_size = get_route_size; + surf_workstation_resource->extension_public->get_link_name = get_link_name; + surf_workstation_resource->extension_public->get_link_bandwidth = get_link_bandwidth; + surf_workstation_resource->extension_public->get_link_latency = get_link_latency; workstation_set = xbt_dict_new(); network_link_set = xbt_dict_new();