A meta-resource : workstation is simply a CPU and a network card.

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

diff --git a/src/surf/cpu_private.h b/src/surf/cpu_private.h
index c5b2cde..506cdcb 100644 (file)
--- 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_private.h"
+#include "xbt/dict.h"
 
 typedef struct surf_action_cpu {
   s_surf_action_t generic_action;
@@ -14,23 +17,17 @@ typedef struct surf_action_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!!! */
+  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;
-  xbt_maxmin_float_t current_power;
-/*   tmgr_trace_t power_trace; */
+  xbt_maxmin_float_t power_current;
   tmgr_trace_event_t power_event;
-  e_surf_cpu_state_t current_state;
-/*   tmgr_trace_t state_trace; */
+  e_surf_cpu_state_t state_current;
   tmgr_trace_event_t state_event;
   lmm_constraint_t constraint;
 } s_cpu_t, *cpu_t;
 
-/* typedef struct surf_cpu_resource_extension_private { */
-/* } s_surf_cpu_resource_extension_private_t; */
-
-void surf_cpu_resource_init(const char *filename);
-
+extern xbt_dict_t cpu_set;
 
 #endif                         /* _SURF_CPU_PRIVATE_H */