fwp: demo_sender: budget values corrected

diff --git a/src/fwp/fwp/demo/sender_adaptive.c b/src/fwp/fwp/demo/sender_adaptive.c
index 879831b7fcebacc1fa0a15ed99125b7ac7787702..1d81e2123d55a43c2066c08a68a70708c5078cf9 100644 (file)
--- a/src/fwp/fwp/demo/sender_adaptive.c
+++ b/src/fwp/fwp/demo/sender_adaptive.c
@@ -114,11 +114,14 @@ int main(int argc, char* argv[])
 
        frsh_utilization_set_t utilization_set;
        utilization_set.size = 3;
+       utilization_set.utilizations[0].period = fosa_msec_to_rel_time(100);
+       WVFRSH(frsh_network_bytes_to_budget(resource_id, 1000, &utilization_set.utilizations[0].budget));
+       utilization_set.utilizations[0].deadline = fosa_msec_to_rel_time(100);
        utilization_set.utilizations[1].period = fosa_msec_to_rel_time(100);
-       WVFRSH(frsh_network_bytes_to_budget(resource_id, 3000, &utilization_set.utilizations[1].budget));
+       WVFRSH(frsh_network_bytes_to_budget(resource_id, 14000, &utilization_set.utilizations[1].budget));
        utilization_set.utilizations[1].deadline = fosa_msec_to_rel_time(100);
        utilization_set.utilizations[2].period = fosa_msec_to_rel_time(100);
-       WVFRSH(frsh_network_bytes_to_budget(resource_id, 14000, &utilization_set.utilizations[2].budget));
+       WVFRSH(frsh_network_bytes_to_budget(resource_id, 35000, &utilization_set.utilizations[2].budget));
        utilization_set.utilizations[2].deadline = fosa_msec_to_rel_time(100);
 
        opterr = 0;
@@ -159,11 +162,11 @@ int main(int argc, char* argv[])
 
        WVFRSH(frsh_init());
        send_pinfo.body = NULL;
+       send_pinfo.size = 0;
        WVPASSNE(frsh_send_endpoint_create(resource_id, dst_ip, port, send_pinfo, &sepoint), 0);
        
        /* Contract parameters */
        WVFRSH(frsh_contract_init(&contract));
-       WVFRSH(frsh_network_bytes_to_budget(resource_id, msg_size, &utilization_set.utilizations[0].budget));
        utilization_set.utilizations[0].period = fosa_msec_to_rel_time(time_period);
        WVFRSH(frsh_contract_set_basic_params(&contract,
                                             &utilization_set.utilizations[0].budget,
@@ -180,15 +183,6 @@ int main(int argc, char* argv[])
        fwp_block->src = 0;
        WVPASS(fres_contract_add_block(contract, FRES_BLOCK_FWP, fwp_block) == 0);
 
-       /* Add spare capacity block */
-       //TODO: Delete extra spare capacity block initialization, since spare capacity is initialized in set_reclamation_params function        
-       //fres_block_spare_capacity *s;
-       //WVPASS((s = malloc(sizeof(*s))) != NULL);
-       //s->budget = (fosa_rel_time_t)budget;
-       //s->budget = (fosa_rel_time_t)utilization_set.utilizations[0].budget;
-       //s->period = (fosa_rel_time_t)utilization_set.utilizations[0].period;
-       //WVPASS(fres_contract_add_spare_capacity(contract, s) == 0);
-
        WVFRSH(frsh_contract_set_reclamation_params(&contract,
                &zero,
                &utilization_set.utilizations[utilization_set.size-1].budget,