From c8a718d56ea4f1de52ba896505a051d131bf628d Mon Sep 17 00:00:00 2001 From: Tuka Martin Date: Mon, 7 May 2012 13:41:59 +0200 Subject: [PATCH] fwp: demo: sender: Added ID argument for station definition Corrected log message --- src/fwp/fwp/demo/fake_wifi_agent.c | 2 +- .../fwp/demo/fwp_send_receive_adaptive_rate_change.sh | 2 +- .../demo/fwp_send_receive_adaptive_rate_change_2.sh | 6 +++--- .../demo/fwp_send_receive_adaptive_rate_change_3.sh | 6 +++--- .../demo/fwp_send_receive_adaptive_rate_change_4.sh | 8 ++++---- src/fwp/fwp/demo/sender_adaptive.c | 10 +++++++--- 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/src/fwp/fwp/demo/fake_wifi_agent.c b/src/fwp/fwp/demo/fake_wifi_agent.c index 87a9abe0..f7ec7a8e 100644 --- a/src/fwp/fwp/demo/fake_wifi_agent.c +++ b/src/fwp/fwp/demo/fake_wifi_agent.c @@ -106,7 +106,7 @@ int main(int argc, char **argv) if(wai == NULL) fprintf(stderr, "failed to create connection\n"); else - { ul_logmsg("Rate: %d \n", rate); + { ul_logmsg("MAC address \"%s\" rate: %d \n", mac_addr, rate); wifi_agent_idl_add(wai, rate, mac_addr_string_to_number(mac_addr), &env); //TODO: Print state is just for testing purposes - delete diff --git a/src/fwp/fwp/demo/fwp_send_receive_adaptive_rate_change.sh b/src/fwp/fwp/demo/fwp_send_receive_adaptive_rate_change.sh index bf356428..a302e860 100755 --- a/src/fwp/fwp/demo/fwp_send_receive_adaptive_rate_change.sh +++ b/src/fwp/fwp/demo/fwp_send_receive_adaptive_rate_change.sh @@ -21,7 +21,7 @@ WVPASS frm_fwp -dfwp.pid WVPASS fake_wifi_agent -a 00:00:01:AA:BB:CC -r 10 # Receiver running in different console #WVPASS fwp_demo_receiver -p 7777 -WVPASS fwp_demo_sender_adaptive -efds.pid -d 127.0.0.1 -p 7777 -m 15 -s 3000 -a 00:00:01:AA:BB:CC +WVPASS fwp_demo_sender_adaptive -i 1 -efds.pid -d 127.0.0.1 -p 7777 -m 15 -s 3000 -a 00:00:01:AA:BB:CC WVPASS sleep 1 WVPASS fake_wifi_agent -a 00:00:01:AA:BB:CC -r 1 WVPASS sleep 1 diff --git a/src/fwp/fwp/demo/fwp_send_receive_adaptive_rate_change_2.sh b/src/fwp/fwp/demo/fwp_send_receive_adaptive_rate_change_2.sh index 1ccfa528..d1c37d79 100755 --- a/src/fwp/fwp/demo/fwp_send_receive_adaptive_rate_change_2.sh +++ b/src/fwp/fwp/demo/fwp_send_receive_adaptive_rate_change_2.sh @@ -23,9 +23,9 @@ WVPASS frm_fwp -dfwp.pid WVPASS fake_wifi_agent -a 00:00:01:AA:BB:CC -r 10 WVPASS fake_wifi_agent -a 00:00:01:AA:BC:CC -r 10 echo '1. run' -WVPASS fwp_demo_sender_adaptive -efds1.pid -d 127.0.0.1 -p 7777 -m 40 -s 1000 -a 00:00:01:AA:BB:CC +WVPASS fwp_demo_sender_adaptive -i 1 -efds1.pid -d 127.0.0.1 -p 7777 -m 40 -s 1000 -a 00:00:01:AA:BB:CC WVPASS sleep 1 -WVPASS fwp_demo_sender_adaptive -efds2.pid -d 127.0.0.1 -p 7778 -m 30 -s 1000 -a 00:00:01:AA:BC:CC +WVPASS fwp_demo_sender_adaptive -i 2 -efds2.pid -d 127.0.0.1 -p 7778 -m 30 -s 1000 -a 00:00:01:AA:BC:CC WVPASS sleep 1 WVPASS fake_wifi_agent -a 00:00:01:AA:BC:CC -r 1 WVPASS fake_wifi_agent -a 00:00:01:AA:BB:CC -r 1 @@ -34,5 +34,5 @@ WVPASS fake_wifi_agent -a 00:00:01:AA:BC:CC -r 10 WVPASS sleep 2 WVPASS fake_wifi_agent -a 00:00:01:AA:BB:CC -r 1 echo '2. run' -WVPASS fwp_demo_sender_adaptive -d 127.0.0.1 -p 7777 -m 40 -s 1000 -a 00:00:01:AA:BB:CC +WVPASS fwp_demo_sender_adaptive -i 1 -d 127.0.0.1 -p 7777 -m 40 -s 1000 -a 00:00:01:AA:BB:CC diff --git a/src/fwp/fwp/demo/fwp_send_receive_adaptive_rate_change_3.sh b/src/fwp/fwp/demo/fwp_send_receive_adaptive_rate_change_3.sh index f4a8c193..ebbe114e 100755 --- a/src/fwp/fwp/demo/fwp_send_receive_adaptive_rate_change_3.sh +++ b/src/fwp/fwp/demo/fwp_send_receive_adaptive_rate_change_3.sh @@ -23,9 +23,9 @@ WVPASS fcb -dfcb.pid WVPASS frm_fwp -dfwp.pid WVPASS fake_wifi_agent -a 00:00:01:AA:BB:CC -r 12 WVPASS fake_wifi_agent -a 00:00:01:AA:BC:CC -r 10 -WVPASS fwp_demo_sender_adaptive -efds1.pid -d 127.0.0.1 -p 7777 -m 50 -a 00:00:01:AA:BB:CC -WVPASS fwp_demo_sender_adaptive -efds2.pid -d 127.0.0.1 -p 7778 -m 50 -a 00:00:01:AA:BB:CC -WVPASS fwp_demo_sender_adaptive -efds3.pid -d 127.0.0.1 -p 7779 -m 50 -a 00:00:01:AA:BC:CC +WVPASS fwp_demo_sender_adaptive -i 1 -efds1.pid -d 127.0.0.1 -p 7777 -m 50 -a 00:00:01:AA:BB:CC +WVPASS fwp_demo_sender_adaptive -i 2 -efds2.pid -d 127.0.0.1 -p 7778 -m 50 -a 00:00:01:AA:BB:CC +WVPASS fwp_demo_sender_adaptive -i 3 -efds3.pid -d 127.0.0.1 -p 7779 -m 50 -a 00:00:01:AA:BC:CC WVPASS sleep 2 WVPASS fake_wifi_agent -a 00:00:01:AA:BB:CC -r 1 WVPASS sleep 2 diff --git a/src/fwp/fwp/demo/fwp_send_receive_adaptive_rate_change_4.sh b/src/fwp/fwp/demo/fwp_send_receive_adaptive_rate_change_4.sh index 7ef8c709..edb01727 100755 --- a/src/fwp/fwp/demo/fwp_send_receive_adaptive_rate_change_4.sh +++ b/src/fwp/fwp/demo/fwp_send_receive_adaptive_rate_change_4.sh @@ -24,10 +24,10 @@ WVPASS fcb -dfcb.pid WVPASS frm_fwp -dfwp.pid WVPASS fake_wifi_agent -a 00:00:01:AA:BB:01 -r 40 WVPASS fake_wifi_agent -a 00:00:01:AA:BC:02 -r 12 -WVPASS fwp_demo_sender_adaptive -efds1.pid -d 127.0.0.1 -p 7777 -m 50 -a 00:00:01:AA:BB:01 -WVPASS fwp_demo_sender_adaptive -efds2.pid -d 127.0.0.1 -p 7778 -m 50 -a 00:00:01:AA:BB:01 -WVPASS fwp_demo_sender_adaptive -efds3.pid -d 127.0.0.1 -p 7779 -m 50 -a 00:00:01:AA:BB:01 -WVPASS fwp_demo_sender_adaptive -efds4.pid -d 127.0.0.1 -p 7780 -m 50 -a 00:00:01:AA:BC:02 +WVPASS fwp_demo_sender_adaptive -i 1 -efds1.pid -d 127.0.0.1 -p 7777 -m 50 -a 00:00:01:AA:BB:01 +WVPASS fwp_demo_sender_adaptive -i 2 -efds2.pid -d 127.0.0.1 -p 7778 -m 50 -a 00:00:01:AA:BB:01 +WVPASS fwp_demo_sender_adaptive -i 3 -efds3.pid -d 127.0.0.1 -p 7779 -m 50 -a 00:00:01:AA:BB:01 +WVPASS fwp_demo_sender_adaptive -i 4 -efds4.pid -d 127.0.0.1 -p 7780 -m 50 -a 00:00:01:AA:BC:02 WVPASS sleep 3 WVPASS fake_wifi_agent -a 00:00:01:AA:BB:01 -r 1 WVPASS fake_wifi_agent -a 00:00:01:AA:BC:02 -r 1 diff --git a/src/fwp/fwp/demo/sender_adaptive.c b/src/fwp/fwp/demo/sender_adaptive.c index 2fdc4637..14330b6c 100644 --- a/src/fwp/fwp/demo/sender_adaptive.c +++ b/src/fwp/fwp/demo/sender_adaptive.c @@ -114,6 +114,7 @@ int main(int argc, char* argv[]) frsh_contract_t contract; frsh_rel_time_t budget, period; int count; + int id = 0; bool opt_daemon = false; char *opt_pidfile = NULL; @@ -132,9 +133,12 @@ int main(int argc, char* argv[]) utilization_set.utilizations[2].deadline = fosa_msec_to_rel_time(100); opterr = 0; - while ((opt = getopt (argc, argv, "e:d:p:s:m:t:a:")) != -1) { + while ((opt = getopt (argc, argv, "i:e:d:p:s:m:t:a:")) != -1) { switch (opt) { + case 'i': + id = atoi(optarg); + break; case 'e': opt_daemon = true; opt_pidfile = optarg; @@ -158,7 +162,7 @@ int main(int argc, char* argv[]) strcpy(mac_addr, optarg); break; case '?': - printf("Usage: %s -e -d dst_ip_addr -p port" + printf("Usage: %s -i id -e -d dst_ip_addr -p port" "-m num_msg -s msg_size -a mac_addr\n", argv[0]); } @@ -210,7 +214,7 @@ int main(int argc, char* argv[]) count++; WVPASS(frsh_vres_get_budget_and_period (vres, &budget, &period) == 0); WVFRSH(frsh_network_budget_to_bytes(resource_id, &budget, &msg_size)); - ul_logmsg("Message %d with size %d\n", count, msg_size); + ul_logmsg("Station ID %d: Message %d with size: %d\n", id, count, msg_size); msg = prepare_msg(msg_size); -- 2.39.2