From 2eb1dac5d19a1d63014b986452b1f8b728820b15 Mon Sep 17 00:00:00 2001 From: Tuka Martin Date: Sat, 11 Feb 2012 21:36:30 +0100 Subject: [PATCH] Warnings corrections --- src/fwp/fwp/demo/Makefile.omk | 1 - src/fwp/fwp/demo/sender.c | 37 +++++++++++++--------------- src/fwp/fwp/mngr/fwp_mngr.c | 2 -- src/fwp/fwp/mngr/test/fwp_adm_test.c | 4 ++- src/fwp/fwp/mngr/wifi_agent.c | 8 +++--- 5 files changed, 25 insertions(+), 27 deletions(-) diff --git a/src/fwp/fwp/demo/Makefile.omk b/src/fwp/fwp/demo/Makefile.omk index 660cf08f..a1f1e2eb 100644 --- a/src/fwp/fwp/demo/Makefile.omk +++ b/src/fwp/fwp/demo/Makefile.omk @@ -1,5 +1,4 @@ test_PROGRAMS = fwp_demo_sender fwp_demo_reciever -CFLAGS+= -D_FWP_INTERNALS_ fwp_demo_sender_SOURCES+= sender.c fwp_demo_reciever_SOURCES+= reciever.c lib_LOADLIBES += frm forb fosa frsh fwp_admctrl fwp pthread rt ulut frsh_fwp contract diff --git a/src/fwp/fwp/demo/sender.c b/src/fwp/fwp/demo/sender.c index 0143ae16..17b5500f 100644 --- a/src/fwp/fwp/demo/sender.c +++ b/src/fwp/fwp/demo/sender.c @@ -98,24 +98,23 @@ char * prepare_msg(int size) { for(i=0; ibudget; - int size_of_budget_old; int size_of_period_ms = p->period_ms; /* ----------------------------- */ - fwp_vres_t *vres; - struct fwp_vres_params vparam; - char buffer[30]; - struct fwp_endpoint *sepoint, *repoint; + struct fres_vres * vres; + //struct fwp_vres_params * vparam; + struct fna_endpoint_data * sepoint; fwp_endpoint_attr_t attr; int num; num = 0; @@ -123,8 +122,6 @@ int send_data(struct stream_params *p) char * msg; msg = prepare_msg(size_of_budget_actual); - fres_block_fwp_sched *fwp_sched; - fwp_init(); frsh_send_endpoint_protocol_info_t send_pinfo; @@ -166,35 +163,36 @@ int send_data(struct stream_params *p) fwp_block = (fres_block_fwp*)malloc(sizeof(fres_block_fwp)); /*Add mac address for each contract*/ - //TODO: Get local address - fwp_block->mac_address = 98422970084; //get_local_mac("wlan0"); + //TODO: Get local address automatically + fwp_block->mac_address = 2970084; //get_local_mac("wlan0"); fres_contract_add_block(contract, FRES_BLOCK_FWP, fwp_block); - /* --------------------------- */ fwp_endpoint_attr_init(&attr); - + + //probably no need to deal with virtual resources + /* vparam.ac_id = FWP_AC_VO; vparam.budget = size_of_budget_actual; vparam.period.tv_sec = 0; vparam.period.tv_nsec = size_of_period_ms*1000*1000; - - printf("Start\n"); - printf("Create VRES\n"); - if (fwp_vres_create(&vparam, &vres) < 0) { + if (fwp_vres_create(vparam, (fwp_vres_t **)&vres) < 0) { printf("Unable to create VRES\n"); return -1; } printf("VRES created \n"); + */ + printf("Start\n"); + //contract negotioate function if ((frsh_contract_negotiate(&contract, &vres)) != 0) { printf("not negotiated\n"); frsh_contract_cancel(vres); size_of_budget_actual = size_of_budget_actual - 100; - frsh_contract_cancel(vres); - frsh_contract_destroy(contract); + frsh_contract_cancel((frsh_vres_id_t)&vres); + frsh_contract_destroy(&contract); continue; } @@ -207,7 +205,7 @@ int send_data(struct stream_params *p) free(msg); frsh_contract_cancel(vres); - frsh_contract_destroy(contract); + frsh_contract_destroy(&contract); sleep(1); } /* @@ -223,7 +221,6 @@ int send_data(struct stream_params *p) int main(void) { - int i; int num = 0; struct stream_params sp = { diff --git a/src/fwp/fwp/mngr/fwp_mngr.c b/src/fwp/fwp/mngr/fwp_mngr.c index 9324a304..47dc5296 100644 --- a/src/fwp/fwp/mngr/fwp_mngr.c +++ b/src/fwp/fwp/mngr/fwp_mngr.c @@ -180,8 +180,6 @@ int main(int argc, char *argv[]) } } - int pid; - int pid2; fosa_thread_id_t tid; fcb_orb = forb_init(NULL, NULL, NULL); diff --git a/src/fwp/fwp/mngr/test/fwp_adm_test.c b/src/fwp/fwp/mngr/test/fwp_adm_test.c index 570448ce..937f76f6 100644 --- a/src/fwp/fwp/mngr/test/fwp_adm_test.c +++ b/src/fwp/fwp/mngr/test/fwp_adm_test.c @@ -48,6 +48,9 @@ struct frm_fwp_priv priv = { // .list_head = NULL,//head of linked list initialized in main function }; +int fwp_admctrl_utilization(struct fres_sa_scenario *scenario, void *priv, + bool *schedulable); + struct stream_params { int id; int budget1; @@ -79,7 +82,6 @@ int fwp_admctrl_utilization_test(struct stream_params *p) frsh_rel_time_t deadline1; frsh_rel_time_t deadline2; frsh_rel_time_t deadline3; - int ret; bool schedulable; fres_block_fwp_sched *fwp_sched; diff --git a/src/fwp/fwp/mngr/wifi_agent.c b/src/fwp/fwp/mngr/wifi_agent.c index 3847132d..a7296c18 100644 --- a/src/fwp/fwp/mngr/wifi_agent.c +++ b/src/fwp/fwp/mngr/wifi_agent.c @@ -32,11 +32,13 @@ void wifi_agent_idl_print_state(wifi_agent_idl _obj, CORBA_Environment *ev) { fwp_sta_t *sta2; - dprintf(2, "Actual_list_of_stations\n"); + //TODO: Initially here was print to descriptor 2 - find posix equivalent / test if it's working + //dprintf(2, "Actual_list_of_stations\n"); + printf("Actual_list_of_stations\n"); ul_list_for_each(sta_list, &priv.sta_list, sta2){ - dprintf(2, "%llu_-_%d\n", sta2->client_mac_addr, sta2->rate); + printf("%llu_-_%d\n", sta2->client_mac_addr, sta2->rate); } - dprintf(2, "------------\n\n"); + printf("------------\n\n"); } -- 2.39.2