Merging the frsh_sa branch in the trunk.

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

diff --git a/frsh_opaque_types.h b/frsh_opaque_types.h
index 6fab50dfecc0ceb44dd448db31f2371542f31691..11f4de992967b740860fedc2cbf5ce01964733dc 100644 (file)
--- a/frsh_opaque_types.h
+++ b/frsh_opaque_types.h
@@ -73,6 +73,7 @@
 #ifndef _FRSH_OPAQUE_TYPES_H_
 #define _FRSH_OPAQUE_TYPES_H_
 
+FRSH_CPP_BEGIN_DECLS
 
 /**
  * @file frsh_opaque_types.h
@@ -108,19 +109,19 @@
 \
   /** Minimum budget needed to perform a job.  With the energy 
       module this will be an array **/              \
-  struct timespec         budget_min;                         \
+  frsh_rel_time_t         budget_min;                         \
 \
   /** Maximum period that the system system can sustain **/   \
-  struct timespec         period_max;                         \
+  frsh_rel_time_t         period_max;                         \
 \
   /** Maximum budget that the vres can use
      (and would be happy to have).  With the energy module
      this will be an array **/              \
-  struct timespec         budget_max;                         \
+  frsh_rel_time_t         budget_max;                         \
 \
   /** Minimum period for that
      the system can use (and would be happy to have) **/     \
-  struct timespec         period_min;                         \
+  frsh_rel_time_t         period_min;                         \
 \
   /** Set of discrete values for budget and period.  With the
       energy module this will be an array **/        \
@@ -137,7 +138,7 @@
   bool                    d_equals_t;                         \
 \
   /** Deadline (will be ignored if d_equals_t is TRUE **/     \
-  struct timespec         deadline;                           \
+  frsh_rel_time_t         deadline;                           \
 \
   /** Signal parameters for the case of
       attempting to use too much budget       **/             \
@@ -166,7 +167,7 @@
       the allocated budget and capacity will be
       maintained across negotiations  and will
       not be affected for dynamic spare capacity    **/       \
-  struct timespec         stability_time;  \
+  frsh_rel_time_t         stability_time;  \
 \
   /** Low level parameter related with the elegibility
       preempt other threads                            **/    \
@@ -219,10 +220,11 @@ typedef int FRSH_SHAREDOBJ_HANDLE_T_OPAQUE;
 #define FRSH_CSECT_T_OPAQUE struct { \
   frsh_csect_op_kind_t op_kind;                 \
   frsh_sharedobj_handle_t obj_handle;               \
-  struct timespec wcet;                              \
-  struct timespec blocking;                              \
+  frsh_rel_time_t wcet;                              \
+  frsh_rel_time_t blocking;                              \
   frsh_csect_op_t op;                           \
   frsh_memory_areas_t areas;                         \
+  frsh_memory_areas_t storage;                         \
 }
 
 
@@ -233,4 +235,6 @@ typedef int FRSH_RECEIVE_ENDPOINT_T_OPAQUE;
 
 /*@}*/
 
+FRSH_CPP_END_DECLS
+
 #endif // _FRSH_OPAQUE_TYPES_H_