Adapting example_d-ac1_frescor.c to the new FRESCOR API and fixing some

small errors on the way.

git-svn-id: http://www.frescor.org/private/svn/frescor/frsh/trunk/include@341 35b4ef3e-fd22-0410-ab77-dab3279adceb

diff --git a/frsh_core.h b/frsh_core.h
index cd738313a61e4453ce0a79d80a48c30033f5e133..191cdcfbd3b814265a4da669edd0f72927e3a1a2 100644 (file)
--- a/frsh_core.h
+++ b/frsh_core.h
@@ -253,13 +253,13 @@ int frsh_contract_get_basic_params
    frsh_contract_type_t *contract_type);
 
 /**
- * frsh_contract_set_resource_type_and_id()
+ * frsh_contract_set_resource_and_label()
  *
  * Specify processor_id/network_id and whether it is a processor or a
  * network.  Otherwise default values (type is processor and id is #0
  * will apply. 
  **/
-int frsh_contract_set_resource_type_and_id
+int frsh_contract_set_resource_and_label
   (frsh_contract_t *contract,
    frsh_resource_type_t resource_type,
    frsh_resource_id_t resource_id,
@@ -267,13 +267,13 @@ int frsh_contract_set_resource_type_and_id
 
 
 /**
- * frsh_contract_get_resource_type_and_id()
+ * frsh_contract_get_resource_and_label()
  *
  * Specify processor_id/network_id and whether it is a processor or a
  * network.  Otherwise default values (processor and processor #0 will
  * apply.
  **/
-int frsh_contract_get_resource_type_and_id
+int frsh_contract_get_resource_and_label
   (const frsh_contract_t *contract,
    frsh_resource_type_t *resource_type,
    frsh_resource_id_t *resource_id,
@@ -1098,18 +1098,7 @@ int frsh_vres_get_renegotiation_status
  * simultaneously and atomically.
  *
  * @{
- **//**
- * frsh_get_vres_id_from_contract_label()
- *
- * This operation retrieves the vres_id whose contract_label
- * corresponds to the parameter. It returns an error if the
- * contract_label is not known. 
- *
- * @return 0 if no error \n
- *   FRSH_ERR_BAD_ARGUMENT :  if the contract argument is NULL or the
- *     contract_label is NULL \n
- *   FRSH_ERR_NOT_SCHEDULED_CALLING_THREAD : if the calling thread is not
- 
+ **/
 
 /**
  * frsh_group_negotiate()

diff --git a/frsh_spare_capacity_types.h b/frsh_spare_capacity_types.h
index 22abf7e7a7c8df32c0b53932226beb806ce48ead..9da5c84063094bd253114cec55ed15a4e17462db 100644 (file)
--- a/frsh_spare_capacity_types.h
+++ b/frsh_spare_capacity_types.h
@@ -89,7 +89,7 @@
 /*************************/
 
 /** Granularity of spare capacity requirements: continuous or discrete **/
-typedef enum {FRSH_GRT_CONTINUOUS, FRSH_GRT_DISCRETE} frsh_granularity_t;
+typedef enum {FRSH_GR_CONTINUOUS, FRSH_GR_DISCRETE} frsh_granularity_t;
 
 /** Utilization (C and T) **/
 typedef struct {
@@ -104,7 +104,7 @@ typedef struct {
 } frsh_utilization_set_t;
 
 // Constants for assigning default values
-#define FRSH_DEFAULT_GRANULARITY         FRSH_GRT_CONTINUOUS
+#define FRSH_DEFAULT_GRANULARITY         FRSH_GR_CONTINUOUS
 #define FRSH_DEFAULT_WEIGHT              0
 #define FRSH_DEFAULT_IMPORTANCE          1