Multicore model now enabled with Cas01.

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

diff --git a/src/surf/surf_action.c b/src/surf/surf_action.c
index a3d5d55..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. */
@@ -20,7 +21,9 @@ const char *surf_action_state_names[6] = {
   "SURF_ACTION_NOT_IN_THE_SYSTEM"
 };
 
-void* surf_action_new(size_t size,double cost,surf_model_t model,int failed) {
+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;
@@ -30,6 +33,9 @@ void* surf_action_new(size_t size,double cost,surf_model_t model,int failed) {
   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;
@@ -63,10 +69,11 @@ double surf_action_get_start_time(surf_action_t action)
 
 double surf_action_get_finish_time(surf_action_t action)
 {
-  return action->finish;
+  /* keep the function behavior, some models (cpu_ti) change the finish time before the action end */
+  return action->remains == 0 ? action->finish : -1;
 }
 
-void surf_action_free(surf_action_t * action)
+XBT_INLINE void surf_action_free(surf_action_t * action)
 {
   (*action)->model_type->action_cancel(*action);
   free(*action);
@@ -74,7 +81,7 @@ void surf_action_free(surf_action_t * action)
 }
 
 void surf_action_state_set(surf_action_t action,
-                              e_surf_action_state_t state)
+                           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]);
@@ -101,10 +108,11 @@ void surf_action_data_set(surf_action_t action, void *data)
   action->data = data;
 }
 
-void surf_action_ref(surf_action_t action)
+XBT_INLINE void surf_action_ref(surf_action_t action)
 {
   action->refcount++;
 }
+
 /*
 void surf_action_suspend(surf_action_t action)
 {