resource_id is unsigned int

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

diff --git a/frsh_opaque_types.h b/frsh_opaque_types.h
index a21414343ded673674a9410bb1d64618c3e3ba58..6fab50dfecc0ceb44dd448db31f2371542f31691 100644 (file)
--- a/frsh_opaque_types.h
+++ b/frsh_opaque_types.h
@@ -74,6 +74,10 @@
 #define _FRSH_OPAQUE_TYPES_H_
 
 
+/**
+ * @file frsh_opaque_types.h
+ **/
+
 /**
  * @defgroup opaque Opaque types
  *
@@ -100,21 +104,27 @@
 \
   /** Printable name for the contract
      Unique within the local node               **/         \
-  frsh_contract_id_t      contract_id;                        \
+  frsh_contract_label_t      contract_label;                        \
 \
-  /** Minimum budget needed to perform a job **/              \
+  /** Minimum budget needed to perform a job.  With the energy 
+      module this will be an array **/              \
   struct timespec         budget_min;                         \
 \
   /** Maximum period that the system system can sustain **/   \
   struct timespec         period_max;                         \
 \
   /** Maximum budget that the vres can use
-     (and would be happy to have)           **/              \
+     (and would be happy to have).  With the energy module
+     this will be an array **/              \
   struct timespec         budget_max;                         \
 \
   /** Minimum period for that
      the system can use (and would be happy to have) **/     \
   struct timespec         period_min;                         \
+\
+  /** Set of discrete values for budget and period.  With the
+      energy module this will be an array **/        \
+  frsh_utilization_set_t   utilization_set;          \
 \
   /** Workload_type:  bounded, indeterminate, overhead **/    \
   frsh_workload_t          workload;                          \
@@ -143,9 +153,6 @@
       in a continuous way (max-min) or as a set of
       discrete values                                    **/  \
   frsh_granularity_t       granularity;                       \
-\
-  /** Set of discrete values for budget and period **/        \
-  frsh_utilization_set_t   utilization_set;          \
 \
   /** Non-cooperative parameter for fair capacity
       distribution                                **/         \
@@ -159,7 +166,7 @@
       the allocated budget and capacity will be
       maintained across negotiations  and will
       not be affected for dynamic spare capacity    **/       \
-  struct timespec         remaining_stability_time;  \
+  struct timespec         stability_time;  \
 \
   /** Low level parameter related with the elegibility
       preempt other threads                            **/    \
@@ -177,17 +184,24 @@
       as a pointer+size.  It's internal meaning is imple-
       mentation dependent.                              **/    \
   frsh_protocol_info_t    protocol_info; \
+  frsh_endpoint_queueing_info_t    queueing_info; \
 \
   /** Maximum loss rate
       Percentage of packet loss in the network that is 
       tolerated by the application **/                       \
 int                     max_loss_rate; \
+\
+ /** Minimum memory size to be reserved **/ \
+size_t                  minimum_memory; \
+\
+/** Maximum memory size to be reserved  **/ \
+size_t                  maximum_memory; \
 }
 
 
-#define FRSH_SYNCHOBJ_HANDLE_T_OPAQUE int
+typedef int FRSH_SYNCHOBJ_HANDLE_T_OPAQUE;
 
-#define FRSH_SHAREDOBJ_HANDLE_T_OPAQUE int
+typedef int FRSH_SHAREDOBJ_HANDLE_T_OPAQUE;
 
 /**
  * Critical section data
@@ -195,6 +209,7 @@ int                     max_loss_rate; \
  *     op_kind;     // kind of operation (READ or WRITE)
  *     obj_handle;  // handle to shared object
  *     wcet;        // Execution time
+ *     blocking;    // Blocking time (execution time + protection overheads)
  * - attributes used only for protected shared objects
  *     op;          // pointer to the operation
  * - attributes used only for protected write operations
@@ -205,15 +220,16 @@ int                     max_loss_rate; \
   frsh_csect_op_kind_t op_kind;                 \
   frsh_sharedobj_handle_t obj_handle;               \
   struct timespec wcet;                              \
+  struct timespec blocking;                              \
   frsh_csect_op_t op;                           \
   frsh_memory_areas_t areas;                         \
 }
 
 
 //opaque types for frsh endpoints
-#define FRSH_SEND_ENDPOINT_T_OPAQUE int
+typedef int FRSH_SEND_ENDPOINT_T_OPAQUE;
 
-#define FRSH_RECEIVE_ENDPOINT_T_OPAQUE int
+typedef int FRSH_RECEIVE_ENDPOINT_T_OPAQUE;
 
 /*@}*/