Move surf_action related function to a specific file

[simgrid.git] / src / surf / surf.c

diff --git a/src/surf/surf.c b/src/surf/surf.c
index 2c32aa7..0ac05fb 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -112,14 +112,6 @@ xbt_dynar_t model_list = NULL;
 tmgr_history_t history = NULL;
 lmm_system_t maxmin_system = NULL;
 xbt_dynar_t surf_path = NULL;
-const char *surf_action_state_names[6] = {
-  "SURF_ACTION_READY",
-  "SURF_ACTION_RUNNING",
-  "SURF_ACTION_FAILED",
-  "SURF_ACTION_DONE",
-  "SURF_ACTION_TO_FREE",
-  "SURF_ACTION_NOT_IN_THE_SYSTEM"
-};
 
 /* Don't forget to update the option description in smx_config when you change this */
 s_surf_model_description_t surf_network_model_description[] = {
@@ -236,67 +228,6 @@ double generic_maxmin_share_resources(xbt_swag_t running_actions,
   return min;
 }
 
-e_surf_action_state_t surf_action_get_state(surf_action_t action)
-{
-  surf_action_state_t action_state =
-    &(action->model_type->common_public.states);
-
-  if (action->state_set == action_state->ready_action_set)
-    return SURF_ACTION_READY;
-  if (action->state_set == action_state->running_action_set)
-    return SURF_ACTION_RUNNING;
-  if (action->state_set == action_state->failed_action_set)
-    return SURF_ACTION_FAILED;
-  if (action->state_set == action_state->done_action_set)
-    return SURF_ACTION_DONE;
-  return SURF_ACTION_NOT_IN_THE_SYSTEM;
-}
-
-double surf_action_get_start_time(surf_action_t action)
-{
-  return action->start;
-}
-
-double surf_action_get_finish_time(surf_action_t action)
-{
-  return action->finish;
-}
-
-void surf_action_free(surf_action_t * action)
-{
-  (*action)->model_type->common_public.action_cancel(*action);
-  free(*action);
-  *action = NULL;
-}
-
-void surf_action_change_state(surf_action_t action,
-                              e_surf_action_state_t state)
-{
-  surf_action_state_t action_state =
-    &(action->model_type->common_public.states);
-  XBT_IN2("(%p,%s)", action, surf_action_state_names[state]);
-  xbt_swag_remove(action, action->state_set);
-
-  if (state == SURF_ACTION_READY)
-    action->state_set = action_state->ready_action_set;
-  else if (state == SURF_ACTION_RUNNING)
-    action->state_set = action_state->running_action_set;
-  else if (state == SURF_ACTION_FAILED)
-    action->state_set = action_state->failed_action_set;
-  else if (state == SURF_ACTION_DONE)
-    action->state_set = action_state->done_action_set;
-  else
-    action->state_set = NULL;
-
-  if (action->state_set)
-    xbt_swag_insert(action, action->state_set);
-  XBT_OUT;
-}
-
-void surf_action_set_data(surf_action_t action, void *data)
-{
-  action->data = data;
-}
 
 XBT_LOG_EXTERNAL_CATEGORY(surf_cpu);
 XBT_LOG_EXTERNAL_CATEGORY(surf_kernel);
@@ -398,7 +329,7 @@ void surf_exit(void)
   surf_config_finalize();
 
   xbt_dynar_foreach(model_list, iter, model) {
-    model->common_private->finalize();
+    model->model_private->finalize();
   }
 
   if (maxmin_system) {
@@ -444,13 +375,13 @@ void surf_presolve(void)
     while ((event =
             tmgr_history_get_next_event_leq(history, next_event_date,
                                             &value, (void **) &resource))) {
-      resource->model->common_private->update_resource_state(resource,
-                                                             event, value,
-                                                             NOW);
+      resource->model->model_private->update_resource_state(resource,
+                                                            event, value,
+                                                            NOW);
     }
   }
   xbt_dynar_foreach(model_list, iter, model) {
-    model->common_private->update_actions_state(NOW, 0.0);
+    model->model_private->update_actions_state(NOW, 0.0);
   }
 }
 
@@ -469,10 +400,10 @@ double surf_solve(void)
 
   DEBUG0("Looking for next action end");
   xbt_dynar_foreach(model_list, iter, model) {
-    DEBUG1("Running for Resource [%s]", model->common_public.name);
-    model_next_action_end = model->common_private->share_resources(NOW);
+    DEBUG1("Running for Resource [%s]", model->name);
+    model_next_action_end = model->model_private->share_resources(NOW);
     DEBUG2("Resource [%s] : next action end = %f",
-           model->common_public.name, model_next_action_end);
+           model->name, model_next_action_end);
     if (((min < 0.0) || (model_next_action_end < min))
         && (model_next_action_end >= 0.0))
       min = model_next_action_end;
@@ -491,16 +422,16 @@ double surf_solve(void)
     while ((event =
             tmgr_history_get_next_event_leq(history, next_event_date,
                                             &value, (void **) &resource))) {
-      if (resource->model->common_private->resource_used(resource)) {
+      if (resource->model->model_private->resource_used(resource)) {
         min = next_event_date - NOW;
         DEBUG1
           ("This event will modify model state. Next event set to %f", min);
       }
       /* update state of model_obj according to new value. Does not touch lmm.
          It will be modified if needed when updating actions */
-      resource->model->common_private->update_resource_state(resource,
-                                                             event, value,
-                                                             NOW + min);
+      resource->model->model_private->update_resource_state(resource,
+                                                            event, value,
+                                                            NOW + min);
     }
   }
 
@@ -509,7 +440,7 @@ double surf_solve(void)
   NOW = NOW + min;
 
   xbt_dynar_foreach(model_list, iter, model) {
-    model->common_private->update_actions_state(NOW, min);
+    model->model_private->update_actions_state(NOW, min);
   }
 
   return min;