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 b81db850d5a5e319b9a591834ecb2ef0ea1e3843..125ba401114f4e9acd18adf598f2a548286a2320 100644 (file)
--- a/src/surf/cpu_private.h
+++ b/src/surf/cpu_private.h
@@ -18,8 +18,7 @@ typedef struct surf_action_cpu_Cas01 {
 } s_surf_action_cpu_Cas01_t, *surf_action_cpu_Cas01_t;
 
 typedef struct cpu_Cas01 {
-  surf_model_t model;           /* Any such object, added in a trace
-                                   should start by this field!!! */
+  s_surf_resource_t generic_resource;
   char *name;
   double power_scale;
   double power_current;
@@ -31,6 +30,4 @@ typedef struct cpu_Cas01 {
   xbt_dict_t properties;
 } s_cpu_Cas01_t, *cpu_Cas01_t;
 
-extern xbt_dict_t cpu_set;
-
 #endif /* _SURF_CPU_PRIVATE_H */