X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/976ee462f4626798ebf76ca46d13f53e10e0e28d..041f6cf28a3d83ee106f4ac7c80fa65809f50a31:/src/surf/cpu_ti_private.h

diff --git a/src/surf/cpu_ti_private.h b/src/surf/cpu_ti_private.h
index 2c46ded2c5..b4c50c1ebc 100644
--- a/src/surf/cpu_ti_private.h
+++ b/src/surf/cpu_ti_private.h
@@ -1,7 +1,6 @@
 
-/* 	$Id$	 */
-
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved.                  */
+/* Copyright (c) 2009, 2010. The SimGrid Team.
+ * 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. */
@@ -9,12 +8,11 @@
 #ifndef _SURF_CPU_TI_PRIVATE_H
 #define _SURF_CPU_TI_PRIVATE_H
 
-/* TIMESERIES */
-typedef struct surf_cpu_ti_timeSeries {
-  long nb_points;               /*< Number of points in the series */
-  double spacing;               /*< Spacing between two points */
-  double *values;               /*< Array of size nb_points */
-} s_surf_cpu_ti_timeSeries_t, *surf_cpu_ti_timeSeries_t;
+typedef struct surf_cpu_ti_trace {
+  double *time_points;
+  double *integral;
+  int nb_points;
+} s_surf_cpu_ti_trace_t, *surf_cpu_ti_trace_t;
 
 /* TRACE */
 typedef struct surf_cpu_ti_tgmr {
@@ -26,11 +24,12 @@ typedef struct surf_cpu_ti_tgmr {
   double value;                 /*< Percentage of cpu power disponible. Value fixed between 0 and 1 */
 
   /* Dynamic */
-  double last_time;             /*< Integral interval last point */
+  double last_time;             /*< Integral interval last point (discret time) */
   double total;                 /*< Integral total between 0 and last_pointn */
 
-  surf_cpu_ti_timeSeries_t *levels;     /*< Availability information */
-  int nb_levels;                /*< Number of levels */
+  surf_cpu_ti_trace_t trace;
+  tmgr_trace_t power_trace;
+
 } s_surf_cpu_ti_tgmr_t, *surf_cpu_ti_tgmr_t;
 
 
@@ -57,14 +56,10 @@ typedef struct surf_action_ti {
   int index_heap;
 } s_surf_action_cpu_ti_t, *surf_action_cpu_ti_t;
 
-/* Time-step for resource performance traces */
-#define TRACE_TIMESTEP 10.00
-/* Number of levels for resource performance traces */
-#define TRACE_NB_LEVELS 4
 /* Epsilon */
 #define EPSILON 0.000000001
 /* Usefull define to get the cpu where action is running on */
 #define ACTION_GET_CPU(action) ((cpu_ti_t)((surf_action_cpu_ti_t)action)->cpu)
 
 
-#endif /* _SURF_CPU_TI_PRIVATE_H */
+#endif                          /* _SURF_CPU_TI_PRIVATE_H */