Update of manager and scheduler to the changes in frsh_forb

diff --git a/fwp/lib/frsh_fwp/fwp_frs.c b/fwp/lib/frsh_fwp/fwp_frs.c
index 50ddf2d41dde3bb0b244e7f976fb203640b5179a..274d2b42a7f0a044e09d0aad1d6899f8f8acb483 100644 (file)
--- a/fwp/lib/frsh_fwp/fwp_frs.c
+++ b/fwp/lib/frsh_fwp/fwp_frs.c
@@ -21,8 +21,8 @@ static int create_vres(fres_vres_t *vres, void *priv)
        int rv;
        
        /* Prepare vres parameters */
-       basic = fres_contract_get_basic(vres->contract);
-       fwp_sched = fres_contract_get_block(vres->contract, FRES_BLOCK_FWP_SCHED);
+       basic = fres_contract_get_basic(vres->new);
+       fwp_sched = fres_contract_get_block(vres->new, FRES_BLOCK_FWP_SCHED);
 
        //fwp_fna_network_budget_to_bytes(FRSH_NETPF_FWP, &basic->budget, &vparams.budget);
        vparams.budget = basic->budget.tv_nsec;
@@ -34,7 +34,7 @@ static int create_vres(fres_vres_t *vres, void *priv)
        }
        vres->priv = fwp_vresd;
 
-       fres_contract_id_to_string(id, &vres->contract->id, sizeof(id));
+       fres_contract_id_to_string(id, &vres->id, sizeof(id));
        printf("Creating FWP VRes (id=%s, period=%ld ms, budget=%ld bytes AC=%d)\n",
                id, fosa_rel_time_to_msec(basic->period), 
                vparams.budget, vparams.ac_id);
@@ -51,8 +51,8 @@ static int cancel_vres(fres_vres_t *vres, void *priv)
        fwp_vresd = (fwp_vres_d_t) vres->priv;
        fwp_vres_destroy(fwp_vresd);
 
-       basic = fres_contract_get_basic(vres->contract);
-       fres_contract_id_to_string(id, &vres->contract->id, sizeof(id));
+       basic = fres_contract_get_basic(vres->allocated);
+       fres_contract_id_to_string(id, &vres->id, sizeof(id));
        printf("Creating FWP VRes (id=%s, period=%ld ms, budget=%ld bytes)\n",
               id, fosa_rel_time_to_msec(basic->period), basic->budget.tv_sec);
 

diff --git a/fwp/mngr/fwp_admctrl.c b/fwp/mngr/fwp_admctrl.c
index 39c5f53a92557183b0c17f61d65149335118d855..24ad2cbb0d0191f624b09bab2aa136b74aea463f 100644 (file)
--- a/fwp/mngr/fwp_admctrl.c
+++ b/fwp/mngr/fwp_admctrl.c
@@ -157,7 +157,7 @@ int fwp_admctrl_utilization(struct fres_sa_scenario *scenario, void *priv,
 
                basic = fres_contract_get_basic(c->contract);
                period_usec = fosa_rel_time_to_msec(basic->period)*1000;
-               if (c->status == FRES_SA_CONTRACT_NEW) {
+               if (c->contract == c->new) {
                        c_new = c;
                        if (period_usec == 0) {
                                goto not_schedulable;