Added accessor functions for dummy_sched block

diff --git a/resources/dummy/fra_dummy.c b/resources/dummy/fra_dummy.c
index 2463fcf2870c8045efd9d78937cca4a89b049f37..d47cc24d6b23fe8aaecdceacad2b4984b9c04060 100644 (file)
--- a/resources/dummy/fra_dummy.c
+++ b/resources/dummy/fra_dummy.c
@@ -18,7 +18,7 @@ static int create_vres(fres_vres_t *vres, void *priv)
 
        fres_contract_id_to_string(id, &vres->id, sizeof(id));
        basic = fres_contract_get_basic(vres->new);
-       dummy_sched = fres_contract_get_block(vres->new, FRES_BLOCK_DUMMY_SCHED);
+       dummy_sched = fres_contract_get_dummy_sched(vres->new);
        printf("Creating VRes #%d (id=%s, period=%ld ms, budget=%ld ms, priority=%d)\n",
               *my_data, id,
               fosa_rel_time_to_msec(basic->period),
@@ -36,7 +36,7 @@ static int cancel_vres(fres_vres_t *vres, void *priv)
 
        fres_contract_id_to_string(id, &vres->id, sizeof(id));
        basic = fres_contract_get_basic(vres->allocated);
-       dummy_sched = fres_contract_get_block(vres->allocated, FRES_BLOCK_DUMMY_SCHED);
+       dummy_sched = fres_contract_get_dummy_sched(vres->allocated);
        
        printf("Canceling VRes #%d (id=%s, period=%ld ms, budget=%ld ms, priority=%d)\n",
               *my_data, id,

diff --git a/resources/dummy/frm_dummy.c b/resources/dummy/frm_dummy.c
index ec423b4c5e8bd6f466963022ff3b9f93c761e1ad..02cd71ce94621ea11f6ff431e9489deefae693d6 100644 (file)
--- a/resources/dummy/frm_dummy.c
+++ b/resources/dummy/frm_dummy.c
@@ -33,13 +33,13 @@ int admission_test(struct fres_sa_scenario *scenario, void *priv, bool *schedula
                        dummy_sched = malloc(sizeof(*dummy_sched));
                        if (!dummy_sched) return -1;
                        dummy_sched->priority = 100 - fosa_rel_time_to_msec(basic->budget);
-                       ret = fres_contract_add_block(c->contract, FRES_BLOCK_DUMMY_SCHED, dummy_sched);
+                       ret = fres_contract_add_dummy_sched(c->contract, dummy_sched);
                        if (ret) {
                                fprintf(stderr, "Cannpt add dummy_sched block\n");
                                return -1;
                        }
                } else {
-                       dummy_sched = fres_contract_get_block(c->contract, FRES_BLOCK_DUMMY_SCHED);
+                       dummy_sched = fres_contract_get_dummy_sched(c->contract);
                        if (!dummy_sched) {
                                fprintf(stderr, "Dummy_sched is not present\n");
                                return -1;

diff --git a/resources/dummy/res_dummy.h b/resources/dummy/res_dummy.h
index 189abb9640dfe28a7e2025a4aa56e72ea7a5f987..ecbc2ece9ac3f3cc7964c6070095182d967d80b9 100644 (file)
--- a/resources/dummy/res_dummy.h
+++ b/resources/dummy/res_dummy.h
@@ -4,6 +4,8 @@
 #include <forb.h>
 #include <fcb.h>
 #include <res_dummy_idl.h>
+#include <fres_contract.h>
+#include <fres_container.h>
 
 #define DUMMY_RESOURCE_TYPE FRSH_RT_PROCESSOR
 #define DUMMY_RESOURCE_ID   0
@@ -11,4 +13,11 @@
 int fra_dummy_init(forb_orb orb, fres_contract_broker fcb, forb_executor_t *executor);
 int fres_block_register_dummy(void);
 
+/* Define fres_container_(add|get|del)_dummy_sched. */
+FRES_CONTAINER_ACCESSOR(DUMMY_SCHED, dummy_sched);
+
+/* Define fres_contract_(add|get|del)_dummy_sched. */
+FRES_CONTRACT_ACCESSOR(dummy_sched);
+
+
 #endif