From 31f8dc53f308bc1d2256cd55ad65613b7cd0c71a Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Wed, 10 Dec 2008 11:37:54 +0100 Subject: [PATCH 1/1] Fixed budget conversion in FRA --- fwp/lib/frsh_fwp/fwp_fra.c | 5 +++-- fwp/lib/fwp/fwp_vres.c | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/fwp/lib/frsh_fwp/fwp_fra.c b/fwp/lib/frsh_fwp/fwp_fra.c index 9073d8d..ce50301 100644 --- a/fwp/lib/frsh_fwp/fwp_fra.c +++ b/fwp/lib/frsh_fwp/fwp_fra.c @@ -64,13 +64,14 @@ static int create_vres(fres_vres_t *vres, void *priv) fwp_vres_params_t vparams; fwp_vres_d_t fwp_vresd; int rv; + size_t bytes; /* Prepare vres parameters */ 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/1000000; + frsh_network_budget_to_bytes(FRSH_NETPF_FWP, &basic->budget, &bytes); + vparams.budget = bytes; vparams.period = basic->period; vparams.ac_id = fwp_sched->ac_id; /* Create vres */ diff --git a/fwp/lib/fwp/fwp_vres.c b/fwp/lib/fwp/fwp_vres.c index 6b255e1..5c91d23 100644 --- a/fwp/lib/fwp/fwp_vres.c +++ b/fwp/lib/fwp/fwp_vres.c @@ -427,9 +427,9 @@ static void* fwp_vres_tx_thread(void *_vres) rc = _fwp_vres_send(vres->ac_sockd, msgb); if (!(rc < 0)) { FWP_DEBUG("Message sent through AC%d\n",ac_id); - /* Switch to this in the future */ - //curr_budget+= msgb->len; - curr_budget++; + curr_budget+= msgb->len; + } else { + FWP_DEBUG("Message sent error %d\n",rc); } fwp_msgb_free(msgb); -- 2.39.2