From: mquinson Date: Wed, 1 Jul 2009 10:43:12 +0000 (+0000) Subject: Rename some model methods to stick to getters/setters naming standards; further facto... X-Git-Tag: SVN~1218 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/824b99a5272ff8ce814336ab8bc9817eecd6de60 Rename some model methods to stick to getters/setters naming standards; further factorization of code between models git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6423 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/doc/simgrid.zargo b/doc/simgrid.zargo index d95eee664d..3afbe30cb3 100644 Binary files a/doc/simgrid.zargo and b/doc/simgrid.zargo differ diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 85cfe2ff4a..c4c501bec6 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -211,22 +211,23 @@ XBT_PUBLIC(int) find_model_description(s_surf_model_description_t * table, const char *name;/**< Name of this model */ s_surf_action_state_t states; /**< Any living action on this model */ - e_surf_action_state_t(*action_get_state) (surf_action_t action);/**< Return the state of an action */ + e_surf_action_state_t(*action_state_get) (surf_action_t action);/**< Return the state of an action */ + void (*action_state_set) (surf_action_t action, + e_surf_action_state_t state); /**< Change an action state*/ + double (*action_get_start_time) (surf_action_t action);/**< Return the start time of an action */ double (*action_get_finish_time) (surf_action_t action);/**< Return the finish time of an action */ void (*action_use) (surf_action_t action);/**< Set an action used */ int (*action_free) (surf_action_t action);/**< Free an action */ void (*action_cancel) (surf_action_t action);/**< Cancel a running action */ void (*action_recycle) (surf_action_t action);/**< Recycle an action */ - void (*action_change_state) (surf_action_t action, - e_surf_action_state_t state); - /**< Change an action state*/ - void (*action_set_data) (surf_action_t action, void *data);/**< Set the user data of an action */ + void (*action_data_set) (surf_action_t action, void *data);/**< Set the user data of an action */ void (*suspend) (surf_action_t action);/**< Suspend an action */ void (*resume) (surf_action_t action);/**< Resume a suspended action */ int (*is_suspended) (surf_action_t action);/**< Return whether an action is suspended */ void (*set_max_duration) (surf_action_t action, double duration);/**< Set the max duration of an action*/ void (*set_priority) (surf_action_t action, double priority);/**< Set the priority of an action */ + xbt_dict_t(*get_properties) (void *resource_id);/**< Return the properties dictionary */ xbt_dict_t resource_set; diff --git a/src/simdag/sd_task.c b/src/simdag/sd_task.c index 1e78900244..48cd3e80da 100644 --- a/src/simdag/sd_task.c +++ b/src/simdag/sd_task.c @@ -757,7 +757,7 @@ void __SD_task_really_run(SD_task_t task) xbt_free(surf_workstations); } - surf_workstation_model->action_set_data(task->surf_action, task); + surf_workstation_model->action_data_set(task->surf_action, task); DEBUG1("surf_action = %p", task->surf_action); diff --git a/src/simix/smx_action.c b/src/simix/smx_action.c index 3caade38a8..d588ae9d9a 100644 --- a/src/simix/smx_action.c +++ b/src/simix/smx_action.c @@ -57,7 +57,7 @@ smx_action_t SIMIX_action_communicate(smx_host_t sender, simdata->surf_action = surf_workstation_model->extension.workstation. communicate(sender->simdata->host, receiver->simdata->host, size, rate); - surf_workstation_model->action_set_data(simdata->surf_action, act); + surf_workstation_model->action_data_set(simdata->surf_action, act); DEBUG1("Create communicate action %p", act); return act; @@ -99,7 +99,7 @@ smx_action_t SIMIX_action_execute(smx_host_t host, const char *name, surf_workstation_model->extension.workstation.execute(host->simdata->host, amount); - surf_workstation_model->action_set_data(simdata->surf_action, act); + surf_workstation_model->action_data_set(simdata->surf_action, act); DEBUG1("Create execute action %p", act); return act; @@ -139,7 +139,7 @@ smx_action_t SIMIX_action_sleep(smx_host_t host, double duration) surf_workstation_model->extension.workstation.sleep(host->simdata->host, duration); - surf_workstation_model->action_set_data(simdata->surf_action, act); + surf_workstation_model->action_data_set(simdata->surf_action, act); DEBUG1("Create sleep action %p", act); return act; @@ -327,7 +327,7 @@ smx_action_t SIMIX_action_parallel_execute(char *name, int host_nb, computation_amount, communication_amount, amount, rate); - surf_workstation_model->action_set_data(simdata->surf_action, act); + surf_workstation_model->action_data_set(simdata->surf_action, act); return act; } @@ -335,7 +335,7 @@ smx_action_t SIMIX_action_parallel_execute(char *name, int host_nb, e_surf_action_state_t SIMIX_action_get_state(smx_action_t action) { xbt_assert0((action != NULL), "Invalid parameter"); - return surf_workstation_model->action_get_state(action->simdata-> + return surf_workstation_model->action_state_get(action->simdata-> surf_action); } diff --git a/src/surf/cpu.c b/src/surf/cpu.c index 47de2a4ee0..dd23290747 100644 --- a/src/surf/cpu.c +++ b/src/surf/cpu.c @@ -155,11 +155,11 @@ static void action_use(surf_action_t action) static void action_cancel(surf_action_t action) { - surf_action_change_state(action, SURF_ACTION_FAILED); + surf_action_state_set(action, SURF_ACTION_FAILED); return; } -static void action_change_state(surf_action_t action, +static void cpu_action_state_set(surf_action_t action, e_surf_action_state_t state) { /* if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */ @@ -168,7 +168,7 @@ static void action_change_state(surf_action_t action, /* ((surf_action_cpu_Cas01_t)action)->variable = NULL; */ /* } */ - surf_action_change_state(action, state); + surf_action_state_set(action, state); return; } @@ -199,11 +199,11 @@ static void update_actions_state(double now, double delta) if ((action->generic_action.remains <= 0) && (lmm_get_variable_weight(action->variable) > 0)) { action->generic_action.finish = surf_get_clock(); - action_change_state((surf_action_t) action, SURF_ACTION_DONE); + cpu_action_state_set((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(); - action_change_state((surf_action_t) action, SURF_ACTION_DONE); + cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE); } } @@ -233,11 +233,11 @@ static void update_resource_state(void *id, while ((var = lmm_get_var_from_cnst(cpu_maxmin_system, cnst, &elem))) { surf_action_t action = lmm_variable_id(var); - if (surf_action_get_state(action) == SURF_ACTION_RUNNING || - surf_action_get_state(action) == SURF_ACTION_READY || - surf_action_get_state(action) == SURF_ACTION_NOT_IN_THE_SYSTEM) { + if (surf_action_state_get(action) == SURF_ACTION_RUNNING || + surf_action_state_get(action) == SURF_ACTION_READY || + surf_action_state_get(action) == SURF_ACTION_NOT_IN_THE_SYSTEM) { action->finish = date; - action_change_state(action, SURF_ACTION_FAILED); + cpu_action_state_set(action, SURF_ACTION_FAILED); } } } @@ -399,12 +399,12 @@ static void surf_cpu_model_init_internal(void) running_action_set_that_does_not_need_being_checked = xbt_swag_new(xbt_swag_offset(action, state_hookup)); + surf_cpu_model->name = "CPU"; + surf_cpu_model->action_free = action_free; surf_cpu_model->action_use = action_use; surf_cpu_model->action_cancel = action_cancel; - surf_cpu_model->action_change_state = action_change_state; - surf_cpu_model->action_set_data = surf_action_set_data; - surf_cpu_model->name = "CPU"; + surf_cpu_model->action_state_set = cpu_action_state_set; surf_cpu_model->model_private->resource_used = resource_used; surf_cpu_model->model_private->share_resources = share_resources; diff --git a/src/surf/network.c b/src/surf/network.c index 97ce92d2c5..bf5f2872be 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -329,7 +329,7 @@ static void action_recycle(surf_action_t action) return; } -static void action_change_state(surf_action_t action, +static void network_action_state_set(surf_action_t action, e_surf_action_state_t state) { /* if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */ @@ -338,7 +338,7 @@ static void action_change_state(surf_action_t action, /* ((surf_action_network_CM02_t)action)->variable = NULL; */ /* } */ - surf_action_change_state(action, state); + surf_action_state_set(action, state); return; } @@ -401,11 +401,11 @@ static void update_actions_state(double now, double delta) if ((action->generic_action.remains <= 0) && (lmm_get_variable_weight(action->variable) > 0)) { action->generic_action.finish = surf_get_clock(); - action_change_state((surf_action_t) action, SURF_ACTION_DONE); + network_action_state_set((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(); - action_change_state((surf_action_t) action, SURF_ACTION_DONE); + network_action_state_set((surf_action_t) action, SURF_ACTION_DONE); } } @@ -479,10 +479,10 @@ static void update_resource_state(void *id, (network_maxmin_system, cnst, &elem))) { surf_action_t action = lmm_variable_id(var); - if (surf_action_get_state(action) == SURF_ACTION_RUNNING || - surf_action_get_state(action) == SURF_ACTION_READY) { + if (surf_action_state_get(action) == SURF_ACTION_RUNNING || + surf_action_state_get(action) == SURF_ACTION_READY) { action->finish = date; - action_change_state(action, SURF_ACTION_FAILED); + network_action_state_set(action, SURF_ACTION_FAILED); } } } @@ -679,13 +679,12 @@ static void surf_network_model_init_internal(void) { surf_network_model = surf_model_init(); + surf_network_model->name = "network"; surf_network_model->action_free = action_free; surf_network_model->action_use = action_use; surf_network_model->action_cancel = action_cancel; surf_network_model->action_recycle = action_recycle; - surf_network_model->action_change_state = action_change_state; - surf_network_model->action_set_data = surf_action_set_data; - surf_network_model->name = "network"; + surf_network_model->action_state_set = network_action_state_set; surf_network_model->model_private->resource_used = resource_used; surf_network_model->model_private->share_resources = share_resources; diff --git a/src/surf/network_constant.c b/src/surf/network_constant.c index 979b30a118..9b633521cc 100644 --- a/src/surf/network_constant.c +++ b/src/surf/network_constant.c @@ -111,10 +111,10 @@ static void action_recycle(surf_action_t action) return; } -static void action_change_state(surf_action_t action, +static void netcst_action_state_set(surf_action_t action, e_surf_action_state_t state) { - surf_action_change_state(action, state); + surf_action_state_set(action, state); return; } @@ -157,11 +157,11 @@ static void update_actions_state(double now, double delta) if (action->generic_action.remains <= 0) { action->generic_action.finish = surf_get_clock(); - action_change_state((surf_action_t) action, SURF_ACTION_DONE); + netcst_action_state_set((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(); - action_change_state((surf_action_t) action, SURF_ACTION_DONE); + netcst_action_state_set((surf_action_t) action, SURF_ACTION_DONE); } } @@ -279,13 +279,12 @@ static void surf_network_model_init_internal(void) { surf_network_model = surf_model_init(); + surf_network_model->name = "network constant"; surf_network_model->action_free = action_free; surf_network_model->action_use = action_use; surf_network_model->action_cancel = action_cancel; surf_network_model->action_recycle = action_recycle; - surf_network_model->action_change_state = action_change_state; - surf_network_model->action_set_data = surf_action_set_data; - surf_network_model->name = "network"; + surf_network_model->action_state_set = netcst_action_state_set; surf_network_model->model_private->resource_used = resource_used; surf_network_model->model_private->share_resources = share_resources; diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c index fb2c3035f1..75df16ab85 100644 --- a/src/surf/network_gtnets.c +++ b/src/surf/network_gtnets.c @@ -351,7 +351,7 @@ static void action_change_state(surf_action_t action, /* ((surf_action_network_GTNETS_t)action)->variable = NULL; */ /* } */ - surf_action_change_state(action, state); + surf_action_state_set(action, state); return; } @@ -527,17 +527,14 @@ static void surf_network_model_init_internal(void) { s_surf_action_t action; - surf_network_model = xbt_new0(s_surf_network_model_t, 1); + surf_network_model = surf_model_init(); - surf_model_init(surf_network_model); - - surf_network_model->common_public.action_use = action_use; - surf_network_model->common_public.action_free = action_free; - surf_network_model->common_public.action_cancel = action_cancel; - surf_network_model->common_public.action_recycle = action_recycle; - surf_network_model->common_public.action_change_state = action_change_state; - surf_network_model->common_public.action_set_data = surf_action_set_data; - surf_network_model->common_public.name = "network"; + surf_network_model->name = "network GTNetS"; + surf_network_model->action_use = action_use; + surf_network_model->action_free = action_free; + surf_network_model->action_cancel = action_cancel; + surf_network_model->action_recycle = action_recycle; + surf_network_model->action_change_state = action_change_state; surf_network_model->model_private->resource_used = resource_used; surf_network_model->model_private->share_resources = share_resources; @@ -547,14 +544,14 @@ static void surf_network_model_init_internal(void) update_resource_state; surf_network_model->model_private->finalize = finalize; - surf_network_model->common_public.suspend = action_suspend; - surf_network_model->common_public.resume = action_resume; - surf_network_model->common_public.is_suspended = action_is_suspended; + surf_network_model->suspend = action_suspend; + surf_network_model->resume = action_resume; + surf_network_model->is_suspended = action_is_suspended; surf_network_model->extension.network.communicate = communicate; /*for the props of the link */ - surf_network_model->common_public.get_properties = get_properties; + surf_network_model->get_properties = get_properties; link_set = xbt_dict_new(); diff --git a/src/surf/surf_action.c b/src/surf/surf_action.c index a08611996a..173f5c522e 100644 --- a/src/surf/surf_action.c +++ b/src/surf/surf_action.c @@ -16,7 +16,7 @@ const char *surf_action_state_names[6] = { "SURF_ACTION_NOT_IN_THE_SYSTEM" }; -e_surf_action_state_t surf_action_get_state(surf_action_t action) +e_surf_action_state_t surf_action_state_get(surf_action_t action) { surf_action_state_t action_state = &(action->model_type->states); @@ -48,7 +48,7 @@ void surf_action_free(surf_action_t * action) *action = NULL; } -void surf_action_change_state(surf_action_t action, +void surf_action_state_set(surf_action_t action, e_surf_action_state_t state) { surf_action_state_t action_state = &(action->model_type->states); @@ -71,7 +71,7 @@ void surf_action_change_state(surf_action_t action, XBT_OUT; } -void surf_action_set_data(surf_action_t action, void *data) +void surf_action_data_set(surf_action_t action, void *data) { action->data = data; } diff --git a/src/surf/surf_model.c b/src/surf/surf_model.c index a90c21374d..cd5993a8c0 100644 --- a/src/surf/surf_model.c +++ b/src/surf/surf_model.c @@ -39,9 +39,11 @@ surf_model_t surf_model_init(void) model->action_cancel = void_die_impossible_paction; model->action_recycle = void_die_impossible_paction; - model->action_get_state = surf_action_get_state; + model->action_state_get = surf_action_state_get; model->action_get_start_time = surf_action_get_start_time; model->action_get_finish_time = surf_action_get_finish_time; + model->action_data_set = surf_action_data_set; + return model; } diff --git a/src/surf/surf_model_timer.c b/src/surf/surf_model_timer.c index 707b400d0e..c5762ce391 100644 --- a/src/surf/surf_model_timer.c +++ b/src/surf/surf_model_timer.c @@ -61,7 +61,7 @@ static int resource_used(void *resource_id) return 1; } -static void action_change_state(surf_action_t action, +static void timer_action_state_set(surf_action_t action, e_surf_action_state_t state) { DIE_IMPOSSIBLE; @@ -159,9 +159,8 @@ static void surf_timer_model_init_internal(void) { surf_timer_model = surf_model_init(); - surf_timer_model->action_change_state = action_change_state; - surf_timer_model->action_set_data = surf_action_set_data; surf_timer_model->name = "TIMER"; + surf_timer_model->action_state_set = timer_action_state_set; surf_timer_model->model_private->resource_used = resource_used; surf_timer_model->model_private->share_resources = share_resources; diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h index 5e61f197cb..659bf9d9bb 100644 --- a/src/surf/surf_private.h +++ b/src/surf/surf_private.h @@ -54,13 +54,13 @@ double generic_maxmin_share_resources(xbt_swag_t running_actions, void (*solve) (lmm_system_t)); /* Generic functions common to all models */ -e_surf_action_state_t surf_action_get_state(surf_action_t action); +e_surf_action_state_t surf_action_state_get(surf_action_t action); double surf_action_get_start_time(surf_action_t action); double surf_action_get_finish_time(surf_action_t action); void surf_action_free(surf_action_t * action); -void surf_action_change_state(surf_action_t action, +void surf_action_state_set(surf_action_t action, e_surf_action_state_t state); -void surf_action_set_data(surf_action_t action, void *data); +void surf_action_data_set(surf_action_t action, void *data); FILE *surf_fopen(const char *name, const char *mode); extern tmgr_history_t history; diff --git a/src/surf/workstation.c b/src/surf/workstation.c index c2a178182d..bedebf25bf 100644 --- a/src/surf/workstation.c +++ b/src/surf/workstation.c @@ -107,15 +107,15 @@ static void action_cancel(surf_action_t action) return; } -static void action_change_state(surf_action_t action, +static void ws_action_state_set(surf_action_t action, e_surf_action_state_t state) { if (action->model_type == surf_network_model) - surf_network_model->action_change_state(action, state); + surf_network_model->action_state_set(action, state); else if (action->model_type == surf_cpu_model) - surf_cpu_model->action_change_state(action, state); + surf_cpu_model->action_state_set(action, state); else if (action->model_type == surf_workstation_model) - surf_action_change_state(action, state); + surf_action_state_set(action, state); else DIE_IMPOSSIBLE; return; @@ -288,14 +288,12 @@ static void finalize(void) static void surf_workstation_model_init_internal(void) { surf_workstation_model = surf_model_init(); -/* surf_workstation_model->extension_private = xbt_new0(s_surf_workstation_model_extension_private_t,1); */ + surf_workstation_model->name = "Workstation"; surf_workstation_model->action_free = action_free; surf_workstation_model->action_use = action_use; surf_workstation_model->action_cancel = action_cancel; - surf_workstation_model->action_change_state = action_change_state; - surf_workstation_model->action_set_data = surf_action_set_data; - surf_workstation_model->name = "Workstation"; + surf_workstation_model->action_state_set = ws_action_state_set; surf_workstation_model->model_private->resource_used = resource_used; surf_workstation_model->model_private->share_resources = share_resources; diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c index cddab82314..62e5d2d708 100644 --- a/src/surf/workstation_ptask_L07.c +++ b/src/surf/workstation_ptask_L07.c @@ -155,7 +155,7 @@ static int action_free(surf_action_t action) static void action_cancel(surf_action_t action) { - surf_action_change_state(action, SURF_ACTION_FAILED); + surf_action_state_set(action, SURF_ACTION_FAILED); return; } @@ -289,11 +289,11 @@ static void update_actions_state(double now, double 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); + surf_action_state_set((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); + surf_action_state_set((surf_action_t) action, SURF_ACTION_DONE); } else { /* Need to check that none of the model has failed */ lmm_constraint_t cnst = NULL; @@ -328,7 +328,7 @@ static void update_actions_state(double now, double delta) (((cpu_L07_t) constraint_id)->state_current == SURF_CPU_OFF))) { DEBUG1("Action (%p) Failed!!", action); action->generic_action.finish = surf_get_clock(); - surf_action_change_state((surf_action_t) action, + surf_action_state_set((surf_action_t) action, SURF_ACTION_FAILED); break; } @@ -988,8 +988,7 @@ static void model_init_internal(void) surf_workstation_model->action_use = action_use; surf_workstation_model->action_free = action_free; surf_workstation_model->action_cancel = action_cancel; - surf_workstation_model->action_change_state = surf_action_change_state; - surf_workstation_model->action_set_data = surf_action_set_data; + surf_workstation_model->action_state_set = surf_action_state_set; surf_workstation_model->suspend = action_suspend; surf_workstation_model->resume = action_resume; surf_workstation_model->is_suspended = action_is_suspended;