X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/073f8bce5afb1febdc3580607be8819b90705280..97d13963fc4bcb24172fd562b6600d79e8a6997d:/src/surf/workstation_ptask_L07.c diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c index 28468d0ecd..3e88b40f73 100644 --- a/src/surf/workstation_ptask_L07.c +++ b/src/surf/workstation_ptask_L07.c @@ -8,6 +8,7 @@ #include "xbt/ex.h" #include "xbt/dict.h" #include "surf_private.h" +/* extern lmm_system_t maxmin_system; */ typedef enum { SURF_WORKSTATION_RESOURCE_CPU, @@ -39,6 +40,8 @@ typedef struct network_link_L07 { e_surf_workstation_model_type_t type; /* Do not move this field */ char *name; /* Do not move this field */ lmm_constraint_t constraint; /* Do not move this field */ + double lat_current; + tmgr_trace_event_t lat_event; double bw_current; tmgr_trace_event_t bw_event; e_surf_network_link_state_t state_current; @@ -57,6 +60,11 @@ typedef struct s_route_L07 { typedef struct surf_action_workstation_L07 { s_surf_action_t generic_action; lmm_variable_t variable; + int workstation_nb; + cpu_L07_t *workstation_list; + double *computation_amount; + double *communication_amount; + double latency; double rate; int suspended; } s_surf_action_workstation_L07_t, *surf_action_workstation_L07_t; @@ -71,6 +79,42 @@ static network_link_L07_t loopback = NULL; static xbt_dict_t parallel_task_network_link_set = NULL; lmm_system_t ptask_maxmin_system = NULL; + +static void update_action_bound(surf_action_workstation_L07_t action) +{ + int workstation_nb = action->workstation_nb; + double lat_current = 0.0; + double lat_bound = -1.0; + int i, j, k; + + for (i = 0; i < workstation_nb; i++) { + for (j = 0; j < workstation_nb; j++) { + cpu_L07_t card_src = action->workstation_list[i]; + cpu_L07_t card_dst = action->workstation_list[j]; + int route_size = ROUTE(card_src->id, card_dst->id).size; + network_link_L07_t *route = ROUTE(card_src->id, card_dst->id).links; + double lat = 0.0; + + if (action->communication_amount[i * workstation_nb + j] > 0) { + for (k = 0; k < route_size; k++) { + lat += route[k]->lat_current; + } + lat_current=MAX(lat_current,lat/action->communication_amount[i * workstation_nb + j]); + } + } + } + lat_bound = SG_TCP_CTE_GAMMA / (2.0 * lat_current); + DEBUG2("action (%p) : lat_bound = %g", action, lat_bound); + if ((action->latency == 0.0) && (action->suspended == 0)) { + if (action->rate < 0) + lmm_update_variable_bound(ptask_maxmin_system, action->variable, + lat_bound); + else + lmm_update_variable_bound(ptask_maxmin_system, action->variable, + min(action->rate,lat_bound)); + } +} + /**************************************/ /******* Resource Public **********/ /**************************************/ @@ -80,12 +124,12 @@ static void *name_service(const char *name) return xbt_dict_get_or_null(workstation_set, name); } -static const char *get_model_name(void *model_id) +static const char *get_resource_name(void *resource_id) { /* We can freely cast as a cpu_L07_t because it has the same prefix as network_link_L07_t. However, only cpu_L07_t will theoretically be given as an argument here. */ - return ((cpu_L07_t) model_id)->name; + return ((cpu_L07_t) resource_id)->name; } /* action_get_state is inherited from the surf module */ @@ -106,6 +150,9 @@ static int action_free(surf_action_t action) lmm_variable_free(ptask_maxmin_system, ((surf_action_workstation_L07_t) action)-> variable); + free(((surf_action_workstation_L07_t)action)->workstation_list); + free(((surf_action_workstation_L07_t)action)->communication_amount); + free(((surf_action_workstation_L07_t)action)->computation_amount); free(action); return 1; } @@ -141,12 +188,12 @@ static void action_suspend(surf_action_t action) static void action_resume(surf_action_t action) { - XBT_IN1("(%p)", action); - if (((surf_action_workstation_L07_t) action)->suspended != 2) { - lmm_update_variable_weight(ptask_maxmin_system, - ((surf_action_workstation_L07_t) - action)->variable, 1.0); - ((surf_action_workstation_L07_t) action)->suspended = 0; + surf_action_workstation_L07_t act = (surf_action_workstation_L07_t) action; + + XBT_IN1("(%p)", act); + if (act->suspended != 2) { + lmm_update_variable_weight(ptask_maxmin_system,act->variable, 1.0); + act->suspended = 0; } XBT_OUT; } @@ -175,27 +222,42 @@ static void action_set_priority(surf_action_t action, double priority) /******* Resource Private **********/ /**************************************/ -static int model_used(void *model_id) +static int resource_used(void *resource_id) { /* We can freely cast as a network_link_L07_t because it has the same prefix as cpu_L07_t */ return lmm_constraint_used(ptask_maxmin_system, - ((network_link_L07_t) model_id)-> + ((network_link_L07_t) resource_id)-> constraint); } -static double share_models(double now) +static double share_resources(double now) { s_surf_action_workstation_L07_t s_action; + surf_action_workstation_L07_t action = NULL; xbt_swag_t running_actions = surf_workstation_model->common_public->states.running_action_set; - double min = generic_maxmin_share_models2(running_actions, - xbt_swag_offset(s_action, - variable), - ptask_maxmin_system, - bottleneck_solve); + double min = generic_maxmin_share_resources(running_actions, + xbt_swag_offset(s_action, + variable), + ptask_maxmin_system, + bottleneck_solve); + + xbt_swag_foreach(action, running_actions) { + if (action->latency > 0) { + if (min < 0) { + min = action->latency; + DEBUG3("Updating min (value) with %p (start %f): %f", action, + action->generic_action.start, min); + } else if (action->latency < min) { + min = action->latency; + DEBUG3("Updating min (latency) with %p (start %f): %f", action, + action->generic_action.start, min); + } + } + } DEBUG1("min value : %f", min); @@ -204,12 +266,27 @@ static double share_models(double now) static void update_actions_state(double now, double delta) { + double deltap = 0.0; surf_action_workstation_L07_t action = NULL; surf_action_workstation_L07_t next_action = NULL; xbt_swag_t running_actions = surf_workstation_model->common_public->states.running_action_set; xbt_swag_foreach_safe(action, next_action, running_actions) { + deltap = delta; + if (action->latency > 0) { + if (action->latency > deltap) { + double_update(&(action->latency), deltap); + deltap = 0.0; + } else { + double_update(&(deltap), action->latency); + action->latency = 0.0; + } + if ((action->latency == 0.0) && (action->suspended == 0)) { + update_action_bound(action); + lmm_update_variable_weight(ptask_maxmin_system,action->variable, 1.0); + } + } DEBUG3("Action (%p) : remains (%g) updated by %g.", action, action->generic_action.remains, lmm_variable_getvalue(action->variable) * delta); @@ -274,7 +351,7 @@ static void update_actions_state(double now, double delta) return; } -static void update_model_state(void *id, +static void update_resource_state(void *id, tmgr_trace_event_t event_type, double value) { @@ -287,6 +364,19 @@ static void update_model_state(void *id, nw_link->bw_current = value; lmm_update_constraint_bound(ptask_maxmin_system, nw_link->constraint, nw_link->bw_current); + } else if (event_type == nw_link->lat_event) { + lmm_variable_t var = NULL; + surf_action_workstation_L07_t action = NULL; + + nw_link->lat_current = value; + while (lmm_get_var_from_cnst + (ptask_maxmin_system, nw_link->constraint, &var)) { + + + action = lmm_variable_id(var); + update_action_bound(action); + } + } else if (event_type == nw_link->state_event) { if (value > 0) nw_link->state_current = SURF_NETWORK_LINK_ON; @@ -361,7 +451,7 @@ static void finalize(void) /******* Resource Private **********/ /**************************************/ -static e_surf_cpu_state_t model_get_state(void *cpu) +static e_surf_cpu_state_t resource_get_state(void *cpu) { return ((cpu_L07_t) cpu)->state_current; } @@ -386,27 +476,34 @@ static surf_action_t execute_parallel_task(int workstation_nb, int i, j, k; int nb_link = 0; int nb_host = 0; + double latency = 0.0; 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 models... */ + xbt_dict_reset(parallel_task_network_link_set); + + /* Compute the number of affected resources... */ for (i = 0; i < workstation_nb; i++) { for (j = 0; j < workstation_nb; j++) { cpu_L07_t card_src = workstation_list[i]; cpu_L07_t card_dst = workstation_list[j]; int route_size = ROUTE(card_src->id, card_dst->id).size; network_link_L07_t *route = ROUTE(card_src->id, card_dst->id).links; + double lat = 0.0; if (communication_amount[i * workstation_nb + j] > 0) for (k = 0; k < route_size; k++) { + lat += route[k]->lat_current; xbt_dict_set(parallel_task_network_link_set, route[k]->name, route[k], NULL); } + latency=MAX(latency,lat); } } + nb_link = xbt_dict_length(parallel_task_network_link_set); xbt_dict_reset(parallel_task_network_link_set); @@ -421,12 +518,17 @@ static surf_action_t execute_parallel_task(int workstation_nb, 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.start = surf_get_clock(); action->generic_action.finish = -1.0; action->generic_action.model_type = (surf_model_t) surf_workstation_model; action->suspended = 0; /* Should be useless because of the calloc but it seems to help valgrind... */ + action->workstation_nb = workstation_nb; + action->workstation_list = (cpu_L07_t *)workstation_list; + action->computation_amount = computation_amount; + action->communication_amount = communication_amount; + action->latency = latency; action->generic_action.state_set = surf_workstation_model->common_public->states.running_action_set; @@ -442,6 +544,9 @@ static surf_action_t execute_parallel_task(int workstation_nb, lmm_variable_new(ptask_maxmin_system, action, 1.0, action->rate, workstation_nb + nb_link); + if (action->latency > 0) + lmm_update_variable_weight(ptask_maxmin_system,action->variable,0.0); + for (i = 0; i < workstation_nb; i++) lmm_expand(ptask_maxmin_system, ((cpu_L07_t) workstation_list[i])->constraint, @@ -474,9 +579,16 @@ static surf_action_t execute_parallel_task(int workstation_nb, static surf_action_t execute(void *cpu, double size) { - double val = 0.0; + void **workstation_list = xbt_new0(void *, 1); + double *computation_amount = xbt_new0(double, 1); + double *communication_amount = xbt_new0(double, 1); + + workstation_list[0] = cpu; + communication_amount[0] = 0.0; + computation_amount[0] = size; - return execute_parallel_task(1, &cpu, &size, &val, 1, -1); + return execute_parallel_task(1, workstation_list, computation_amount, + communication_amount, 1, -1); } static surf_action_t communicate(void *src, void *dst, double size, @@ -495,10 +607,6 @@ static surf_action_t communicate(void *src, void *dst, double size, computation_amount, communication_amount, 1, rate); - free(computation_amount); - free(communication_amount); - free(workstation_list); - return res; } @@ -547,13 +655,7 @@ static double get_link_bandwidth(const void *link) static double get_link_latency(const void *link) { - static int warned = 0; - - if(!warned) { - WARN0("This model does not take latency into account."); - warned = 1; - } - return 0.0; + return ((network_link_L07_t) link)->lat_current; } /**************************************/ @@ -640,6 +742,8 @@ static void network_link_free(void *nw_link) static network_link_L07_t network_link_new(char *name, double bw_initial, tmgr_trace_t bw_trace, + double lat_initial, + tmgr_trace_t lat_trace, e_surf_network_link_state_t state_initial, tmgr_trace_t state_trace, @@ -657,6 +761,10 @@ static network_link_L07_t network_link_new(char *name, nw_link->bw_event = tmgr_history_add_trace(history, bw_trace, 0.0, 0, nw_link); nw_link->state_current = state_initial; + nw_link->lat_current = lat_initial; + if (lat_trace) + nw_link->lat_event = + tmgr_history_add_trace(history, lat_trace, 0.0, 0, nw_link); if (state_trace) nw_link->state_event = tmgr_history_add_trace(history, state_trace, 0.0, 0, nw_link); @@ -678,6 +786,8 @@ static void parse_network_link(void) char *name; double bw_initial; tmgr_trace_t bw_trace; + double lat_initial; + tmgr_trace_t lat_trace; e_surf_network_link_state_t state_initial = SURF_NETWORK_LINK_ON; e_surf_network_link_sharing_policy_t policy_initial = SURF_NETWORK_LINK_SHARED; @@ -686,6 +796,8 @@ static void parse_network_link(void) name = xbt_strdup(A_surfxml_network_link_name); surf_parse_get_double(&bw_initial, A_surfxml_network_link_bandwidth); surf_parse_get_trace(&bw_trace, A_surfxml_network_link_bandwidth_file); + surf_parse_get_double(&lat_initial, A_surfxml_network_link_latency); + surf_parse_get_trace(&lat_trace, A_surfxml_network_link_latency_file); xbt_assert0((A_surfxml_network_link_state == A_surfxml_network_link_state_ON) @@ -706,8 +818,8 @@ static void parse_network_link(void) surf_parse_get_trace(&state_trace, A_surfxml_network_link_state_file); - network_link_new(name, bw_initial, bw_trace, state_initial, state_trace, - policy_initial); + network_link_new(name, bw_initial, bw_trace, lat_initial, lat_trace, + state_initial, state_trace, policy_initial); } static void route_new(int src_id, int dst_id, @@ -804,7 +916,7 @@ static void parse_file(const char *file) if (!ROUTE(i, i).size) { if (!loopback) loopback = network_link_new(xbt_strdup("__MSG_loopback__"), - 498000000, NULL, + 498000000, NULL, 0.000015, NULL, SURF_NETWORK_LINK_ON, NULL, SURF_NETWORK_LINK_FATPIPE); @@ -841,8 +953,8 @@ static void model_init_internal(void) xbt_swag_new(xbt_swag_offset(action, state_hookup)); surf_workstation_model->common_public->name_service = name_service; - surf_workstation_model->common_public->get_model_name = - get_model_name; + surf_workstation_model->common_public->get_resource_name = + get_resource_name; surf_workstation_model->common_public->action_get_state = surf_action_get_state; surf_workstation_model->common_public->action_get_start_time = @@ -868,19 +980,19 @@ static void model_init_internal(void) action_set_priority; surf_workstation_model->common_public->name = "Workstation ptask_L07"; - surf_workstation_model->common_private->model_used = model_used; - surf_workstation_model->common_private->share_models = - share_models; + surf_workstation_model->common_private->resource_used = resource_used; + surf_workstation_model->common_private->share_resources = + share_resources; surf_workstation_model->common_private->update_actions_state = update_actions_state; - surf_workstation_model->common_private->update_model_state = - update_model_state; + surf_workstation_model->common_private->update_resource_state = + update_resource_state; surf_workstation_model->common_private->finalize = finalize; surf_workstation_model->extension_public->execute = execute; surf_workstation_model->extension_public->sleep = action_sleep; surf_workstation_model->extension_public->get_state = - model_get_state; + resource_get_state; surf_workstation_model->extension_public->get_speed = get_speed; surf_workstation_model->extension_public->get_available_speed = get_available_speed; @@ -914,7 +1026,6 @@ void surf_workstation_model_init_ptask_L07(const char *filename) "network model type already defined"); model_init_internal(); parse_file(filename); - WARN0("This model does not take latency into account."); update_model_description(surf_workstation_model_description, surf_workstation_model_description_size,