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

Cleaning up udp tests

pull/4521/head
Brian Daniels 2017-05-22 19:17:53 -05:00 committed by adbridge
parent 20240c043e
commit 12658f9285
2 changed files with 52 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
features/FEATURE_LWIP/TESTS/mbedmicro-net/udp_echo/main.cpp
View File

@ -87,31 +87,31 @@ void test_udp_echo() {
SocketAddress udp_addr(ipbuf, port); SocketAddress udp_addr(ipbuf, port);
int success = 0; int success = 0;
for (int i = 0; success < ECHO_LOOPS; i++) { for (unsigned int i = 0; success < ECHO_LOOPS; i++) {
prep_buffer(uuid, tx_buffer, sizeof(tx_buffer)); prep_buffer(uuid, tx_buffer, sizeof(tx_buffer));
const int ret = sock.sendto(udp_addr, tx_buffer, sizeof(tx_buffer)); int ret = sock.sendto(udp_addr, tx_buffer, sizeof(tx_buffer));
if (ret >= 0) { if (ret >= 0) {
printf("[%02d] sent %d bytes - %.*s \n", i, ret, ret, tx_buffer); printf("[%02u] sent %d bytes - %.*s \n", i, ret, ret, tx_buffer);
} else { } else {
printf("[%02d] Network error %d\n", i, ret); printf("[%02u] Network error %d\n", i, ret);
continue; continue;
} }
SocketAddress temp_addr; SocketAddress temp_addr;
const int n = sock.recvfrom(&temp_addr, rx_buffer, sizeof(rx_buffer)); ret = sock.recvfrom(&temp_addr, rx_buffer, sizeof(rx_buffer));
if (n >= 0) { if (ret >= 0) {
printf("[%02d] recv %d bytes - %.*s \n", i, n, n, tx_buffer); printf("[%02u] recv %d bytes - %.*s \n", i, ret, ret, tx_buffer);
} else { } else {
printf("[%02d] Network error %d\n", i, n); printf("[%02u] Network error %d\n", i, ret);
continue; continue;
} }
if ((temp_addr == udp_addr && if ((temp_addr == udp_addr &&
n == sizeof(tx_buffer) && ret == sizeof(tx_buffer) &&
memcmp(rx_buffer, tx_buffer, sizeof(rx_buffer)) == 0)) { memcmp(rx_buffer, tx_buffer, sizeof(rx_buffer)) == 0)) {
success += 1; success += 1;
printf("[%02d] success #%d\n", i, success); printf("[%02u] success #%d\n", i, success);
continue; continue;
} }

35
features/FEATURE_LWIP/TESTS/mbedmicro-net/udp_echo_parallel/main.cpp
View File

@ -48,7 +48,7 @@ char uuid[GREENTEA_UUID_LENGTH] = {0};
// would have a buffer filled with something like `2 33e5002c-9722-4685-817a-709cc69c4701 12594387` // would have a buffer filled with something like `2 33e5002c-9722-4685-817a-709cc69c4701 12594387`
// where `2` is the thread id, `33e5002c-9722-4685-817a-709cc69c4701` is the UUID // where `2` is the thread id, `33e5002c-9722-4685-817a-709cc69c4701` is the UUID
// and `12594387` is the random data // and `12594387` is the random data
void prep_buffer(int id, char *uuid, char *tx_buffer, size_t tx_size) { void prep_buffer(unsigned int id, char *uuid, char *tx_buffer, size_t tx_size) {
size_t i = 0; size_t i = 0;
tx_buffer[i++] = '0' + id; tx_buffer[i++] = '0' + id;
@ -74,7 +74,7 @@ private:
UDPSocket sock; UDPSocket sock;
Thread thread; Thread thread;
bool result; bool result;
int id; unsigned int id;
char *uuid; char *uuid;
public: public:
@ -82,7 +82,7 @@ public:
Echo(): thread(osPriorityNormal, 1024), result(false) { Echo(): thread(osPriorityNormal, 1024), result(false) {
} }
void start(int id, char *uuid) { void start(unsigned int id, char *uuid) {
this->id = id; this->id = id;
this->uuid = uuid; this->uuid = uuid;
osStatus status = thread.start(callback(this, &Echo::echo)); osStatus status = thread.start(callback(this, &Echo::echo));
@ -101,39 +101,39 @@ public:
sock.set_timeout(MBED_CFG_UDP_CLIENT_ECHO_TIMEOUT); sock.set_timeout(MBED_CFG_UDP_CLIENT_ECHO_TIMEOUT);
for (int i = 0; success < ECHO_LOOPS; i++) { for (unsigned int i = 0; success < ECHO_LOOPS; i++) {
prep_buffer(id, uuid, tx_buffer, sizeof(tx_buffer)); prep_buffer(id, uuid, tx_buffer, sizeof(tx_buffer));
const int ret = sock.sendto(udp_addr, tx_buffer, sizeof(tx_buffer)); int ret = sock.sendto(udp_addr, tx_buffer, sizeof(tx_buffer));
if (ret >= 0) { if (ret >= 0) {
iomutex.lock(); iomutex.lock();
printf("[ID:%01d][%02d] sent %d bytes - %.*s \n", id, i, ret, ret, tx_buffer); printf("[ID:%01u][%02u] sent %d bytes - %.*s \n", id, i, ret, ret, tx_buffer);
iomutex.unlock(); iomutex.unlock();
} else { } else {
iomutex.lock(); iomutex.lock();
printf("[ID:%01d][%02d] Network error %d\n", id, i, ret); printf("[ID:%01u][%02u] Network error %d\n", id, i, ret);
iomutex.unlock(); iomutex.unlock();
continue; continue;
} }
SocketAddress temp_addr; SocketAddress temp_addr;
const int n = sock.recvfrom(&temp_addr, rx_buffer, sizeof(rx_buffer)); ret = sock.recvfrom(&temp_addr, rx_buffer, sizeof(rx_buffer));
if (n >= 0) { if (ret >= 0) {
iomutex.lock(); iomutex.lock();
printf("[ID:%01d][%02d] recv %d bytes - %.*s \n", id, i, n, n, tx_buffer); printf("[ID:%01u][%02u] recv %d bytes - %.*s \n", id, i, ret, ret, tx_buffer);
iomutex.unlock(); iomutex.unlock();
} else { } else {
iomutex.lock(); iomutex.lock();
printf("[ID:%01d][%02d] Network error %d\n", id, i, n); printf("[ID:%01u][%02u] Network error %d\n", id, i, ret);
iomutex.unlock(); iomutex.unlock();
continue; continue;
} }
if ((temp_addr == udp_addr && if ((temp_addr == udp_addr &&
n == sizeof(tx_buffer) && ret == sizeof(tx_buffer) &&
memcmp(rx_buffer, tx_buffer, sizeof(rx_buffer)) == 0)) { memcmp(rx_buffer, tx_buffer, sizeof(rx_buffer)) == 0)) {
success += 1; success += 1;
iomutex.lock(); iomutex.lock();
printf("[ID:%01d][%02d] success #%d\n", id, i, success); printf("[ID:%01u][%02u] success #%d\n", id, i, success);
iomutex.unlock(); iomutex.unlock();
continue; continue;
} }
@ -169,10 +169,6 @@ void test_udp_echo_parallel() {
int err = net.connect(); int err = net.connect();
TEST_ASSERT_EQUAL(0, err); TEST_ASSERT_EQUAL(0, err);
if (err) {
printf("MBED: failed to connect with an error of %d\r\n", err);
GREENTEA_TESTSUITE_RESULT(false);
} else {
printf("UDP client IP Address is %s\n", net.get_ip_address()); printf("UDP client IP Address is %s\n", net.get_ip_address());
greentea_send_kv("target_ip", net.get_ip_address()); greentea_send_kv("target_ip", net.get_ip_address());
@ -194,14 +190,14 @@ void test_udp_echo_parallel() {
udp_addr.set_port(port); udp_addr.set_port(port);
// Startup echo threads in parallel // Startup echo threads in parallel
for (int i = 0; i < MBED_CFG_UDP_CLIENT_ECHO_THREADS; i++) { for (unsigned int i = 0; i < MBED_CFG_UDP_CLIENT_ECHO_THREADS; i++) {
echoers[i] = new Echo; echoers[i] = new Echo;
echoers[i]->start(i, uuid); echoers[i]->start(i, uuid);
} }
bool result = true; bool result = true;
for (int i = 0; i < MBED_CFG_UDP_CLIENT_ECHO_THREADS; i++) { for (unsigned int i = 0; i < MBED_CFG_UDP_CLIENT_ECHO_THREADS; i++) {
echoers[i]->join(); echoers[i]->join();
result = result && echoers[i]->get_result(); result = result && echoers[i]->get_result();
delete echoers[i]; delete echoers[i];
@ -209,7 +205,6 @@ void test_udp_echo_parallel() {
net.disconnect(); net.disconnect();
TEST_ASSERT(result); TEST_ASSERT(result);
}
} }