add the group id definition

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

diff --git a/frsh_core_types.h b/frsh_core_types.h
index 8c9ec55d63b7bea6756392e4b96430a21d033f10..d7be2e0a641ac8eee976bed9507f99e6a27c4656 100644 (file)
--- a/frsh_core_types.h
+++ b/frsh_core_types.h
@@ -151,13 +151,11 @@ typedef enum {FRSH_RS_IN_PROGRESS,
               FRSH_RS_ADMITTED,
               FRSH_RS_NOT_REQUESTED} frsh_renegotiation_status_t;
 
-
-
 /**
  *  Vres Id type, that identifies a vres created to manage a given
  *  contract
  **/
-typedef unsigned int      frsh_vres_id_t;             // => 0
+typedef FRSH_VRES_ID_T_OPAQUE frsh_vres_id_t;             // => 0
 
 /** Contract ressource type:  processor, network, memory **/
 typedef enum {
@@ -193,20 +191,16 @@ typedef FRSH_CONTRACT_T_OPAQUE  frsh_contract_t;
 /** List of vres **/
 typedef  struct {
   int             size;
-  frsh_vres_id_t  vres[FRSH_MAX_N_VRES];
+  frsh_vres_id_t  vres[FRSH_MAX_GROUP_OPS];
 } frsh_vres_group_t;
 
 /** List of contracts to negotiate **/
 typedef struct {
     int  size;
-    frsh_contract_t*  contracts[FRSH_MAX_N_VRES];
+    frsh_contract_t contracts[FRSH_MAX_GROUP_OPS];
 } frsh_contracts_group_t;
 
-typedef struct {
-    int size;
-    frsh_contract_label_t contract_labels[FRSH_MAX_N_VRES];
-} frsh_contract_labels_group_t;
-
+typedef FRSH_GROUP_ID_T_OPAQUE frsh_group_id_t;
 
 /**
  * An abstract synchronization object is defined by the application.