Added prototype for frsh_contract_destroy()

[frescor/frsh-include.git] / frsh_energy_management_types.h

diff --git a/frsh_energy_management_types.h b/frsh_energy_management_types.h
index 9277c5ff882d5ec87d65b5be48bfbba652e31153..030e4fd9f6f7f7a1701a872888e62650a36b8f51 100644 (file)
--- a/frsh_energy_management_types.h
+++ b/frsh_energy_management_types.h
@@ -1,5 +1,5 @@
 // -----------------------------------------------------------------------
-//  Copyright (C) 2006 - 2007 FRESCOR consortium partners:
+//  Copyright (C) 2006 - 2009 FRESCOR consortium partners:
 //
 //    Universidad de Cantabria,              SPAIN
 //    University of York,                    UK
@@ -12,7 +12,7 @@
 //    Visual Tools S.A.                      SPAIN
 //    Rapita Systems Ltd                     UK
 //    Evidence                               ITALY
-//    
+//
 //    See http://www.frescor.org for a link to partners' websites
 //
 //           FRESCOR project (FP6/2005/IST/5-034026) is funded
@@ -22,7 +22,7 @@
 //
 //
 //  based on previous work (FSF) done in the FIRST project
-//                       
+//
 //   Copyright (C) 2005  Mälardalen University, SWEDEN
 //                       Scuola Superiore S.Anna, ITALY
 //                       Universidad de Cantabria, SPAIN
@@ -31,29 +31,26 @@
 //   FSF API web pages: http://marte.unican.es/fsf/docs
 //                      http://shark.sssup.it/contrib/first/docs/
 //
-//  This file is part of FRSH API
-//
-//  FRSH API is free software; you can  redistribute it and/or  modify
-//  it under the terms of  the GNU General Public License as published by
-//  the Free Software Foundation;  either  version 2, or (at  your option)
-//  any later version.
+//   This file is part of FRSH (FRescor ScHeduler)
 //
-//  FRSH API  is distributed  in  the hope  that  it  will  be useful,  but
-//  WITHOUT  ANY  WARRANTY;     without  even the   implied   warranty  of
-//  MERCHANTABILITY  or  FITNESS FOR  A  PARTICULAR PURPOSE. See  the  GNU
-//  General Public License for more details.
+//  FRSH is free software; you can redistribute it and/or modify it
+//  under terms of the GNU General Public License as published by the
+//  Free Software Foundation; either version 2, or (at your option) any
+//  later version.  FRSH is distributed in the hope that it will be
+//  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+//  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+//  General Public License for more details. You should have received a
+//  copy of the GNU General Public License along with FRSH; see file
+//  COPYING. If not, write to the Free Software Foundation, 675 Mass Ave,
+//  Cambridge, MA 02139, USA.
 //
-//  You should have  received a  copy of  the  GNU  General Public License
-//  distributed  with  FRSH API;  see file COPYING.   If not,  write to the
-//  Free Software  Foundation,  59 Temple Place  -  Suite 330,  Boston, MA
-//  02111-1307, USA.
-//
-//  As a special exception, if you include this header file into source
-//  files to be compiled, this header file does not by itself cause
-//  the resulting executable to be covered by the GNU General Public
-//  License.  This exception does not however invalidate any other
-//  reasons why the executable file might be covered by the GNU General
-//  Public License.
+//  As a special exception, including FRSH header files in a file,
+//  instantiating FRSH generics or templates, or linking other files
+//  with FRSH objects to produce an executable application, does not
+//  by itself cause the resulting executable application to be covered
+//  by the GNU General Public License. This exception does not
+//  however invalidate any other reasons why the executable file might be
+//  covered by the GNU Public License.
 // -----------------------------------------------------------------------
 //frsh_energy_management_types.h
 //==============================================
@@ -74,6 +71,8 @@
 #include <time.h>
 #include "frsh_core_types.h"
 
+FRSH_CPP_BEGIN_DECLS
+
 /**
  * @file frsh_energy_management_types.h
  **/
@@ -91,8 +90,7 @@
  * Here we define the different power levels.  They will be
  * used as index to the budget arrays in energy management.
  **/
-typedef enum _frsh_power_level_t
-{
+typedef enum {
     FRSH_PLT_HIGH   = 0,
     FRSH_PLT_MEDIUM = 1,
     FRSH_PLT_LOW    = 2
@@ -102,20 +100,19 @@ typedef enum _frsh_power_level_t
 /**
  * Here we define a capacity specification for all power levels.
  **/
-typedef struct _frsh_utilization_line_pow_t
-{
-    struct timespec budget[3];
-    struct timespec period;
+typedef struct {
+    frsh_rel_time_t budget[3];
+    frsh_rel_time_t period;
 } frsh_utilization_line_pow_t;
 
 /**
  * Here we define the utilization set for different power levels
  **/
-typedef struct _frsh_utilization_set_pow_t
-{
+typedef struct {
     int size;
     frsh_utilization_line_pow_t utilizations[FRSH_MAX_N_UTILIZATION_VALUES];
 } frsh_utilization_set_pow_t;
 
+FRSH_CPP_END_DECLS
 
 #endif             /* !FRSH_ENERGY_MANAGEMENT_TYPES_H_ */