From 824b99a5272ff8ce814336ab8bc9817eecd6de60 Mon Sep 17 00:00:00 2001 From: mquinson Date: Wed, 1 Jul 2009 10:43:12 +0000 Subject: [PATCH] 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 --- doc/simgrid.zargo | Bin 14777 -> 15885 bytes src/include/surf/surf.h | 11 ++++++----- src/simdag/sd_task.c | 2 +- src/simix/smx_action.c | 10 +++++----- src/surf/cpu.c | 24 ++++++++++++------------ src/surf/network.c | 19 +++++++++---------- src/surf/network_constant.c | 13 ++++++------- src/surf/network_gtnets.c | 27 ++++++++++++--------------- src/surf/surf_action.c | 6 +++--- src/surf/surf_model.c | 4 +++- src/surf/surf_model_timer.c | 5 ++--- src/surf/surf_private.h | 6 +++--- src/surf/workstation.c | 14 ++++++-------- src/surf/workstation_ptask_L07.c | 11 +++++------ 14 files changed, 73 insertions(+), 79 deletions(-) diff --git a/doc/simgrid.zargo b/doc/simgrid.zargo index d95eee664dc1c9f7cfda350e9bd59fa540c49d88..3afbe30cb3de780a43a6573b45b0ebf3af76a8e1 100644 GIT binary patch delta 15267 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 delta 14179 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 Q4CW(8f`fr!asJc#UoxzU-~a#s 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; -- 2.20.1