From: alegrand Date: Mon, 13 Jun 2005 19:02:43 +0000 (+0000) Subject: Add a new function action_use that help to delay the free of an action. It helps... X-Git-Tag: v3.3~3988 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/41964ff94baca68cd488f6f7181b90c1ed547781 Add a new function action_use that help to delay the free of an action. It helps when many people are using the same action. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1367 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 0dfb43eb2b..c3bc5c984f 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -24,6 +24,7 @@ typedef enum { SURF_ACTION_RUNNING, /* Running */ SURF_ACTION_FAILED, /* Task Failure */ SURF_ACTION_DONE, /* Completed */ + SURF_ACTION_TO_FREE, /* Action to free in next cleanup */ SURF_ACTION_NOT_IN_THE_SYSTEM /* Not in the system anymore. Why did you ask ? */ } e_surf_action_state_t; @@ -48,6 +49,7 @@ typedef struct surf_action { double finish; /* finish time : this is modified during the run * and fluctuates until the task is completed */ void *data; /* for your convenience */ + int using; surf_resource_t resource_type; } s_surf_action_t; @@ -62,7 +64,8 @@ typedef struct surf_resource_public { const char *(*get_resource_name) (void *resource_id); e_surf_action_state_t(*action_get_state) (surf_action_t action); - void (*action_free) (surf_action_t action); + void (*action_use) (surf_action_t action); + int (*action_free) (surf_action_t action); void (*action_cancel) (surf_action_t action); void (*action_recycle) (surf_action_t action); void (*action_change_state) (surf_action_t action, diff --git a/src/surf/cpu.c b/src/surf/cpu.c index cd3024a830..36774f132a 100644 --- a/src/surf/cpu.c +++ b/src/surf/cpu.c @@ -104,14 +104,22 @@ static int resource_used(void *resource_id) ((cpu_Cas01_t) resource_id)->constraint); } -static void action_free(surf_action_t action) +static int action_free(surf_action_t action) { - xbt_swag_remove(action, action->state_set); - if(((surf_action_cpu_Cas01_t)action)->variable) - lmm_variable_free(maxmin_system, ((surf_action_cpu_Cas01_t)action)->variable); - free(action); + action->using--; + if(!action->using) { + xbt_swag_remove(action, action->state_set); + if(((surf_action_cpu_Cas01_t)action)->variable) + lmm_variable_free(maxmin_system, ((surf_action_cpu_Cas01_t)action)->variable); + free(action); + return 1; + } + return 0; +} - return; +static void action_use(surf_action_t action) +{ + action->using++; } static void action_cancel(surf_action_t action) @@ -127,11 +135,11 @@ static void action_recycle(surf_action_t action) static void action_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_Cas01_t)action)->variable) { - lmm_variable_disable(maxmin_system, ((surf_action_cpu_Cas01_t)action)->variable); - ((surf_action_cpu_Cas01_t)action)->variable = NULL; - } +/* if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */ +/* if(((surf_action_cpu_Cas01_t)action)->variable) { */ +/* lmm_variable_disable(maxmin_system, ((surf_action_cpu_Cas01_t)action)->variable); */ +/* ((surf_action_cpu_Cas01_t)action)->variable = NULL; */ +/* } */ surf_action_change_state(action, state); return; @@ -218,6 +226,7 @@ static surf_action_t execute(void *cpu, double size) action = xbt_new0(s_surf_action_cpu_Cas01_t, 1); + action->generic_action.using = 1; action->generic_action.cost = size; action->generic_action.remains = size; action->generic_action.max_duration = NO_MAX_DURATION; @@ -318,6 +327,7 @@ static void surf_cpu_resource_init_internal(void) surf_cpu_resource->common_public->action_get_state = surf_action_get_state; surf_cpu_resource->common_public->action_free = action_free; + surf_cpu_resource->common_public->action_use = action_use; surf_cpu_resource->common_public->action_cancel = action_cancel; surf_cpu_resource->common_public->action_recycle = action_recycle; surf_cpu_resource->common_public->action_change_state = diff --git a/src/surf/maxmin.c b/src/surf/maxmin.c index 8c6ba2d443..fc590cca0c 100644 --- a/src/surf/maxmin.c +++ b/src/surf/maxmin.c @@ -270,6 +270,7 @@ void lmm_solve(lmm_system_t sys) /* Init */ var_list = &(sys->variable_set); + DEBUG1("Variable set : %d", xbt_swag_size(var_list)); xbt_swag_foreach(var, var_list) { var->value = 0.0; } @@ -278,6 +279,7 @@ void lmm_solve(lmm_system_t sys) /* Compute Usage and store the variables that reach the maximum */ cnst_list = &(sys->active_constraint_set); + DEBUG1("cnst_list : %d", xbt_swag_size(cnst_list)); xbt_swag_foreach(cnst, cnst_list) { /* INIT */ elem_list = &(cnst->element_set); @@ -303,7 +305,6 @@ void lmm_solve(lmm_system_t sys) /* Fix the variables that have to be */ var_list = &(sys->saturated_variable_set); - xbt_swag_foreach(var, var_list) { /* First check if some of these variables have reach their upper bound and update min_usage accordingly. */ diff --git a/src/surf/network.c b/src/surf/network.c index f16fe4d265..f9abb9de5b 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -208,14 +208,22 @@ static int resource_used(void *resource_id) ((network_link_CM02_t) resource_id)->constraint); } -static void action_free(surf_action_t action) +static int action_free(surf_action_t action) { - xbt_swag_remove(action, action->state_set); - if(((surf_action_network_CM02_t)action)->variable) - lmm_variable_free(maxmin_system, ((surf_action_network_CM02_t)action)->variable); - free(action); + action->using--; + if(!action->using) { + xbt_swag_remove(action, action->state_set); + if(((surf_action_network_CM02_t)action)->variable) + lmm_variable_free(maxmin_system, ((surf_action_network_CM02_t)action)->variable); + free(action); + return 1; + } + return 0; +} - return; +static void action_use(surf_action_t action) +{ + action->using++; } static void action_cancel(surf_action_t action) @@ -231,11 +239,11 @@ static void action_recycle(surf_action_t action) static void action_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_CM02_t)action)->variable) { - lmm_variable_disable(maxmin_system, ((surf_action_network_CM02_t)action)->variable); - ((surf_action_network_CM02_t)action)->variable = NULL; - } +/* if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */ +/* if(((surf_action_network_CM02_t)action)->variable) { */ +/* lmm_variable_disable(maxmin_system, ((surf_action_network_CM02_t)action)->variable); */ +/* ((surf_action_network_CM02_t)action)->variable = NULL; */ +/* } */ surf_action_change_state(action, state); return; @@ -370,6 +378,7 @@ static surf_action_t communicate(void *src, void *dst, double size, double rate) action = xbt_new0(s_surf_action_network_CM02_t, 1); + action->generic_action.using = 1; action->generic_action.cost = size; action->generic_action.remains = size; action->generic_action.max_duration = NO_MAX_DURATION; @@ -492,6 +501,7 @@ static void surf_network_resource_init_internal(void) surf_network_resource->common_public->action_get_state = surf_action_get_state; surf_network_resource->common_public->action_free = action_free; + surf_network_resource->common_public->action_use = action_use; surf_network_resource->common_public->action_cancel = action_cancel; surf_network_resource->common_public->action_recycle = action_recycle; surf_network_resource->common_public->action_change_state = diff --git a/src/surf/network_dassf.c b/src/surf/network_dassf.c index 4443248521..c0f80ee467 100644 --- a/src/surf/network_dassf.c +++ b/src/surf/network_dassf.c @@ -207,14 +207,16 @@ static int resource_used(void *resource_id) ((network_link_DASSF_t) resource_id)->constraint); } -static void action_free(surf_action_t action) +static int action_free(surf_action_t action) { - xbt_swag_remove(action, action->state_set); - if(((surf_action_network_DASSF_t)action)->variable) - lmm_variable_free(maxmin_system, ((surf_action_network_DASSF_t)action)->variable); - free(action); - - return; + action->using--; + if(!action->using) { + xbt_swag_remove(action, action->state_set); + if(((surf_action_network_DASSF_t)action)->variable) + lmm_variable_free(maxmin_system, ((surf_action_network_DASSF_t)action)->variable); + free(action); + } + return 1; } static void action_cancel(surf_action_t action) @@ -230,11 +232,11 @@ static void action_recycle(surf_action_t action) static void action_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_DASSF_t)action)->variable) { - lmm_variable_disable(maxmin_system, ((surf_action_network_DASSF_t)action)->variable); - ((surf_action_network_DASSF_t)action)->variable = NULL; - } +/* if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */ +/* if(((surf_action_network_DASSF_t)action)->variable) { */ +/* lmm_variable_disable(maxmin_system, ((surf_action_network_DASSF_t)action)->variable); */ +/* ((surf_action_network_DASSF_t)action)->variable = NULL; */ +/* } */ surf_action_change_state(action, state); return; @@ -369,6 +371,7 @@ static surf_action_t communicate(void *src, void *dst, double size, double rate) action = xbt_new0(s_surf_action_network_DASSF_t, 1); + action->generic_action.using = 1; action->generic_action.cost = size; action->generic_action.remains = size; action->generic_action.max_duration = NO_MAX_DURATION; diff --git a/src/surf/surf_timer.c b/src/surf/surf_timer.c index 7f0dd60350..57b852c43a 100644 --- a/src/surf/surf_timer.c +++ b/src/surf/surf_timer.c @@ -68,10 +68,10 @@ static int resource_used(void *resource_id) return 1; } -static void action_free(surf_action_t action) +static int action_free(surf_action_t action) { DIE_IMPOSSIBLE; - return; + return 1; } static void action_cancel(surf_action_t action) diff --git a/src/surf/workstation.c b/src/surf/workstation.c index e617fa7c20..386b548bdd 100644 --- a/src/surf/workstation.c +++ b/src/surf/workstation.c @@ -73,12 +73,23 @@ static int resource_used(void *resource_id) return 0; } -static void action_free(surf_action_t action) +static int action_free(surf_action_t action) { if(action->resource_type==(surf_resource_t)surf_network_resource) - surf_network_resource->common_public->action_free(action); + return 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); + return surf_cpu_resource->common_public->action_free(action); + else DIE_IMPOSSIBLE; + return 0; +} + + +static void action_use(surf_action_t action) +{ + if(action->resource_type==(surf_resource_t)surf_network_resource) + surf_network_resource->common_public->action_use(action); + else if(action->resource_type==(surf_resource_t)surf_cpu_resource) + surf_cpu_resource->common_public->action_use(action); else DIE_IMPOSSIBLE; return; } @@ -223,6 +234,7 @@ static void surf_workstation_resource_init_internal(void) surf_workstation_resource->common_public->action_get_state = surf_action_get_state; surf_workstation_resource->common_public->action_free = action_free; + surf_workstation_resource->common_public->action_use = action_use; surf_workstation_resource->common_public->action_cancel = action_cancel; surf_workstation_resource->common_public->action_recycle = action_recycle; diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c index 94af7170ca..5803d35988 100644 --- a/src/surf/workstation_KCCFLN05.c +++ b/src/surf/workstation_KCCFLN05.c @@ -354,33 +354,39 @@ static void update_network_KCCFLN05_state(void *id, /*************** actions **************/ /**************************************/ /*************** network **************/ -static void action_network_KCCFLN05_free(surf_action_t action) +static int action_network_KCCFLN05_free(surf_action_t action) { int cpt; surf_action_t act = NULL; workstation_KCCFLN05_t src = ((surf_action_network_KCCFLN05_t) action)->src; workstation_KCCFLN05_t dst = ((surf_action_network_KCCFLN05_t) action)->dst; - xbt_swag_remove(action, action->state_set); - if(((surf_action_network_KCCFLN05_t)action)->variable) - lmm_variable_free(maxmin_system_network_KCCFLN05, - ((surf_action_network_KCCFLN05_t) action)->variable); - - xbt_dynar_foreach (src->outgoing_communications,cpt,act) { - if(act==action) { - xbt_dynar_remove_at(src->outgoing_communications, cpt, &act); - break; + action->using--; + if(!action->using) { + + xbt_swag_remove(action, action->state_set); + if(((surf_action_network_KCCFLN05_t)action)->variable) + lmm_variable_free(maxmin_system_network_KCCFLN05, + ((surf_action_network_KCCFLN05_t) action)->variable); + + xbt_dynar_foreach (src->outgoing_communications,cpt,act) { + if(act==action) { + xbt_dynar_remove_at(src->outgoing_communications, cpt, &act); + break; + } } - } - - xbt_dynar_foreach (dst->incomming_communications,cpt,act) { - if(act==action) { - xbt_dynar_remove_at(dst->incomming_communications, cpt, &act); - break; + + xbt_dynar_foreach (dst->incomming_communications,cpt,act) { + if(act==action) { + xbt_dynar_remove_at(dst->incomming_communications, cpt, &act); + break; + } } + + free(action); + return 1; } - - free(action); + return 0; } static double share_network_KCCFLN05_resources(double now) @@ -400,12 +406,12 @@ static void action_network_KCCFLN05_change_state(surf_action_t action, workstation_KCCFLN05_t src = ((surf_action_network_KCCFLN05_t) action)->src; workstation_KCCFLN05_t dst = ((surf_action_network_KCCFLN05_t) action)->dst; - if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) - if(((surf_action_network_KCCFLN05_t)action)->variable) { - lmm_variable_disable(maxmin_system_network_KCCFLN05, - ((surf_action_network_KCCFLN05_t)action)->variable); - ((surf_action_network_KCCFLN05_t)action)->variable = NULL; - } +/* if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */ +/* if(((surf_action_network_KCCFLN05_t)action)->variable) { */ +/* lmm_variable_disable(maxmin_system_network_KCCFLN05, */ +/* ((surf_action_network_KCCFLN05_t)action)->variable); */ +/* ((surf_action_network_KCCFLN05_t)action)->variable = NULL; */ +/* } */ xbt_dynar_foreach (src->outgoing_communications,cpt,act) { if(act==action) { @@ -465,6 +471,7 @@ static surf_action_t communicate_KCCFLN05(void *src, void *dst, double size, action = xbt_new0(s_surf_action_network_KCCFLN05_t, 1); + action->generic_action.using = 1; action->generic_action.cost = size; action->generic_action.remains = size; action->generic_action.max_duration = NO_MAX_DURATION; @@ -520,23 +527,28 @@ static int network_KCCFLN05_action_is_suspended(surf_action_t action) } /***************** CPU ****************/ -static void action_cpu_KCCFLN05_free(surf_action_t action) +static int action_cpu_KCCFLN05_free(surf_action_t action) { - xbt_swag_remove(action, action->state_set); - if(((surf_action_cpu_KCCFLN05_t)action)->variable) - lmm_variable_free(maxmin_system_cpu_KCCFLN05, ((surf_action_cpu_KCCFLN05_t)action)->variable); - free(action); + action->using--; + if(!action->using) { + xbt_swag_remove(action, action->state_set); + if(((surf_action_cpu_KCCFLN05_t)action)->variable) + lmm_variable_free(maxmin_system_cpu_KCCFLN05, ((surf_action_cpu_KCCFLN05_t)action)->variable); + free(action); + return 1; + } + return 0; } 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_disable(maxmin_system_cpu_KCCFLN05, - ((surf_action_cpu_KCCFLN05_t)action)->variable); - ((surf_action_cpu_KCCFLN05_t)action)->variable = NULL; - } +/* if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */ +/* if(((surf_action_cpu_KCCFLN05_t)action)->variable) { */ +/* lmm_variable_disable(maxmin_system_cpu_KCCFLN05, */ +/* ((surf_action_cpu_KCCFLN05_t)action)->variable); */ +/* ((surf_action_cpu_KCCFLN05_t)action)->variable = NULL; */ +/* } */ surf_action_change_state(action, state); return; @@ -669,6 +681,7 @@ static surf_action_t execute_KCCFLN05(void *cpu, double size) action = xbt_new0(s_surf_action_cpu_KCCFLN05_t, 1); + action->generic_action.using = 1; action->generic_action.cost = size; action->generic_action.remains = size; action->generic_action.max_duration = NO_MAX_DURATION; @@ -721,12 +734,22 @@ static void action_change_state(surf_action_t action, return; } -static void action_free(surf_action_t action) +static int action_free(surf_action_t action) +{ + if(action->resource_type==(surf_resource_t)surf_network_resource) + return surf_network_resource->common_public->action_free(action); + else if(action->resource_type==(surf_resource_t)surf_cpu_resource) + return surf_cpu_resource->common_public->action_free(action); + else DIE_IMPOSSIBLE; + return 1; +} + +static void action_use(surf_action_t action) { if(action->resource_type==(surf_resource_t)surf_network_resource) - surf_network_resource->common_public->action_free(action); + surf_network_resource->common_public->action_use(action); else if(action->resource_type==(surf_resource_t)surf_cpu_resource) - surf_cpu_resource->common_public->action_free(action); + surf_cpu_resource->common_public->action_use(action); else DIE_IMPOSSIBLE; return; } @@ -992,6 +1015,7 @@ static void workstation_KCCFLN05_resource_init_internal(void) surf_workstation_resource->common_public->action_get_state = surf_action_get_state; surf_workstation_resource->common_public->action_free = action_free; + surf_workstation_resource->common_public->action_use = action_use; surf_workstation_resource->common_public->action_cancel = NULL; surf_workstation_resource->common_public->action_recycle = NULL; surf_workstation_resource->common_public->action_change_state = action_change_state;