Changing an assertion of current RR blocked thread should always be rr_first

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

diff --git a/frsh_core_types.h b/frsh_core_types.h
index 0cc9c125a60a528138390305894f4f5e59dd04a3..a78800055d2a28cc6eb5b90f77d32b9dc702be59 100644 (file)
--- a/frsh_core_types.h
+++ b/frsh_core_types.h
@@ -98,15 +98,10 @@
 
 /** Kind of workload expected in vres: bounded or indeterminate **/
 typedef enum {
-    FRSH_WT_BOUNDED,
-    FRSH_WT_INDETERMINATE
+    FRSH_WT_BOUNDED       = 0,
+    FRSH_WT_INDETERMINATE = 1
 } frsh_workload_t;
 
-#define FRSH_DEFAULT_WORKLOAD       FRSH_WT_INDETERMINATE
-#define FRSH_DEFAULT_D_EQUALS_T     false
-#define FRSH_DEFAULT_DEADLINE       {0,0} //struct timespec
-
-
 #define FRSH_NULL_DEADLINE     (struct timespec *)NULL
 // #define FRSH_NULL_SIGNAL       0 /* Defined at frsh_adaption.h */
 
@@ -122,28 +117,29 @@ typedef enum {FRSH_RS_IN_PROGRESS,
  *  Vres Id type, that identifies a vres created to manage a given
  *  contract
  **/
-typedef int      frsh_vres_id_t;             // => 0
+typedef unsigned int      frsh_vres_id_t;             // => 0
 
 /** Contract ressource type:  processor, network, memory **/
 typedef enum {
-    FRSH_RT_PROCESSOR,
-    FRSH_RT_NETWORK,
-    FRSH_RT_MEMORY
+    FRSH_RT_PROCESSOR = 0,
+    FRSH_RT_NETWORK   = 1,
+    FRSH_RT_MEMORY    = 2,
+    FRSH_RT_DISK      = 3
 } frsh_resource_type_t;
 
 /** Ressource Id: processor_id or network_id **/
 /**********************************************/
-typedef int frsh_resource_id_t;
-
-/** This defines 1 resource_id value for systems that have only one
-    resource of a kind. **/
-#define FRSH_RESOURCE_ID_DEFAULT 0
+typedef unsigned int frsh_resource_id_t;
 
 /** Kind of contract: regular, background or dummy **/
-typedef enum {FRSH_CT_REGULAR, FRSH_CT_BACKGROUND, FRSH_CT_DUMMY} frsh_contract_type_t;
+typedef enum {
+        FRSH_CT_REGULAR    = 0,
+        FRSH_CT_BACKGROUND = 1,
+        FRSH_CT_DUMMY      = 2
+} frsh_contract_type_t;
 
-#define CONTRACT_LABEL_MAXLENGTH 15
-typedef char frsh_contract_label_t[CONTRACT_LABEL_MAXLENGTH + 1];
+// The name of this constant has been updated to have the FRSH_ prefix
+typedef char frsh_contract_label_t[FRSH_CONTRACT_LABEL_MAXLENGTH + 1];
 
 /**
  *  Contract parameters type; it is an opaque type (i.e. the internal