X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2eae9b903fa523a15a5c8b4adb4471b6bd1e0af1..899a3b2de973f018bd96d419212ee4cdb2860b85:/src/surf/workstation_KCCFLN05.c diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c index 96a465501d..8c1342603e 100644 --- a/src/surf/workstation_KCCFLN05.c +++ b/src/surf/workstation_KCCFLN05.c @@ -40,7 +40,8 @@ static workstation_KCCFLN05_t workstation_new(const char *name, tmgr_trace_t state_trace, double interference_send, double interference_recv, - double interference_send_recv) + double interference_send_recv, + double max_outgoing_rate) { workstation_KCCFLN05_t workstation = xbt_new0(s_workstation_KCCFLN05_t, 1); @@ -49,6 +50,8 @@ static workstation_KCCFLN05_t workstation_new(const char *name, workstation->id = nb_workstation++; workstation->power_scale = power_scale; + xbt_assert0(workstation->power_scale>0,"Power has to be >0"); + workstation->power_current = power_initial; if (power_trace) workstation->power_event = @@ -66,6 +69,10 @@ static workstation_KCCFLN05_t workstation_new(const char *name, workstation->constraint = lmm_constraint_new(maxmin_system_cpu_KCCFLN05, workstation, workstation->power_current * workstation->power_scale); + if(max_outgoing_rate>0) + workstation->bus= + lmm_constraint_new(maxmin_system_cpu_KCCFLN05, workstation, + max_outgoing_rate); workstation->incomming_communications = xbt_dynar_new(sizeof(surf_action_network_KCCFLN05_t),NULL); @@ -87,7 +94,8 @@ static void parse_workstation(void) double interference_send = 0.0; double interference_recv = 0.0; double interference_send_recv = 0.0; - + double max_outgoing_rate = -1.0; + surf_parse_get_double(&power_scale,A_cpu_power); surf_parse_get_double(&power_initial,A_cpu_availability); surf_parse_get_trace(&power_trace,A_cpu_availability_file); @@ -102,10 +110,11 @@ static void parse_workstation(void) surf_parse_get_double(&interference_send,A_cpu_interference_send); surf_parse_get_double(&interference_recv,A_cpu_interference_recv); surf_parse_get_double(&interference_send_recv,A_cpu_interference_send_recv); + surf_parse_get_double(&max_outgoing_rate,A_cpu_max_outgoing_rate); workstation_new(A_cpu_name, power_scale, power_initial, power_trace, state_initial, state_trace, interference_send, interference_recv, - interference_send_recv); + interference_send_recv, max_outgoing_rate); } /*********** resource management ***********/ @@ -268,6 +277,11 @@ static void parse_route_set_endpoints(void) { src_id = ((workstation_KCCFLN05_t) name_service(A_route_src))->id; dst_id = ((workstation_KCCFLN05_t) name_service(A_route_dst))->id; + surf_parse_get_double(&impact_on_src,A_route_impact_on_src); + surf_parse_get_double(&impact_on_dst,A_route_impact_on_dst); + surf_parse_get_double(&impact_on_src_with_other_recv,A_route_impact_on_src_with_other_recv); + surf_parse_get_double(&impact_on_dst_with_other_send,A_route_impact_on_dst_with_other_send); + nb_link = 0; link_name = NULL; } @@ -380,6 +394,11 @@ static double share_network_KCCFLN05_resources(double now) static void action_network_KCCFLN05_change_state(surf_action_t action, e_surf_action_state_t state) { + if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) + if(((surf_action_network_KCCFLN05_t)action)->variable) { + lmm_variable_free(maxmin_system, ((surf_action_network_KCCFLN05_t)action)->variable); + ((surf_action_network_KCCFLN05_t)action)->variable = NULL; + } surf_action_change_state(action, state); return; } @@ -394,16 +413,16 @@ static void update_actions_network_KCCFLN05_state(double now, double delta) surf_network_resource->common_public->states.failed_action_set; xbt_swag_foreach_safe(action, next_action, running_actions) { - action->generic_action.remains -= - lmm_variable_getvalue(action->variable) * delta; + surf_double_update(&(action->generic_action.remains), + lmm_variable_getvalue(action->variable) * delta); if (action->generic_action.max_duration != NO_MAX_DURATION) - action->generic_action.max_duration -= delta; - if ((action->generic_action.remains <= 0) && + surf_double_update(&(action->generic_action.max_duration), delta); + if ((action->generic_action.remains <= 0.0) && (lmm_get_variable_weight(action->variable)>0)) { action->generic_action.finish = surf_get_clock(); action_network_KCCFLN05_change_state((surf_action_t) action, SURF_ACTION_DONE); } else if ((action->generic_action.max_duration != NO_MAX_DURATION) && - (action->generic_action.max_duration <= 0)) { + (action->generic_action.max_duration <= 0.0)) { action->generic_action.finish = surf_get_clock(); action_network_KCCFLN05_change_state((surf_action_t) action, SURF_ACTION_DONE); } else { /* Need to check that none of the resource has failed */ @@ -418,7 +437,8 @@ static void update_actions_network_KCCFLN05_state(double now, double delta) return; } -static surf_action_t communicate_KCCFLN05(void *src, void *dst, double size) +static surf_action_t communicate_KCCFLN05(void *src, void *dst, double size, + double rate) { surf_action_network_KCCFLN05_t action = NULL; workstation_KCCFLN05_t card_src = src; @@ -441,13 +461,21 @@ static surf_action_t communicate_KCCFLN05(void *src, void *dst, double size) xbt_swag_insert(action, action->generic_action.state_set); - action->variable = lmm_variable_new(maxmin_system_network_KCCFLN05, action, 1.0, -1.0, - route->size); + if(rate>0) + action->variable = lmm_variable_new(maxmin_system_network_KCCFLN05, action, 1.0, rate, + route->size+1); + else + action->variable = lmm_variable_new(maxmin_system_network_KCCFLN05, action, 1.0, -1.0, + route->size+1); for (i = 0; i < route->size; i++) lmm_expand(maxmin_system_network_KCCFLN05, route->links[i]->constraint, action->variable, 1.0); + if(card_src->bus) + lmm_expand(maxmin_system_network_KCCFLN05, card_src->bus, + action->variable, 1.0); + action->src=src; action->dst=dst; @@ -457,6 +485,23 @@ static surf_action_t communicate_KCCFLN05(void *src, void *dst, double size) return (surf_action_t) action; } +static void network_KCCFLN05_action_suspend(surf_action_t action) +{ + lmm_update_variable_weight(maxmin_system_network_KCCFLN05, + ((surf_action_network_KCCFLN05_t) action)->variable, 0.0); +} + +static void network_KCCFLN05_action_resume(surf_action_t action) +{ + lmm_update_variable_weight(maxmin_system_network_KCCFLN05, + ((surf_action_network_KCCFLN05_t) action)->variable, 1.0); +} + +static int network_KCCFLN05_action_is_suspended(surf_action_t action) +{ + return (lmm_get_variable_weight(((surf_action_network_KCCFLN05_t) action)->variable) == 0.0); +} + /***************** CPU ****************/ static void action_cpu_KCCFLN05_free(surf_action_t action) { @@ -465,6 +510,26 @@ static void action_cpu_KCCFLN05_free(surf_action_t action) xbt_free(action); } +static void action_cpu_KCCFLN05_change_state(surf_action_t action, + e_surf_action_state_t state) +{ + if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) + if(((surf_action_cpu_KCCFLN05_t)action)->variable) { + lmm_variable_free(maxmin_system, ((surf_action_cpu_KCCFLN05_t)action)->variable); + ((surf_action_cpu_KCCFLN05_t)action)->variable = NULL; + } + + surf_action_change_state(action, state); + return; +} + +/* #define WARNING(format, ...) (fprintf(stderr, "[%s , %s : %d] ", __FILE__, __FUNCTION__, __LINE__),\ */ +/* fprintf(stderr, format, ## __VA_ARGS__), \ */ +/* fprintf(stderr, "\n")) */ +/* #define VOIRP(expr) WARNING(" {" #expr " = %p }", expr) */ +/* #define VOIRD(expr) WARNING(" {" #expr " = %d }", expr) */ +/* #define VOIRG(expr) WARNING(" {" #expr " = %lg }", expr) */ + static double share_cpu_KCCFLN05_resources(double now) { s_surf_action_cpu_KCCFLN05_t s_cpu_action; @@ -489,10 +554,15 @@ static double share_cpu_KCCFLN05_resources(double now) (xbt_dynar_length(workstation->outgoing_communications))) { scale = workstation->interference_send; xbt_dynar_foreach (workstation->outgoing_communications,cpt,action) { +/* VOIRD(action->src->id); */ +/* VOIRD(action->dst->id); */ +/* VOIRP(&ROUTE(action->src->id,action->dst->id)); */ +/* VOIRG(ROUTE(action->src->id,action->dst->id).impact_on_src); */ scale -= ROUTE(action->src->id,action->dst->id).impact_on_src * lmm_variable_getvalue(action->variable); } - xbt_assert0(scale>0.0,"Negative interference !"); + if(scale<0.0) scale=0.0; + xbt_assert0(scale>=0.0,"Negative interference !"); } else if((xbt_dynar_length(workstation->incomming_communications)) && (!xbt_dynar_length(workstation->outgoing_communications))) { scale = workstation->interference_recv; @@ -500,7 +570,8 @@ static double share_cpu_KCCFLN05_resources(double now) scale -= ROUTE(action->src->id,action->dst->id).impact_on_dst * lmm_variable_getvalue(action->variable); } - xbt_assert0(scale>0.0,"Negative interference !"); + if(scale<0.0) scale=0.0; + xbt_assert0(scale>=0.0,"Negative interference !"); } else { scale = workstation->interference_send_recv; xbt_dynar_foreach (workstation->outgoing_communications,cpt,action) { @@ -511,7 +582,8 @@ static double share_cpu_KCCFLN05_resources(double now) scale -= ROUTE(action->src->id,action->dst->id).impact_on_dst_with_other_send * lmm_variable_getvalue(action->variable); } - xbt_assert0(scale>0.0,"Negative interference !"); + if(scale<0.0) scale=0.1; + xbt_assert0(scale>=0.0,"Negative interference !"); } lmm_update_constraint_bound(maxmin_system_cpu_KCCFLN05,workstation->constraint, W*scale); @@ -533,18 +605,18 @@ static void update_actions_cpu_KCCFLN05_state(double now, double delta) surf_cpu_resource->common_public->states.failed_action_set; xbt_swag_foreach_safe(action, next_action, running_actions) { - action->generic_action.remains -= - lmm_variable_getvalue(action->variable) * delta; + surf_double_update(&(action->generic_action.remains), + lmm_variable_getvalue(action->variable) * delta); if (action->generic_action.max_duration != NO_MAX_DURATION) action->generic_action.max_duration -= delta; if ((action->generic_action.remains <= 0) && (lmm_get_variable_weight(action->variable)>0)) { action->generic_action.finish = surf_get_clock(); - surf_action_change_state((surf_action_t) action, SURF_ACTION_DONE); + action_cpu_KCCFLN05_change_state((surf_action_t) action, SURF_ACTION_DONE); } else if ((action->generic_action.max_duration != NO_MAX_DURATION) && (action->generic_action.max_duration <= 0)) { action->generic_action.finish = surf_get_clock(); - surf_action_change_state((surf_action_t) action, SURF_ACTION_DONE); + action_cpu_KCCFLN05_change_state((surf_action_t) action, SURF_ACTION_DONE); } else { /* Need to check that none of the resource has failed */ lmm_constraint_t cnst = NULL; int i = 0; @@ -556,7 +628,7 @@ static void update_actions_cpu_KCCFLN05_state(double now, double delta) cpu = lmm_constraint_id(cnst); if (cpu->state_current == SURF_CPU_OFF) { action->generic_action.finish = surf_get_clock(); - surf_action_change_state((surf_action_t) action, SURF_ACTION_FAILED); + action_cpu_KCCFLN05_change_state((surf_action_t) action, SURF_ACTION_FAILED); break; } } @@ -602,47 +674,40 @@ static surf_action_t execute_KCCFLN05(void *cpu, double size) static void cpu_KCCFLN05_action_suspend(surf_action_t action) { - if(action->resource_type==(surf_resource_t)surf_network_resource) - lmm_update_variable_weight(maxmin_system_network_KCCFLN05, - ((surf_action_network_KCCFLN05_t) action)->variable, 0.0); - else if(action->resource_type==(surf_resource_t)surf_cpu_resource) - lmm_update_variable_weight(maxmin_system_cpu_KCCFLN05, - ((surf_action_cpu_KCCFLN05_t) action)->variable, 0.0); - else DIE_IMPOSSIBLE; + lmm_update_variable_weight(maxmin_system_cpu_KCCFLN05, + ((surf_action_cpu_KCCFLN05_t) action)->variable, 0.0); } static void cpu_KCCFLN05_action_resume(surf_action_t action) { - if(action->resource_type==(surf_resource_t)surf_network_resource) - lmm_update_variable_weight(maxmin_system_network_KCCFLN05, - ((surf_action_network_KCCFLN05_t) action)->variable, 1.0); - else if(action->resource_type==(surf_resource_t)surf_cpu_resource) - lmm_update_variable_weight(maxmin_system_cpu_KCCFLN05, - ((surf_action_cpu_KCCFLN05_t) action)->variable, 1.0); - else DIE_IMPOSSIBLE; + lmm_update_variable_weight(maxmin_system_cpu_KCCFLN05, + ((surf_action_cpu_KCCFLN05_t) action)->variable, 1.0); } static int cpu_KCCFLN05_action_is_suspended(surf_action_t action) { - if(action->resource_type==(surf_resource_t)surf_network_resource) - return (lmm_get_variable_weight(((surf_action_cpu_KCCFLN05_t) action)->variable) == 0.0); - if(action->resource_type==(surf_resource_t)surf_cpu_resource) - return (lmm_get_variable_weight(((surf_action_network_KCCFLN05_t) action)->variable) == 0.0); - DIE_IMPOSSIBLE; + return (lmm_get_variable_weight(((surf_action_cpu_KCCFLN05_t) action)->variable) == 0.0); } /************* workstation ************/ static void action_change_state(surf_action_t action, e_surf_action_state_t state) { - xbt_assert0(0, "Workstation is a virtual resource. I should not be there!"); - surf_action_change_state(action, state); + if(action->resource_type==(surf_resource_t)surf_network_resource) + surf_network_resource->common_public->action_change_state(action,state); + else if(action->resource_type==(surf_resource_t)surf_cpu_resource) + surf_cpu_resource->common_public->action_change_state(action,state); + else DIE_IMPOSSIBLE; return; } static void action_free(surf_action_t action) { - xbt_assert0(0, "Workstation is a virtual resource. I should not be there!"); + if(action->resource_type==(surf_resource_t)surf_network_resource) + surf_network_resource->common_public->action_free(action); + else if(action->resource_type==(surf_resource_t)surf_cpu_resource) + surf_cpu_resource->common_public->action_free(action); + else DIE_IMPOSSIBLE; return; } @@ -672,30 +737,31 @@ static void update_resource_state(void *id, static void action_suspend(surf_action_t action) { - xbt_assert0(action->resource_type == - ((surf_resource_t) surf_cpu_resource), - "Resource type mismatch"); - surf_cpu_resource->extension_public->suspend(action); + if(action->resource_type==(surf_resource_t)surf_network_resource) + surf_network_resource->common_public->suspend(action); + else if(action->resource_type==(surf_resource_t)surf_cpu_resource) + surf_cpu_resource->common_public->suspend(action); + else DIE_IMPOSSIBLE; } static void action_resume(surf_action_t action) { - xbt_assert0(action->resource_type == - ((surf_resource_t) surf_cpu_resource), - "Resource type mismatch"); - surf_cpu_resource->extension_public->resume(action); + if(action->resource_type==(surf_resource_t)surf_network_resource) + surf_network_resource->common_public->resume(action); + else if(action->resource_type==(surf_resource_t)surf_cpu_resource) + surf_cpu_resource->common_public->resume(action); + else DIE_IMPOSSIBLE; } static int action_is_suspended(surf_action_t action) { if(action->resource_type==(surf_resource_t)surf_network_resource) - return 0; + return surf_network_resource->common_public->is_suspended(action); if(action->resource_type==(surf_resource_t)surf_cpu_resource) - return surf_cpu_resource->extension_public->is_suspended(action); + return surf_cpu_resource->common_public->is_suspended(action); DIE_IMPOSSIBLE; } - /**************************************/ /********* Module creation ***********/ /**************************************/ @@ -751,7 +817,7 @@ static void cpu_KCCFLN05_resource_init_internal(void) surf_cpu_resource->common_public->action_free = action_cpu_KCCFLN05_free; surf_cpu_resource->common_public->action_cancel = NULL; surf_cpu_resource->common_public->action_recycle = NULL; - surf_cpu_resource->common_public->action_change_state = surf_action_change_state; + surf_cpu_resource->common_public->action_change_state = action_cpu_KCCFLN05_change_state; surf_cpu_resource->common_public->action_set_data = surf_action_set_data; surf_cpu_resource->common_public->name = "CPU KCCFLN05"; @@ -765,9 +831,10 @@ static void cpu_KCCFLN05_resource_init_internal(void) surf_cpu_resource->extension_public->execute = execute_KCCFLN05; /*FIXME*//* surf_cpu_resource->extension_public->sleep = action_sleep; */ - surf_cpu_resource->extension_public->suspend = cpu_KCCFLN05_action_suspend; - surf_cpu_resource->extension_public->resume = cpu_KCCFLN05_action_resume; - surf_cpu_resource->extension_public->is_suspended = cpu_KCCFLN05_action_is_suspended; + + surf_cpu_resource->common_public->suspend = cpu_KCCFLN05_action_suspend; + surf_cpu_resource->common_public->resume = cpu_KCCFLN05_action_resume; + surf_cpu_resource->common_public->is_suspended = cpu_KCCFLN05_action_is_suspended; surf_cpu_resource->extension_public->get_state = get_state; @@ -850,7 +917,11 @@ static void network_KCCFLN05_resource_init_internal(void) update_network_KCCFLN05_state; surf_network_resource->common_private->finalize = network_KCCFLN05_finalize; - surf_network_resource->extension_public->communicate = communicate_KCCFLN05; + surf_network_resource->common_public->suspend = network_KCCFLN05_action_suspend; + surf_network_resource->common_public->resume = network_KCCFLN05_action_resume; + surf_network_resource->common_public->is_suspended = network_KCCFLN05_action_is_suspended; + + surf_network_resource->extension_public->communicate = communicate_KCCFLN05; network_link_set = xbt_dict_new(); @@ -913,11 +984,13 @@ static void workstation_KCCFLN05_resource_init_internal(void) surf_workstation_resource->common_private->update_resource_state = update_resource_state; surf_workstation_resource->common_private->finalize = workstation_KCCFLN05_finalize; + + surf_workstation_resource->common_public->suspend = action_suspend; + surf_workstation_resource->common_public->resume = action_resume; + surf_workstation_resource->common_public->is_suspended = action_is_suspended; + surf_workstation_resource->extension_public->execute = execute_KCCFLN05; /*FIXME*//* surf_workstation_resource->extension_public->sleep = action_sleep; */ - surf_workstation_resource->extension_public->suspend = action_suspend; - surf_workstation_resource->extension_public->resume = action_resume; - surf_workstation_resource->extension_public->is_suspended = action_is_suspended; surf_workstation_resource->extension_public->get_state = get_state; surf_workstation_resource->extension_public->communicate = communicate_KCCFLN05; }