resource_id is unsigned int

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

diff --git a/frsh_spare_capacity_types.h b/frsh_spare_capacity_types.h
index 4ee3c5d90c9d5707eb5d71d9d9c771acdbc7fa90..9da5c84063094bd253114cec55ed15a4e17462db 100644 (file)
--- a/frsh_spare_capacity_types.h
+++ b/frsh_spare_capacity_types.h
@@ -1,10 +1,34 @@
 // -----------------------------------------------------------------------
+//  Copyright (C) 2006 - 2007 FRESCOR consortium partners:
+//
+//    Universidad de Cantabria,              SPAIN
+//    University of York,                    UK
+//    Scuola Superiore Sant'Anna,            ITALY
+//    Kaiserslautern University,             GERMANY
+//    Univ. Politécnica  Valencia,           SPAIN
+//    Czech Technical University in Prague,  CZECH REPUBLIC
+//    ENEA                                   SWEDEN
+//    Thales Communication S.A.              FRANCE
+//    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
+//        in part by the European Union Sixth Framework Programme
+//        The European Union is not liable of any use that may be
+//        made of this code.
+//
+//
+//  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
 //                       University of York, UK
 //
-//   FRSH API web pages: http://marte.unican.es/frsh/docs/
+//   FSF API web pages: http://marte.unican.es/fsf/docs
 //                      http://shark.sssup.it/contrib/first/docs/
 //
 //  This file is part of FRSH API
@@ -33,14 +57,14 @@
 // -----------------------------------------------------------------------
 //frsh_spare_capacity_types.h
 //==============================================
-//  ******** *******    ******** **      **
-//  **///// /**////**  **////// /**     /**
-//  **      /**   /** /**       /**     /**
-//  ******* /*******  /*********/**********
-//  **////  /**///**  ////////**/**//////**
-//  **      /**  //**        /**/**     /**
-//  **      /**   //** ******** /**     /**
-//  //       //     // ////////  //      // 
+//  ******** *******    ********  **      **
+//  **///// /**////**  **//////  /**     /**
+//  **      /**   /** /**        /**     /**
+//  ******* /*******  /********* /**********
+//  **////  /**///**  ////////** /**//////**
+//  **      /**  //**        /** /**     /**
+//  **      /**   //** ********  /**     /**
+//  //       //     // ////////   //      // 
 //
 // FRSH(FRescor ScHeduler), pronounced "fresh"
 //==============================================
@@ -52,8 +76,6 @@
 
 /**
  * @file frsh_spare_capacity_types.h
- *
- * Defines and typedefs for types used in spare_capacity functions.
  **/
 
 /**
@@ -66,29 +88,28 @@
 /* D E F I N I T I O N S */
 /*************************/
 
-/** Granularity of spare capacity requirements **/
-typedef enum {FRSH_CONTINUOUS, FRSH_DISCRETE} frsh_granularity_t;
+/** Granularity of spare capacity requirements: continuous or discrete **/
+typedef enum {FRSH_GR_CONTINUOUS, FRSH_GR_DISCRETE} frsh_granularity_t;
 
 /** Utilization (C and T) **/
 typedef struct {
     struct timespec    budget;    // Execution time
     struct timespec    period;    // Period
-} frsh_utilization_value_t;
+} frsh_utilization_t;
 
 /** List of utilization values **/
 typedef struct {
     int                      size; // = 0
-    frsh_utilization_value_t value[FRSH_MAX_N_UTILIZATION_VALUES]; 
+    frsh_utilization_t utilizations[FRSH_MAX_N_UTILIZATION_VALUES]; 
 } frsh_utilization_set_t;
 
 // Constants for assigning default values
-#define FRSH_DEFAULT_GRANULARITY         FRSH_CONTINUOUS
-#define FRSH_DEFAULT_QUALITY             0
+#define FRSH_DEFAULT_GRANULARITY         FRSH_GR_CONTINUOUS
+#define FRSH_DEFAULT_WEIGHT              0
 #define FRSH_DEFAULT_IMPORTANCE          1
 
 // Constants for omitting the assignment of values to specific
 // arguments in calls to initialization functions
-
 #define FRSH_NULL_UTILIZATION_SET     \
    (frsh_utilization_set_t *)NULL