Chord: reproduce the scenario of the Oversim paper

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

diff --git a/src/surf/surf_action.c b/src/surf/surf_action.c
index 4e4707f..2c34a4e 100644 (file)
--- a/src/surf/surf_action.c
+++ b/src/surf/surf_action.c
@@ -1,4 +1,5 @@
-/* Copyright (c) 2009 The SimGrid Team. All rights reserved.                */
+/* Copyright (c) 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -32,6 +33,9 @@ void *surf_action_new(size_t size, double cost, surf_model_t model,
   action->start = surf_get_clock();
   action->finish = -1.0;
   action->model_type = model;
+#ifdef HAVE_TRACING
+  action->category = NULL;
+#endif
 
   if (failed)
     action->state_set = model->states.failed_action_set;
@@ -58,12 +62,12 @@ e_surf_action_state_t surf_action_state_get(surf_action_t action)
   return SURF_ACTION_NOT_IN_THE_SYSTEM;
 }
 
-XBT_INLINE double surf_action_get_start_time(surf_action_t action)
+double surf_action_get_start_time(surf_action_t action)
 {
   return action->start;
 }
 
-XBT_INLINE double surf_action_get_finish_time(surf_action_t action)
+double surf_action_get_finish_time(surf_action_t action)
 {
   /* keep the function behavior, some models (cpu_ti) change the finish time before the action end */
   return action->remains == 0 ? action->finish : -1;
@@ -76,7 +80,8 @@ XBT_INLINE void surf_action_free(surf_action_t * action)
   *action = NULL;
 }
 
-void surf_action_state_set(surf_action_t action, e_surf_action_state_t state)
+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);
   XBT_IN2("(%p,%s)", action, surf_action_state_names[state]);
@@ -98,7 +103,7 @@ void surf_action_state_set(surf_action_t action, e_surf_action_state_t state)
   XBT_OUT;
 }
 
-XBT_INLINE void surf_action_data_set(surf_action_t action, void *data)
+void surf_action_data_set(surf_action_t action, void *data)
 {
   action->data = data;
 }