ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ECHOTEST internal loop simplification and fix 

The loop was wrongly incrementing the index of the array after assiging
the value. Thus the first array element was used twice and the last one
was never user. The issue is fixed and the loops are refactored and
simplified to avoid such confusion in the future.
pull/10381/head
Michal Paszta 2019-04-12 10:32:03 +03:00
parent 2641fb38ce
commit 631540a421
3 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
TESTS/netsocket/tcp/tcpsocket_echotest.cpp
View File

@ -67,16 +67,16 @@ void TCPSOCKET_ECHOTEST()
int recvd; int recvd;
int sent; int sent;
int x = 0; for (int s_idx = 0; s_idx < sizeof(pkt_sizes) / sizeof(*pkt_sizes); s_idx++) {
for (int pkt_s = pkt_sizes[x]; x < PKTS; pkt_s = pkt_sizes[x++]) { int pkt_s = pkt_sizes[s_idx];
fill_tx_buffer_ascii(tcp_global::tx_buffer, BUFF_SIZE); fill_tx_buffer_ascii(tcp_global::tx_buffer, BUFF_SIZE);
sent = sock.send(tcp_global::tx_buffer, pkt_s); sent = sock.send(tcp_global::tx_buffer, pkt_s);
if (sent < 0) { if (sent < 0) {
printf("[Round#%02d] network error %d\n", x, sent); printf("[Round#%02d] network error %d\n", s_idx, sent);
TEST_FAIL(); TEST_FAIL();
break; break;
} else if (sent != pkt_s) { } else if (sent != pkt_s) {
printf("[%02d] sock.send return size %d does not match the expectation %d\n", x, sent, pkt_s); printf("[%02d] sock.send return size %d does not match the expectation %d\n", s_idx, sent, pkt_s);
TEST_FAIL(); TEST_FAIL();
break; break;
} }
@ -85,7 +85,7 @@ void TCPSOCKET_ECHOTEST()
while (bytes2recv) { while (bytes2recv) {
recvd = sock.recv(&(tcp_global::rx_buffer[sent - bytes2recv]), bytes2recv); recvd = sock.recv(&(tcp_global::rx_buffer[sent - bytes2recv]), bytes2recv);
if (recvd < 0) { if (recvd < 0) {
printf("[Round#%02d] network error %d\n", x, recvd); printf("[Round#%02d] network error %d\n", s_idx, recvd);
TEST_FAIL(); TEST_FAIL();
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close()); TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
return; return;
@ -143,7 +143,6 @@ void TCPSOCKET_ECHOTEST_NONBLOCK()
int bytes2send; int bytes2send;
int sent; int sent;
int s_idx = 0;
receive_error = false; receive_error = false;
unsigned char *stack_mem = (unsigned char *)malloc(tcp_global::TCP_OS_STACK_SIZE); unsigned char *stack_mem = (unsigned char *)malloc(tcp_global::TCP_OS_STACK_SIZE);
TEST_ASSERT_NOT_NULL(stack_mem); TEST_ASSERT_NOT_NULL(stack_mem);
@ -154,8 +153,8 @@ void TCPSOCKET_ECHOTEST_NONBLOCK()
TEST_ASSERT_EQUAL(osOK, receiver_thread->start(callback(&queue, &EventQueue::dispatch_forever))); TEST_ASSERT_EQUAL(osOK, receiver_thread->start(callback(&queue, &EventQueue::dispatch_forever)));
for (int pkt_s = pkt_sizes[s_idx]; s_idx < PKTS; ++s_idx) { for (int s_idx = 0; s_idx < sizeof(pkt_sizes) / sizeof(*pkt_sizes); ++s_idx) {
pkt_s = pkt_sizes[s_idx]; int pkt_s = pkt_sizes[s_idx];
bytes2recv = pkt_s; bytes2recv = pkt_s;
bytes2recv_total = pkt_s; bytes2recv_total = pkt_s;

16
TESTS/netsocket/tls/tlssocket_echotest.cpp
View File

@ -70,17 +70,17 @@ void TLSSOCKET_ECHOTEST()
int recvd; int recvd;
int sent; int sent;
int x = 0; for (int s_idx = 0; s_idx < sizeof(pkt_sizes) / sizeof(*pkt_sizes); s_idx++) {
for (int pkt_s = pkt_sizes[x]; x < PKTS; pkt_s = pkt_sizes[x++]) { int pkt_s = pkt_sizes[s_idx];
fill_tx_buffer_ascii(tls_global::tx_buffer, BUFF_SIZE); fill_tx_buffer_ascii(tls_global::tx_buffer, BUFF_SIZE);
sent = sock->send(tls_global::tx_buffer, pkt_s); sent = sock->send(tls_global::tx_buffer, pkt_s);
if (sent < 0) { if (sent < 0) {
printf("[Round#%02d] network error %d\n", x, sent); printf("[Round#%02d] network error %d\n", s_idx, sent);
TEST_FAIL(); TEST_FAIL();
break; break;
} else if (sent != pkt_s) { } else if (sent != pkt_s) {
printf("[%02d] sock.send return size %d does not match the expectation %d\n", x, sent, pkt_s); printf("[%02d] sock.send return size %d does not match the expectation %d\n", s_idx, sent, pkt_s);
TEST_FAIL(); TEST_FAIL();
break; break;
} }
@ -89,7 +89,7 @@ void TLSSOCKET_ECHOTEST()
while (bytes2recv) { while (bytes2recv) {
recvd = sock->recv(&(tls_global::rx_buffer[sent - bytes2recv]), bytes2recv); recvd = sock->recv(&(tls_global::rx_buffer[sent - bytes2recv]), bytes2recv);
if (recvd < 0) { if (recvd < 0) {
printf("[Round#%02d] network error %d\n", x, recvd); printf("[Round#%02d] network error %d\n", s_idx, recvd);
TEST_FAIL(); TEST_FAIL();
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->close()); TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->close());
return; return;
@ -146,7 +146,7 @@ void TLSSOCKET_ECHOTEST_NONBLOCK()
int bytes2send; int bytes2send;
int sent; int sent;
int s_idx = 0; ;
receive_error = false; receive_error = false;
unsigned char *stack_mem = (unsigned char *)malloc(tls_global::TLS_OS_STACK_SIZE); unsigned char *stack_mem = (unsigned char *)malloc(tls_global::TLS_OS_STACK_SIZE);
TEST_ASSERT_NOT_NULL(stack_mem); TEST_ASSERT_NOT_NULL(stack_mem);
@ -158,8 +158,8 @@ void TLSSOCKET_ECHOTEST_NONBLOCK()
event_queue = &queue; event_queue = &queue;
TEST_ASSERT_EQUAL(osOK, receiver_thread->start(callback(&queue, &EventQueue::dispatch_forever))); TEST_ASSERT_EQUAL(osOK, receiver_thread->start(callback(&queue, &EventQueue::dispatch_forever)));
for (int pkt_s = pkt_sizes[s_idx]; s_idx < PKTS; ++s_idx) { for (int s_idx = 0; s_idx < sizeof(pkt_sizes) / sizeof(*pkt_sizes); ++s_idx) {
pkt_s = pkt_sizes[s_idx]; int pkt_s = pkt_sizes[s_idx];
bytes2recv = pkt_s; bytes2recv = pkt_s;
bytes2recv_total = pkt_s; bytes2recv_total = pkt_s;

10
TESTS/netsocket/udp/udpsocket_echotest.cpp
View File

@ -68,11 +68,10 @@ void UDPSOCKET_ECHOTEST()
int recvd; int recvd;
int sent; int sent;
int s_idx = 0;
int packets_sent = 0; int packets_sent = 0;
int packets_recv = 0; int packets_recv = 0;
for (int pkt_s = pkt_sizes[s_idx]; s_idx < PKTS; pkt_s = ++s_idx) { for (int s_idx = 0; s_idx < sizeof(pkt_sizes) / sizeof(*pkt_sizes); ++s_idx) {
pkt_s = pkt_sizes[s_idx]; int pkt_s = pkt_sizes[s_idx];
fill_tx_buffer_ascii(tx_buffer, BUFF_SIZE); fill_tx_buffer_ascii(tx_buffer, BUFF_SIZE);
@ -147,15 +146,14 @@ void UDPSOCKET_ECHOTEST_NONBLOCK()
sock.sigio(callback(_sigio_handler)); sock.sigio(callback(_sigio_handler));
int sent; int sent;
int s_idx = 0;
int packets_sent = 0; int packets_sent = 0;
int packets_recv = 0; int packets_recv = 0;
Thread *thread; Thread *thread;
unsigned char *stack_mem = (unsigned char *)malloc(OS_STACK_SIZE); unsigned char *stack_mem = (unsigned char *)malloc(OS_STACK_SIZE);
TEST_ASSERT_NOT_NULL(stack_mem); TEST_ASSERT_NOT_NULL(stack_mem);
for (int pkt_s = pkt_sizes[s_idx]; s_idx < PKTS; ++s_idx) { for (int s_idx = 0; s_idx < sizeof(pkt_sizes) / sizeof(*pkt_sizes); ++s_idx) {
pkt_s = pkt_sizes[s_idx]; int pkt_s = pkt_sizes[s_idx];
thread = new Thread(osPriorityNormal, thread = new Thread(osPriorityNormal,
OS_STACK_SIZE, OS_STACK_SIZE,