fwp: demo: sender: Added ID argument for station definition

Corrected log message

diff --git a/src/fwp/fwp/demo/fake_wifi_agent.c b/src/fwp/fwp/demo/fake_wifi_agent.c
index 87a9abe092433fa42f642fde1f31160666c41387..f7ec7a8e2313ab485c7d74bf6eec9db8bd12f667 100644 (file)
--- 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 bf356428a401510e53c9a49eb514ceb0516dcaf7..a302e860c98c0aac793e350d09ef02f5bf6e7386 100755 (executable)
--- 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 1ccfa528ba3692946aa848351b51c109dfdcfe92..d1c37d79b237a5ebd96d29ca3a579fef1d11ccfd 100755 (executable)
--- 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 f4a8c19363a926a55db3f48fd727867fb4361240..ebbe114e72f739be983dd74961de9fada47b1eba 100755 (executable)
--- 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 7ef8c709eaff5ceae0028b66c647c5ec3f8ba3fd..edb0172708f39fd876450e02070ac0c4ea906998 100755 (executable)
--- 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 2fdc463752d7804870f68de642ade6db184f3c7b..14330b6c9b4bc8c0384dc00ccaf190001dc03d25 100644 (file)
--- 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);