Factorize the code of model->action_state_set where possible

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6424 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/surf/network.c b/src/surf/network.c
index bf5f287..e0e2eae 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -329,19 +329,6 @@ static void action_recycle(surf_action_t action)
   return;
 }
 
-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)) */
-/*     if(((surf_action_network_CM02_t)action)->variable) { */
-/*       lmm_variable_disable(network_maxmin_system, ((surf_action_network_CM02_t)action)->variable); */
-/*       ((surf_action_network_CM02_t)action)->variable = NULL; */
-/*     } */
-
-  surf_action_state_set(action, state);
-  return;
-}
-
 static double share_resources(double now)
 {
   s_surf_action_network_CM02_t s_action;
@@ -401,11 +388,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();
-      network_action_state_set((surf_action_t) action, SURF_ACTION_DONE);
+      surf_network_model->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();
-      network_action_state_set((surf_action_t) action, SURF_ACTION_DONE);
+      surf_network_model->action_state_set((surf_action_t) action, SURF_ACTION_DONE);
     }
   }
 
@@ -482,7 +469,7 @@ static void update_resource_state(void *id,
         if (surf_action_state_get(action) == SURF_ACTION_RUNNING ||
             surf_action_state_get(action) == SURF_ACTION_READY) {
           action->finish = date;
-          network_action_state_set(action, SURF_ACTION_FAILED);
+          surf_network_model->action_state_set(action, SURF_ACTION_FAILED);
         }
       }
     }
@@ -684,7 +671,6 @@ static void surf_network_model_init_internal(void)
   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_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 9b63352..96b3485 100644 (file)
--- a/src/surf/network_constant.c
+++ b/src/surf/network_constant.c
@@ -111,13 +111,6 @@ static void action_recycle(surf_action_t action)
   return;
 }
 
-static void netcst_action_state_set(surf_action_t action,
-                                e_surf_action_state_t state)
-{
-  surf_action_state_set(action, state);
-  return;
-}
-
 static double share_resources(double now)
 {
   surf_action_network_Constant_t action = NULL;
@@ -157,11 +150,11 @@ static void update_actions_state(double now, double delta)
 
     if (action->generic_action.remains <= 0) {
       action->generic_action.finish = surf_get_clock();
-      netcst_action_state_set((surf_action_t) action, SURF_ACTION_DONE);
+      surf_network_model->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();
-      netcst_action_state_set((surf_action_t) action, SURF_ACTION_DONE);
+      surf_network_model->action_state_set((surf_action_t) action, SURF_ACTION_DONE);
     }
   }
 
@@ -284,7 +277,6 @@ static void surf_network_model_init_internal(void)
   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_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/surf_model.c b/src/surf/surf_model.c
index cd5993a..6013ce1 100644 (file)
--- a/src/surf/surf_model.c
+++ b/src/surf/surf_model.c
@@ -40,6 +40,7 @@ surf_model_t surf_model_init(void)
   model->action_recycle = void_die_impossible_paction;
 
   model->action_state_get = surf_action_state_get;
+  model->action_state_set = surf_action_state_set;
   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;