Removing FRSH_TRACE_TIMEDWAIT because it is no used.

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

diff --git a/frsh.h b/frsh.h
index fd102c13b1df31a485c89a5ffbd7607dce8d5280..a34004537928d7dcfebbb1f9d1377d671fb4219c 100644 (file)
--- a/frsh.h
+++ b/frsh.h
@@ -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
@@ -54,21 +54,20 @@
 //  License.  This exception does not however invalidate any other
 //  reasons why the executable file might be covered by the GNU General
 //  Public License.
-// -----------------------------------------------------------------------
-//frsh.h
+// ---------------------------------------------------------------------
 
 //==============================================
-//  ******** *******    ******** **      **
-//  **///// /**////**  **////// /**     /**
-//  **      /**   /** /**       /**     /**
-//  ******* /*******  /*********/**********
-//  **////  /**///**  ////////**/**//////**
-//  **      /**  //**        /**/**     /**
-//  **      /**   //** ******** /**     /**
-//  //       //     // ////////  //      // 
+//  ******** *******    ********  **      **
+//  **///// /**////**  **//////  /**     /**
+//  **      /**   /** /**        /**     /**
+//  ******* /*******  /********* /**********
+//  **////  /**///**  ////////** /**//////**
+//  **      /**  //**        /** /**     /**
+//  **      /**   //** ********  /**     /**
+//  //       //     // ////////   //      //
 //
 // FRSH(FRescor ScHeduler), pronounced "fresh"
-//================================================
+//==============================================
 #ifndef _FRSH_H_
 #define _FRSH_H_
 
@@ -90,6 +89,7 @@
 /* We include all the types because they are needed for the
    frsh_contract_parameters_t */
 
+#include "frsh_core_types.h"
 #include "frsh_shared_objects_types.h"
 #include "frsh_spare_capacity_types.h"
 #include "frsh_hierarchical_types.h"
@@ -106,8 +106,9 @@
 #include "frsh_dynamic_reclaiming.h"           //
 #include "frsh_spare_capacity.h"
 #include "frsh_distributed.h"                  //
-#include "frsh_distributed_spare_capacity.h"   //
-
+#include "frsh_feedback_control.h"
+#include "frsh_memory_management.h"
+#include "frsh_energy_management.h"
 
 
 #ifndef FRSH_HIERARCHICAL_MODULE_SUPPORTED
@@ -127,45 +128,24 @@
     #define FRSH_SPARE_CAPACITY_MODULE_SUPPORTED      0
 
     //Return warnings if spare_capacity module is not included:
- 
+
     #define frsh_set_contract_reclamation_parameters  \
       (contract, budget_max, period_min, granularity,\
        utilization_set, quality,  importance)        \
        ( FRSH_WRN_MODULE_NOT SUPPORTED )
-    
+
     #define frsh_get_contract_reclamation_parameters  \
       (contract, budget_max, period_min, granularity,\
        utilization_set, quality, importance)         \
        ( FRSH_WRN_MODULE_NOT SUPPORTED )
-   
+
     #define frsh_request_change_quality_and_importance\
       (server, new_importance, new_quality)          \
        ( FRSH_WRN_MODULE_NOT SUPPORTED )
-        
+
     #define frsh_get_total_quality (server,total_quality)\
        ( FRSH_WRN_MODULE_NOT SUPPORTED )
 
 #endif  //FRSH_SPARE_CAPACITY_MODULE_SUPPORTED
 
-#ifndef FRSH_DISTRIBUTED_MODULE_SUPPORTED
-    #define FRSH_DISTRIBUTED_MODULE_SUPPORTED 0
-#endif  //FRSH_DISTRIBUTED_MODULE_SUPPORTED
-
-#ifndef FRSH_DISTRIBUTED_SPARE_CAPACITY_MODULE_SUPPORTED
-    #define FRSH_DISTRIBUTED_SPARE_CAPACITY_MODULE_SUPPORTED 0
-   
-    //Return warnings if distributed_spare_capacity module is not included:
-
-    #define frsh_set_contract_granted_capacity_flag(contract,granted_capacity_flag)\
-       ( FRSH_WRN_MODULE_NOT SUPPORTED )
- 
-    #define frsh_get_contract_granted_capacity_flag(contract,granted_capacity_flag)\
-       ( FRSH_WRN_MODULE_NOT SUPPORTED )
-   
-    #definr frsh_set_server_capacity(server,new_period,new_budget)\
-       ( FRSH_WRN_MODULE_NOT SUPPORTED )
-
-#endif  //FRSH_DISTRIBUTED_SPARE_CAPACITY_MODULE_SUPPORTED
-
-
 #endif // _FRSH_H_