From: mquinson Date: Wed, 1 Jul 2009 09:52:11 +0000 (+0000) Subject: Get surf_model_init set fields to common values about actions to kill dupplicated... X-Git-Tag: SVN~1222 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/0bddb56a8a47a2cfa01bfe51c22dca758e5700d6 Get surf_model_init set fields to common values about actions to kill dupplicated code git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6419 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/src/surf/cpu.c b/src/surf/cpu.c index a13c7980a3..47de2a4ee0 100644 --- a/src/surf/cpu.c +++ b/src/surf/cpu.c @@ -399,9 +399,6 @@ 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->action_get_state = surf_action_get_state; - surf_cpu_model->action_get_start_time = surf_action_get_start_time; - surf_cpu_model->action_get_finish_time = surf_action_get_finish_time; surf_cpu_model->action_free = action_free; surf_cpu_model->action_use = action_use; surf_cpu_model->action_cancel = action_cancel; diff --git a/src/surf/network.c b/src/surf/network.c index 1f03ed3dc1..97ce92d2c5 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -679,9 +679,6 @@ static void surf_network_model_init_internal(void) { surf_network_model = surf_model_init(); - surf_network_model->action_get_state = surf_action_get_state; - surf_network_model->action_get_start_time = surf_action_get_start_time; - surf_network_model->action_get_finish_time = surf_action_get_finish_time; surf_network_model->action_free = action_free; surf_network_model->action_use = action_use; surf_network_model->action_cancel = action_cancel; diff --git a/src/surf/network_constant.c b/src/surf/network_constant.c index f04861b0a6..979b30a118 100644 --- a/src/surf/network_constant.c +++ b/src/surf/network_constant.c @@ -279,9 +279,6 @@ static void surf_network_model_init_internal(void) { surf_network_model = surf_model_init(); - surf_network_model->action_get_state = surf_action_get_state; - surf_network_model->action_get_start_time = surf_action_get_start_time; - surf_network_model->action_get_finish_time = surf_action_get_finish_time; surf_network_model->action_free = action_free; surf_network_model->action_use = action_use; surf_network_model->action_cancel = action_cancel; diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c index 21f23c7a07..fb2c3035f1 100644 --- a/src/surf/network_gtnets.c +++ b/src/surf/network_gtnets.c @@ -531,7 +531,6 @@ static void surf_network_model_init_internal(void) surf_model_init(surf_network_model); - surf_network_model->common_public.action_get_state = surf_action_get_state; 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; diff --git a/src/surf/surf_model.c b/src/surf/surf_model.c index 02104c2aaf..a90c21374d 100644 --- a/src/surf/surf_model.c +++ b/src/surf/surf_model.c @@ -39,6 +39,10 @@ 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_get_start_time = surf_action_get_start_time; + model->action_get_finish_time = surf_action_get_finish_time; + return model; } /** @brief finalize common datastructures to all models */ diff --git a/src/surf/surf_model_timer.c b/src/surf/surf_model_timer.c index 5a3a740a0b..707b400d0e 100644 --- a/src/surf/surf_model_timer.c +++ b/src/surf/surf_model_timer.c @@ -159,7 +159,6 @@ static void surf_timer_model_init_internal(void) { surf_timer_model = surf_model_init(); - surf_timer_model->action_get_state = surf_action_get_state; surf_timer_model->action_change_state = action_change_state; surf_timer_model->action_set_data = surf_action_set_data; surf_timer_model->name = "TIMER"; diff --git a/src/surf/workstation.c b/src/surf/workstation.c index 4a33095771..c2a178182d 100644 --- a/src/surf/workstation.c +++ b/src/surf/workstation.c @@ -290,10 +290,6 @@ 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->action_get_state = surf_action_get_state; - surf_workstation_model->action_get_start_time = surf_action_get_start_time; - surf_workstation_model->action_get_finish_time = - surf_action_get_finish_time; surf_workstation_model->action_free = action_free; surf_workstation_model->action_use = action_use; surf_workstation_model->action_cancel = action_cancel; diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c index ea27318c62..cddab82314 100644 --- a/src/surf/workstation_ptask_L07.c +++ b/src/surf/workstation_ptask_L07.c @@ -985,10 +985,6 @@ static void model_init_internal(void) { surf_workstation_model = surf_model_init(); - surf_workstation_model->action_get_state = surf_action_get_state; - surf_workstation_model->action_get_start_time = surf_action_get_start_time; - surf_workstation_model->action_get_finish_time = - surf_action_get_finish_time; surf_workstation_model->action_use = action_use; surf_workstation_model->action_free = action_free; surf_workstation_model->action_cancel = action_cancel;