Cosmetics

[simgrid.git] / src / surf / cpu_private.h

diff --git a/src/surf/cpu_private.h b/src/surf/cpu_private.h
index d10fea1..9b86b44 100644 (file)
--- a/src/surf/cpu_private.h
+++ b/src/surf/cpu_private.h
@@ -14,14 +14,15 @@ typedef struct surf_action_cpu {
 } s_surf_action_cpu_t, *surf_action_cpu_t;
 
 typedef struct cpu {
 } s_surf_action_cpu_t, *surf_action_cpu_t;
 
 typedef struct cpu {

+  surf_resource_t resource;    /* Any such object, added in a trace
+                                  should start by this field!!! */

   const char *name;
   xbt_maxmin_float_t power_scale;
   const char *name;
   xbt_maxmin_float_t power_scale;

-  xbt_maxmin_float_t current_power;
-  tmgr_trace_t power_trace;
-  e_surf_action_state_t current_state;
-  tmgr_trace_t state_trace;
+  xbt_maxmin_float_t power_current;
+  tmgr_trace_event_t power_event;
+  e_surf_cpu_state_t state_current;
+  tmgr_trace_event_t state_event;

   lmm_constraint_t constraint;
 } s_cpu_t, *cpu_t;
 
   lmm_constraint_t constraint;
 } s_cpu_t, *cpu_t;
 

-
-#endif                         /* _SURF_SURF_PRIVATE_H */
+#endif                         /* _SURF_CPU_PRIVATE_H */