X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0501f8c994f9488d43010fb5989f284ae7de8ff6..412f2a1c298a4fa51275e0d68f02ee787568432b:/src/surf/workstation_KCCFLN05.c diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c index 4845325546..4f30af016b 100644 --- a/src/surf/workstation_KCCFLN05.c +++ b/src/surf/workstation_KCCFLN05.c @@ -16,6 +16,7 @@ static int nb_workstation = 0; 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; /*xbt_dict_t network_link_set = NULL;*/ @@ -75,7 +76,14 @@ 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(workstation_set, name); + } CATCH(e) { + RETHROW1("Host '%s' not found (dict raised this exception: %s)",name); + } + return res; } static const char *get_resource_name(void *resource_id) @@ -151,32 +159,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) @@ -228,15 +240,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) @@ -251,13 +270,13 @@ static void update_actions_state(double now, double delta) deltap = delta; if (action->latency > 0) { if (action->latency > deltap) { - surf_double_update(&(action->latency), deltap); + double_update(&(action->latency), deltap); deltap = 0.0; } else { - surf_double_update(&(deltap), action->latency); + 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 @@ -265,10 +284,14 @@ static void update_actions_state(double now, double delta) action->lat_current); } } - surf_double_update(&(action->generic_action.remains), + 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) - surf_double_update(&(action->generic_action.max_duration), delta); + double_update(&(action->generic_action.max_duration), delta); /* if(action->generic_action.remains<.00001) action->generic_action.remains=0; */ @@ -334,9 +357,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) @@ -374,6 +400,9 @@ static void finalize(void) xbt_dict_free(&network_link_set); xbt_dict_free(&workstation_set); + if (parallel_task_network_link_set != NULL) { + xbt_dict_free(¶llel_task_network_link_set); + } xbt_swag_free(surf_workstation_resource->common_public->states. ready_action_set); xbt_swag_free(surf_workstation_resource->common_public->states. @@ -450,6 +479,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; @@ -471,6 +501,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; @@ -535,6 +566,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) @@ -557,19 +590,13 @@ static surf_action_t execute_parallel_task(int workstation_nb, { surf_action_workstation_KCCFLN05_t action = NULL; int i, j, k; - static xbt_dict_t network_link_set; - static int first_run = 1; int nb_link = 0; int nb_host = 0; - if (first_run) { - network_link_set = xbt_dict_new_ext(workstation_nb * workstation_nb * 10); - first_run = 0; - } - else { - xbt_dict_reset(network_link_set); + 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++) { @@ -580,20 +607,24 @@ static surf_action_t execute_parallel_task(int workstation_nb, 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_set(parallel_task_network_link_set, route[k]->name, route[k], NULL); } } } + nb_link = xbt_dict_length(parallel_task_network_link_set); + xbt_dict_reset(parallel_task_network_link_set); - nb_link = xbt_dict_length(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; @@ -902,11 +933,16 @@ static void parse_route_set_endpoints(void) 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) @@ -950,7 +986,7 @@ static void parse_file(const char *file) if(!ROUTE(i,i).size) { if(!loopback) loopback = network_link_new(xbt_strdup("__MSG_loopback__"), - 498.00, NULL, 0.000015, NULL, + 498000000, NULL, 0.000015, NULL, SURF_NETWORK_LINK_ON, NULL, SURF_NETWORK_LINK_FATPIPE); ROUTE(i,i).size=1; @@ -1043,3 +1079,46 @@ void surf_workstation_resource_init_KCCFLN05(const char *filename) xbt_dynar_push(resource_list, &surf_workstation_resource); } + +void surf_workstation_resource_init_KCCFLN05_proportional(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 (proportional)"; + use_sdp_solver=1; + xbt_dynar_push(resource_list, &surf_workstation_resource); +} + +void surf_workstation_resource_init_KCCFLN05_Vegas(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); + + lmm_set_default_protocol_functions(func_vegas_fpi); + + surf_workstation_resource->common_public->name = "Workstation KCCFLN05 (Vegas)"; + use_lagrange_solver=1; + xbt_dynar_push(resource_list, &surf_workstation_resource); +} + +void surf_workstation_resource_init_KCCFLN05_Reno(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); + + lmm_set_default_protocol_functions(func_reno_fpi); + + surf_workstation_resource->common_public->name = "Workstation KCCFLN05 (Reno)"; + use_lagrange_solver=1; + xbt_dynar_push(resource_list, &surf_workstation_resource); +} + + +