Implement a generic resource; use it as ancestor to specific ones

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

diff --git a/src/surf/cpu_private.h b/src/surf/cpu_private.h
index a14ccb55b926e818aeaad59db303331b5b356b89..125ba401114f4e9acd18adf598f2a548286a2320 100644 (file)
--- a/src/surf/cpu_private.h
+++ b/src/surf/cpu_private.h
@@ -11,14 +11,14 @@
 #include "surf_private.h"
 #include "xbt/dict.h"
 
-typedef struct surf_action_cpu {
+typedef struct surf_action_cpu_Cas01 {
   s_surf_action_t generic_action;
   lmm_variable_t variable;
-} s_surf_action_cpu_t, *surf_action_cpu_t;
+  int suspended;
+} s_surf_action_cpu_Cas01_t, *surf_action_cpu_Cas01_t;
 
-typedef struct cpu {
-  surf_resource_t resource;    /* Any such object, added in a trace
-                                  should start by this field!!! */
+typedef struct cpu_Cas01 {
+  s_surf_resource_t generic_resource;
   char *name;
   double power_scale;
   double power_current;
@@ -26,8 +26,8 @@ typedef struct cpu {
   e_surf_cpu_state_t state_current;
   tmgr_trace_event_t state_event;
   lmm_constraint_t constraint;
-} s_cpu_t, *cpu_t;
+  /*Handles the properties that can be added to cpu's */
+  xbt_dict_t properties;
+} s_cpu_Cas01_t, *cpu_Cas01_t;
 
-extern xbt_dict_t cpu_set;
-
-#endif                         /* _SURF_CPU_PRIVATE_H */
+#endif /* _SURF_CPU_PRIVATE_H */