RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Code Releases Activity

shell: add ping6 parameter for periodic stats

Browse Source
This commit is contained in:
Oleg Hahm 2015-10-23 15:45:11 +00:00
parent 1d47cb6826
commit af6d102162
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/shell/commands/sc_icmpv6_echo.c
View File

@ -38,11 +38,12 @@ static char ipv6_str[IPV6_ADDR_MAX_STR_LEN];
static void usage(char **argv) static void usage(char **argv)
{ {
printf("%s [<count>] <ipv6 addr> [<payload_len>] [<delay in ms>]\n", argv[0]); printf("%s [<count>] <ipv6 addr> [<payload_len>] [<delay in ms>] [<stats interval>]\n", argv[0]);
puts("defaults:"); puts("defaults:");
puts(" count = 3"); puts(" count = 3");
puts(" payload_len = 4"); puts(" payload_len = 4");
puts(" delay = 1000"); puts(" delay = 1000");
puts(" stats interval = count");
} }
void _set_payload(icmpv6_echo_t *hdr, size_t payload_len) void _set_payload(icmpv6_echo_t *hdr, size_t payload_len)
@ -129,7 +130,7 @@ static inline void _a_to_timex(timex_t *delay, const char *a)
} }
} }
static int _print_stats(char *addr_str, int success, int count, timex_t stop, static void _print_stats(char *addr_str, int success, int count, timex_t stop,
timex_t sum_rtt, timex_t min_rtt, timex_t max_rtt) timex_t sum_rtt, timex_t min_rtt, timex_t max_rtt)
{ {
printf("--- %s ping statistics ---\n", addr_str); printf("--- %s ping statistics ---\n", addr_str);
@ -153,14 +154,12 @@ static int _print_stats(char *addr_str, int success, int count, timex_t stop,
} }
else { else {
printf("%d packets transmitted, 0 received, 100%% packet loss\n", count); printf("%d packets transmitted, 0 received, 100%% packet loss\n", count);
return 1;
} }
return 0;
} }
int _icmpv6_ping(int argc, char **argv) int _icmpv6_ping(int argc, char **argv)
{ {
int count = 3, success = 0, remaining; int count = 3, success = 0, remaining, stat_interval = 0, stat_counter = 0;
size_t payload_len = 4; size_t payload_len = 4;
timex_t delay = { 1, 0 }; timex_t delay = { 1, 0 };
char *addr_str; char *addr_str;
@ -171,7 +170,7 @@ int _icmpv6_ping(int argc, char **argv)
}; };
timex_t min_rtt = { UINT32_MAX, UINT32_MAX }, max_rtt = { 0, 0 }; timex_t min_rtt = { UINT32_MAX, UINT32_MAX }, max_rtt = { 0, 0 };
timex_t sum_rtt = { 0, 0 }; timex_t sum_rtt = { 0, 0 };
timex_t start, stop; timex_t ping_start;
int param_offset = 0; int param_offset = 0;
if (argc < 2) { if (argc < 2) {
@ -189,6 +188,8 @@ int _icmpv6_ping(int argc, char **argv)
count = 3; count = 3;
} }
stat_interval = count;
addr_str = argv[1 + param_offset]; addr_str = argv[1 + param_offset];
if (argc > (2 + param_offset)) { if (argc > (2 + param_offset)) {
@ -197,6 +198,9 @@ int _icmpv6_ping(int argc, char **argv)
if (argc > (3 + param_offset)) { if (argc > (3 + param_offset)) {
_a_to_timex(&delay, argv[3 + param_offset]); _a_to_timex(&delay, argv[3 + param_offset]);
} }
if (argc > (4 + param_offset)) {
stat_interval = atoi(argv[4 + param_offset]);
}
if ((ipv6_addr_from_str(&addr, addr_str) == NULL) || (((int)payload_len) < 0)) { if ((ipv6_addr_from_str(&addr, addr_str) == NULL) || (((int)payload_len) < 0)) {
usage(argv); usage(argv);
@ -217,7 +221,7 @@ int _icmpv6_ping(int argc, char **argv)
remaining = count; remaining = count;
vtimer_now(&start); vtimer_now(&ping_start);
while ((remaining--) > 0) { while ((remaining--) > 0) {
gnrc_pktsnip_t *pkt; gnrc_pktsnip_t *pkt;
@ -291,13 +295,17 @@ int _icmpv6_ping(int argc, char **argv)
if (remaining > 0) { if (remaining > 0) {
vtimer_sleep(delay); vtimer_sleep(delay);
} }
} if ((++stat_counter == stat_interval) || (remaining == 0)) {
vtimer_now(&stop);
stop = timex_sub(stop, ping_start);
_print_stats(addr_str, success, (count - remaining), stop, sum_rtt, min_rtt, max_rtt);
stat_counter = 0;
}
vtimer_now(&stop); }
max_seq_expected = 0; max_seq_expected = 0;
id++; id++;
stop = timex_sub(stop, start);
gnrc_netreg_unregister(GNRC_NETTYPE_ICMPV6, &my_entry); gnrc_netreg_unregister(GNRC_NETTYPE_ICMPV6, &my_entry);
while(msg_try_receive(&msg) > 0) { while(msg_try_receive(&msg) > 0) {
@ -308,7 +316,7 @@ int _icmpv6_ping(int argc, char **argv)
} }
} }
return _print_stats(addr_str, success, count, stop, sum_rtt, min_rtt, max_rtt); return success ? 0 : 1;
} }
#endif #endif