implement a constructor for surf_action_t; draft a surf_action_maxmin_t for actions...

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

diff --git a/src/surf/surf_action.c b/src/surf/surf_action.c
index a086119..a3d5d55 100644 (file)
--- a/src/surf/surf_action.c
+++ b/src/surf/surf_action.c
@@ -7,6 +7,10 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel);
 
+/*
+ * Generic action
+ */
+
 const char *surf_action_state_names[6] = {
   "SURF_ACTION_READY",
   "SURF_ACTION_RUNNING",
@@ -16,7 +20,28 @@ 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)
+void* surf_action_new(size_t size,double cost,surf_model_t model,int failed) {
+  surf_action_t action = xbt_malloc0(size);
+  action->refcount = 1;
+  action->cost = cost;
+  action->remains = cost;
+  action->priority = 1.0;
+  action->max_duration = NO_MAX_DURATION;
+  action->start = surf_get_clock();
+  action->finish = -1.0;
+  action->model_type = model;
+
+  if (failed)
+    action->state_set = model->states.failed_action_set;
+  else
+    action->state_set = model->states.running_action_set;
+
+  xbt_swag_insert(action, action->state_set);
+
+  return 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 +73,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 +96,21 @@ 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;
 }
+
+void surf_action_ref(surf_action_t action)
+{
+  action->refcount++;
+}
+/*
+void surf_action_suspend(surf_action_t action)
+{
+  action->suspended = 1;
+}*/
+
+/*
+ * Maxmin action
+ */