// 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"
#include "frsh_hierarchical_types.h"
#include "frsh_distributed_types.h"
#include "frsh_error.h"
-
+#include "frsh_fosa.h"
/**
- * \addtogroup core
+ * @file frsh_core_types.h
**/
-/*@{*/
/**
- * Bool as a byte value (char)
- *
- * We will revisit this if we have a problem with bool in C++
+ * \addtogroup core
**/
-typedef char bool;
-#define true 1
-#define false 0
-
-
-/** Kind of workload expected in servers **/
-typedef enum {FRSH_BOUNDED, FRSH_INDETERMINATE} frsh_workload_t;
+/*@{*/
-#define FRSH_DEFAULT_WORKLOAD FRSH_INDETERMINATE
-#define FRSH_DEFAULT_D_EQUALS_T false
-#define FRSH_DEFAULT_DEADLINE {0,0} //struct timespec
+/** Kind of workload expected in vres: bounded or indeterminate **/
+typedef enum {
+ FRSH_WT_BOUNDED,
+ FRSH_WT_INDETERMINATE
+} frsh_workload_t;
#define FRSH_NULL_DEADLINE (struct timespec *)NULL
-#define FRSH_NULL_SIGNAL 0
+// #define FRSH_NULL_SIGNAL 0 /* Defined at frsh_adaption.h */
-/** Possible values returned by frsh_get_renegotiation_status **/
-typedef enum {FRSH_IN_PROGRESS,
- FRSH_REJECTED,
- FRSH_ADMITTED,
- FRSH_NOT_REQUESTED} frsh_renegotiation_status_t;
+/** Negotiation status: In_progress, rejected, admitted, not_requested **/
+typedef enum {FRSH_RS_IN_PROGRESS,
+ FRSH_RS_REJECTED,
+ FRSH_RS_ADMITTED,
+ FRSH_RS_NOT_REQUESTED} frsh_renegotiation_status_t;
-/**
- * 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_server_id_t; // => 0
+typedef unsigned int frsh_vres_id_t; // => 0
-/** Contract ressource type: processor or network **/
-typedef enum {FRSH_CRT_PROCESSOR, FRSH_CRT_NETWORK} frsh_contract_resource_type;
+/** Contract ressource type: processor, network, memory **/
+typedef enum {
+ FRSH_RT_PROCESSOR,
+ FRSH_RT_NETWORK,
+ FRSH_RT_MEMORY
+} frsh_resource_type_t;
-/** Kind of contract **/
+/** Ressource Id: processor_id or network_id **/
+/**********************************************/
+typedef unsigned 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
+
+/** Kind of contract: regular, background or dummy **/
typedef enum {FRSH_CT_REGULAR, FRSH_CT_BACKGROUND, FRSH_CT_DUMMY} frsh_contract_type_t;
-#define CONTRACT_ID_MAXLENGTH 15
-typedef char frsh_contract_id_t[CONTRACT_ID_MAXLENGTH];
+// 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
* proper functions, and should never access the data directly.
**/
-typedef FRSH_CONTRACT_PARAMETERS_T_OPAQUE frsh_contract_parameters_t;
+typedef FRSH_CONTRACT_T_OPAQUE frsh_contract_t;
-/** List of servers to cancel **/
+/** List of vres **/
typedef struct {
int size;
- frsh_server_id_t servers[FRSH_MAX_N_SERVERS];
-} frsh_servers_group_t;
+ frsh_vres_id_t vres[FRSH_MAX_N_VRES];
+} frsh_vres_group_t;
/** List of contracts to negotiate **/
typedef struct {
int size;
- frsh_contract_parameters_t* contracts[FRSH_MAX_N_SERVERS];
+ frsh_contract_t* contracts[FRSH_MAX_N_VRES];
} frsh_contracts_group_t;
typedef struct {
int size;
- frsh_contract_id_t contract_ids[FRSH_MAX_N_SERVERS];
-} frsh_contract_ids_group_t;
+ frsh_contract_label_t contract_labels[FRSH_MAX_N_VRES];
+} frsh_contract_labels_group_t;
/**
* An abstract synchronization object is defined by the application.
* This object can be used by an application to wait for an event to
- * arrive by invoking the frsh_schedule_triggered_job() operation. It
+ * arrive by invoking the frsh_sychobj_wait() operation. It
* can also be used to signal the event either causing a waiting
- * server to wake up, or the event to be queued if no server is
- * waiting for it.
+ * vres to wake up, or the event to be queued if no vres is
+ * waiting for it.
**/
-typedef FRSH_SYNCH_OBJ_HANDLE_T_OPAQUE frsh_synch_obj_handle_t;
+typedef FRSH_SYNCHOBJ_HANDLE_T_OPAQUE frsh_synchobj_handle_t;
/*@}*/
-#endif /* !FRSH_CORE_TYPES_H_ */
+#endif /* !FRSH_CORE_TYPES_H_ */
projects / frescor / frsh-include.git / blobdiff