X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fd472f70823a1157acdca204f02accd97918dccc..77f37f760119eedffa3ba51f5f67419822e48cda:/src/surf/cpu_private.h

diff --git a/src/surf/cpu_private.h b/src/surf/cpu_private.h
index d802ccbf34..a14ccb55b9 100644
--- a/src/surf/cpu_private.h
+++ b/src/surf/cpu_private.h
@@ -1,12 +1,15 @@
-/* Authors: Arnaud Legrand                                                  */
+/* 	$Id$	 */
+
+/* Copyright (c) 2004 Arnaud Legrand. 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #ifndef _SURF_CPU_PRIVATE_H
 #define _SURF_CPU_PRIVATE_H
 
-#include "surf/surf_private.h"
+#include "surf_private.h"
+#include "xbt/dict.h"
 
 typedef struct surf_action_cpu {
   s_surf_action_t generic_action;
@@ -14,14 +17,17 @@ typedef struct surf_action_cpu {
 } s_surf_action_cpu_t, *surf_action_cpu_t;
 
 typedef struct cpu {
-  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;
+  surf_resource_t resource;	/* Any such object, added in a trace
+				   should start by this field!!! */
+  char *name;
+  double power_scale;
+  double 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;
 
+extern xbt_dict_t cpu_set;
 
-#endif				/* _SURF_SURF_PRIVATE_H */
+#endif				/* _SURF_CPU_PRIVATE_H */