X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3ffba8ac7a4b5cb19a9feed264a11422ee0f202f..c803c90c02e18898f00775f8d8068635b24a6d10:/src/surf/workstation_KCCFLN05.c diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c index 2669c5830f..a439c6ce9f 100644 --- a/src/surf/workstation_KCCFLN05.c +++ b/src/surf/workstation_KCCFLN05.c @@ -17,9 +17,12 @@ 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 parallel_task_network_link_set = NULL; +//added to work with GTNETS +static xbt_dict_t router_set = NULL; /*xbt_dict_t network_link_set = NULL;*/ + /* convenient function */ static void __update_cpu_usage(cpu_KCCFLN05_t cpu) { @@ -76,7 +79,20 @@ static void __update_cpu_usage(cpu_KCCFLN05_t cpu) static void *name_service(const char *name) { - return xbt_dict_get_or_null(workstation_set, name); + xbt_ex_t e; + void *res=NULL; + + TRY { + res = xbt_dict_get_or_null(workstation_set, name); + } CATCH(e) { + if (e.category != not_found_error) + RETHROW; + WARN1("Host '%s' not found, verifing if it is a router", name); + res = NULL; + xbt_ex_free(e); + } + + return res; } static const char *get_resource_name(void *resource_id) @@ -152,32 +168,36 @@ static void action_recycle(surf_action_t action) static void action_suspend(surf_action_t action) { XBT_IN1("(%p))",action); - ((surf_action_workstation_KCCFLN05_t) action)->suspended = 1; - lmm_update_variable_weight(maxmin_system, - ((surf_action_workstation_KCCFLN05_t) - action)->variable, 0.0); + if(((surf_action_workstation_KCCFLN05_t) action)->suspended != 2) { + ((surf_action_workstation_KCCFLN05_t) action)->suspended = 1; + lmm_update_variable_weight(maxmin_system, + ((surf_action_workstation_KCCFLN05_t) + action)->variable, 0.0); + } XBT_OUT; } static void action_resume(surf_action_t action) { XBT_IN1("(%p)",action); - if(((surf_action_workstation_KCCFLN05_t)action)->lat_current==0.0) - lmm_update_variable_weight(maxmin_system, - ((surf_action_workstation_KCCFLN05_t) - action)->variable, 1.0); - else - lmm_update_variable_weight(maxmin_system, - ((surf_action_workstation_KCCFLN05_t) action)->variable, - ((surf_action_workstation_KCCFLN05_t) action)->lat_current); - - ((surf_action_workstation_KCCFLN05_t) action)->suspended = 0; + if(((surf_action_workstation_KCCFLN05_t) action)->suspended !=2) { + if(((surf_action_workstation_KCCFLN05_t)action)->lat_current==0.0) + lmm_update_variable_weight(maxmin_system, + ((surf_action_workstation_KCCFLN05_t) + action)->variable, 1.0); + else + lmm_update_variable_weight(maxmin_system, + ((surf_action_workstation_KCCFLN05_t) action)->variable, + ((surf_action_workstation_KCCFLN05_t) action)->lat_current); + + ((surf_action_workstation_KCCFLN05_t) action)->suspended = 0; + } XBT_OUT; } static int action_is_suspended(surf_action_t action) { - return (((surf_action_workstation_KCCFLN05_t) action)->suspended); + return (((surf_action_workstation_KCCFLN05_t) action)->suspended==1); } static void action_set_max_duration(surf_action_t action, double duration) @@ -229,15 +249,22 @@ static double share_resources(double now) xbt_swag_foreach(action, running_actions) { if(action->latency>0) { - if(min<0) min = action->latency; - else if (action->latencylatency; + if(min<0) { + min = action->latency; + DEBUG3("Updating min (value) with %p (start %f): %f",action, + action->generic_action.start, min); + } + else if (action->latencylatency; + DEBUG3("Updating min (latency) with %p (start %f): %f",action, + action->generic_action.start, min); + } } } + DEBUG1("min value : %f",min); + return min; -/* return generic_maxmin_share_resources(surf_workstation_resource->common_public-> */ -/* states.running_action_set, */ -/* xbt_swag_offset(action, variable)); */ } static void update_actions_state(double now, double delta) @@ -258,7 +285,7 @@ static void update_actions_state(double now, double delta) double_update(&(deltap), action->latency); action->latency = 0.0; } - if ((action->latency == 0.0) && !(action->suspended)) { + if ((action->latency == 0.0) && (action->suspended==0)) { if((action)->lat_current==0.0) lmm_update_variable_weight(maxmin_system,action->variable, 1.0); else @@ -266,8 +293,12 @@ static void update_actions_state(double now, double delta) action->lat_current); } } + DEBUG3("Action (%p) : remains (%g) updated by %g.", + action, action->generic_action.remains, + lmm_variable_getvalue(action->variable) * deltap); double_update(&(action->generic_action.remains), lmm_variable_getvalue(action->variable) * deltap); + if (action->generic_action.max_duration != NO_MAX_DURATION) double_update(&(action->generic_action.max_duration), delta); @@ -335,9 +366,12 @@ static void update_resource_state(void *id, else lmm_update_variable_bound(maxmin_system, action->variable, min(action->rate,SG_TCP_CTE_GAMMA / (2.0 * action->lat_current))); - if(!(action->suspended)) + if(action->suspended==0) lmm_update_variable_weight(maxmin_system, action->variable, action->lat_current); + lmm_update_variable_latency(maxmin_system, action->variable, delta); + + } } else if (event_type == nw_link->state_event) { if (value > 0) @@ -375,6 +409,7 @@ static void finalize(void) xbt_dict_free(&network_link_set); xbt_dict_free(&workstation_set); + xbt_dict_free(&router_set); if (parallel_task_network_link_set != NULL) { xbt_dict_free(¶llel_task_network_link_set); } @@ -454,6 +489,7 @@ static surf_action_t action_sleep(void *cpu, double duration) action = (surf_action_workstation_KCCFLN05_t) execute(cpu, 1.0); action->generic_action.max_duration = duration; + action->suspended = 2; lmm_update_variable_weight(maxmin_system, action->variable, 0.0); XBT_OUT; @@ -475,6 +511,7 @@ 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; @@ -539,6 +576,8 @@ static surf_action_t communicate(void *src, void *dst, double size, double rate) lmm_update_variable_bound(maxmin_system, action->variable, action->rate); } + lmm_update_variable_latency(maxmin_system, action->variable, action->latency); + for (i = 0; i < route_size; i++) lmm_expand(maxmin_system, route->links[i]->constraint, action->variable, 1.0); if (card_src->bus) @@ -567,7 +606,7 @@ static surf_action_t execute_parallel_task(int workstation_nb, if (parallel_task_network_link_set == NULL) { parallel_task_network_link_set = xbt_dict_new_ext(workstation_nb * workstation_nb * 10); } - + /* Compute the number of affected resources... */ for(i=0; i< workstation_nb; i++) { for(j=0; j< workstation_nb; j++) { @@ -582,17 +621,20 @@ static surf_action_t execute_parallel_task(int workstation_nb, } } } - nb_link = xbt_dict_length(parallel_task_network_link_set); xbt_dict_reset(parallel_task_network_link_set); + for (i = 0; i0) nb_host++; - if(nb_link + workstation_nb == 0) + + if(nb_link + nb_host == 0) /* was workstation_nb... */ return NULL; action = xbt_new0(s_surf_action_workstation_KCCFLN05_t, 1); + DEBUG3("Creating a parallel task (%p) with %d cpus and %d links.", + action, nb_host, nb_link); action->generic_action.using = 1; action->generic_action.cost = amount; action->generic_action.remains = amount; @@ -672,6 +714,32 @@ static double get_link_latency(const void *link) { /*** Resource Creation & Destruction **/ /**************************************/ + +static void router_free(void *router) +{ + free( ((router_KCCFLN05_t) router)->name ); +} + +static void router_new(const char *name) +{ + static unsigned int nb_routers = 0; + + INFO1("Creating a router %s", name); + + router_KCCFLN05_t router; + router = xbt_new0(s_router_KCCFLN05_t, 1); + + router->name = xbt_strdup(name); + router->id = nb_routers++; + xbt_dict_set(router_set, name, router, router_free); +} + +static void parse_routers(void) +{ + //add a dumb router just to be GTNETS compatible + router_new(A_surfxml_router_name); +} + static void cpu_free(void *cpu) { free(((cpu_KCCFLN05_t) cpu)->name); @@ -885,31 +953,60 @@ static double impact_on_dst_with_other_send; static void parse_route_set_endpoints(void) { - src_id = ((cpu_KCCFLN05_t) name_service(A_surfxml_route_src))->id; - dst_id = ((cpu_KCCFLN05_t) name_service(A_surfxml_route_dst))->id; + cpu_KCCFLN05_t cpu_tmp = NULL; + + cpu_tmp = (cpu_KCCFLN05_t) name_service(A_surfxml_route_src); + if(cpu_tmp != NULL) { + src_id = cpu_tmp->id; + }else { + xbt_assert1(xbt_dict_get_or_null(router_set, A_surfxml_route_src), + "Invalid name '%s': neither a cpu nor a router!", + A_surfxml_route_src); + src_id=-1; + return; + } + + cpu_tmp = (cpu_KCCFLN05_t) name_service(A_surfxml_route_dst); + if(cpu_tmp != NULL) { + dst_id = cpu_tmp->id; + }else { + xbt_assert1(xbt_dict_get_or_null(router_set, A_surfxml_route_dst), + "Invalid name '%s': neither a cpu nor a router!", + A_surfxml_route_dst); + dst_id=-1; + return ; + } + surf_parse_get_double(&impact_on_src, A_surfxml_route_impact_on_src); surf_parse_get_double(&impact_on_dst, A_surfxml_route_impact_on_dst); surf_parse_get_double(&impact_on_src_with_other_recv, A_surfxml_route_impact_on_src_with_other_recv); surf_parse_get_double(&impact_on_dst_with_other_send, A_surfxml_route_impact_on_dst_with_other_send); - + nb_link = 0; - link_list_capacity = 20; + link_list_capacity = 1; link_list = xbt_new(network_link_KCCFLN05_t, link_list_capacity); + } static void parse_route_elem(void) { + xbt_ex_t e; if (nb_link == link_list_capacity) { link_list_capacity *= 2; link_list = xbt_realloc(link_list, (link_list_capacity) * sizeof(network_link_KCCFLN05_t)); } - link_list[nb_link++] = xbt_dict_get_or_null(network_link_set, A_surfxml_route_element_name); + TRY { + link_list[nb_link++] = xbt_dict_get(network_link_set, A_surfxml_route_element_name); + } CATCH(e) { + RETHROW1("Link %s not found (dict raised this exception: %s)",A_surfxml_route_element_name); + } } static void parse_route_set_route(void) { + if( src_id != -1 && dst_id != -1 ) route_new(src_id, dst_id, link_list, nb_link, impact_on_src, impact_on_dst, impact_on_src_with_other_recv, impact_on_dst_with_other_send); @@ -917,7 +1014,7 @@ static void parse_route_set_route(void) static void parse_file(const char *file) { - int i ; + int i; /* Figuring out the cpus */ surf_parse_reset_parser(); @@ -928,6 +1025,13 @@ static void parse_file(const char *file) create_routing_table(); + /* Figuring out the router (added after GTNETS) */ + surf_parse_reset_parser(); + STag_surfxml_router_fun=parse_routers; + surf_parse_open(file); + xbt_assert1((!surf_parse()),"Parse error in %s",file); + surf_parse_close(); + /* Figuring out the network links */ surf_parse_reset_parser(); ETag_surfxml_network_link_fun = parse_network_link; @@ -1024,7 +1128,8 @@ static void resource_init_internal(void) 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(); + workstation_set = xbt_dict_new(); + router_set = xbt_dict_new(); network_link_set = xbt_dict_new(); xbt_assert0(maxmin_system, "surf_init has to be called first!"); @@ -1042,15 +1147,3 @@ void surf_workstation_resource_init_KCCFLN05(const char *filename) xbt_dynar_push(resource_list, &surf_workstation_resource); } - -void surf_workstation_resource_init_KCCFLN05_proportionnal(const char *filename) -{ - xbt_assert0(!surf_cpu_resource, "CPU resource type already defined"); - xbt_assert0(!surf_network_resource, "network resource type already defined"); - resource_init_internal(); - parse_file(filename); - - surf_workstation_resource->common_public->name = "Workstation KCCFLN05 (proportionnal)"; - use_sdp_solver=1; - xbt_dynar_push(resource_list, &surf_workstation_resource); -}