// Visual Tools S.A. SPAIN
// Rapita Systems Ltd UK
// Evidence ITALY
-//
+//
// See http://www.frescor.org for a link to partners' websites
//
// FRESCOR project (FP6/2005/IST/5-034026) is funded
//
//
// based on previous work (FSF) done in the FIRST project
-//
+//
// Copyright (C) 2005 Mälardalen University, SWEDEN
// Scuola Superiore S.Anna, ITALY
// Universidad de Cantabria, SPAIN
// **//// /**///** ////////** /**//////**
// ** /** //** /** /** /**
// ** /** //** ******** /** /**
-// // // // //////// // //
+// // // // //////// // //
//
// FRSH(FRescor ScHeduler), pronounced "fresh"
//==============================================
-#ifndef FRSH_CORE_TYPES_H_
-#define FRSH_CORE_TYPES_H_
+#ifndef FRSH_CORE_TYPES_H_
+#define FRSH_CORE_TYPES_H_
+#include <stdbool.h>
#include "frsh_configuration_parameters.h"
#include "frsh_opaque_types.h"
#include "frsh_shared_objects_types.h"
/*@{*/
-/**
- * Bool as a byte value (char)
- *
- * We will revisit this if we have a problem with bool in C++
- **/
-typedef char bool;
-#define true 1
-#define false 0
-
-/** Kind of workload expected in servers: bounded or indeterminate **/
+/** Kind of workload expected in vres: bounded or indeterminate **/
typedef enum {
- FRSH_WT_BOUNDED,
+ FRSH_WT_BOUNDED,
FRSH_WT_INDETERMINATE
-} 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
-
+} frsh_workload_t;
#define FRSH_NULL_DEADLINE (struct timespec *)NULL
// #define FRSH_NULL_SIGNAL 0 /* Defined at frsh_adaption.h */
-/**
- * Server Id type, that identifies a server created to manage a given
+/**
+ * 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 {
/** Ressource Id: processor_id or network_id **/
/**********************************************/
-typedef int frsh_resource_id_t;
+typedef unsigned int frsh_resource_id_t;
/** This defines 1 resource_id value for systems that have only one
resource of a kind. **/
/** Kind of contract: regular, background or dummy **/
typedef enum {FRSH_CT_REGULAR, FRSH_CT_BACKGROUND, FRSH_CT_DUMMY} 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
+#define FRSH_CONTRACT_LABEL_MAXLENGTH 15
+typedef char frsh_contract_label_t[FRSH_CONTRACT_LABEL_MAXLENGTH + 1];
-/**
+/**
* Contract parameters type; it is an opaque type (i.e. the internal
* structure of this data type is implementation dependent). The user
* can access and modify the parameters of a contract only with the
/*@}*/
-#endif /* !FRSH_CORE_TYPES_H_ */
+#endif /* !FRSH_CORE_TYPES_H_ */