From 372ae7017eac181db798147688f6e345b47e652e Mon Sep 17 00:00:00 2001 From: Tuka Martin Date: Fri, 4 May 2012 00:54:59 +0200 Subject: [PATCH] fwp: demo_sender: added contract cancellation & more budget possibilities in utilization_set --- src/fwp/fwp/demo/sender_adaptive.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/fwp/fwp/demo/sender_adaptive.c b/src/fwp/fwp/demo/sender_adaptive.c index 0adfba2d..6abf24a4 100644 --- a/src/fwp/fwp/demo/sender_adaptive.c +++ b/src/fwp/fwp/demo/sender_adaptive.c @@ -113,10 +113,16 @@ int main(int argc, char* argv[]) frsh_rel_time_t zero = fosa_msec_to_rel_time(0); frsh_utilization_set_t utilization_set; - utilization_set.size = 2; + utilization_set.size = 4; utilization_set.utilizations[1].period = fosa_msec_to_rel_time(100); - utilization_set.utilizations[1].budget = fosa_usec_to_rel_time(35); + utilization_set.utilizations[1].budget = fosa_usec_to_rel_time(3); utilization_set.utilizations[1].deadline = fosa_msec_to_rel_time(100); + utilization_set.utilizations[2].period = fosa_msec_to_rel_time(100); + utilization_set.utilizations[2].budget = fosa_usec_to_rel_time(9); + utilization_set.utilizations[2].deadline = fosa_msec_to_rel_time(100); + utilization_set.utilizations[3].period = fosa_msec_to_rel_time(100); + utilization_set.utilizations[3].budget = fosa_usec_to_rel_time(14); + utilization_set.utilizations[3].deadline = fosa_msec_to_rel_time(100); opterr = 0; while ((opt = getopt (argc, argv, "e:d:p:s:m:t:a:")) != -1) { @@ -157,7 +163,7 @@ int main(int argc, char* argv[]) WVFRSH(frsh_init()); send_pinfo.body = NULL; 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)); @@ -214,8 +220,8 @@ int main(int argc, char* argv[]) WVPASSEQ(frsh_send_sync(sepoint, msg, msg_size), msg_size); } - /* TODO: destroy vres and send enpoint */ - + frsh_contract_cancel(vres); + frsh_contract_destroy((struct fres_contract **)contract); printf("Test PASSED!\n"); return 0; } -- 2.39.2