Merging the frsh_sa branch in the trunk.

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

diff --git a/frsh_feedback_control.h b/frsh_feedback_control.h
index f1df01d3bb57288e3af7385010869485b80e0a64..812ba283682902b383169c9733be211f005625f4 100644 (file)
--- a/frsh_feedback_control.h
+++ b/frsh_feedback_control.h
@@ -75,10 +75,10 @@
 
 #include <time.h>
 
-#include "frsh_fosa.h"
 //#include "frsh_feedback_control_types.h"
 #include "frsh_core_types.h"
 
+FRSH_CPP_BEGIN_DECLS
 
 #define FRSH_FEEDBACKCTRL_MODULE_SUPPORTED       1
 
@@ -133,14 +133,14 @@
  * No threads must be ever attached to the contract identified by
  * spare_id.
  **/
-int frsh_feedback_set_spare(const frsh_contract_t *spare_contract);
+int frsh_feedback_set_spare(frsh_vres_id_t spare_id);
 
 /**
  * frsh_feedback_get_spare()
  *
  * Get version of the frsh_feedback_set_spare() function.
  **/
-int frsh_feedback_get_spare(frsh_contract_t *spare_contract);
+int frsh_feedback_get_spare(frsh_vres_id_t *p_spare_id);
 
 /**
  * frsh_feedback_set_desired_budget()
@@ -183,7 +183,7 @@ int frsh_feedback_get_spare(frsh_contract_t *spare_contract);
  * @param[in] p_budget_in
  * The new budget to set as desired.
  **/
-int frsh_feedback_set_desired_budget(frsh_vres_id_t vres_id, struct timespec *p_budget_in);
+int frsh_feedback_set_desired_budget(frsh_vres_id_t vres_id, frsh_rel_time_t *p_budget_in);
 
 /**
  * frsh_feedback_get_desired_budget()
@@ -195,7 +195,7 @@ int frsh_feedback_set_desired_budget(frsh_vres_id_t vres_id, struct timespec *p_
  * call, or the maximum budget set during contract negotiation, if no such
  * call ever occurred.
  **/
-int frsh_feedback_get_desired_budget(frsh_vres_id_t vres_id, struct timespec *p_budget_out);
+int frsh_feedback_get_desired_budget(frsh_vres_id_t vres_id, frsh_rel_time_t *p_budget_out);
 
 /**
  * frsh_feedback_get_actual_budget()
@@ -205,8 +205,11 @@ int frsh_feedback_get_desired_budget(frsh_vres_id_t vres_id, struct timespec *p_
  * for a given vres may change dynamically as a result of a call to the
  * frsh_feedback_set_desired_budget() function for the same or other virtual resources.
  **/
-int frsh_feedback_get_actual_budget(frsh_vres_id_t vres_id, struct timespec *budget);
+int frsh_feedback_get_actual_budget(frsh_vres_id_t vres_id, frsh_rel_time_t *budget);
 
 /*@}*/
 
+
+FRSH_CPP_END_DECLS
+
 #endif