Merge pull request #8592 from deepikabhavnani/nw_stats_ver2

0xc0170 · web-flow · commit 2009f028b19c · 2018-11-27T09:03:49.000+01:00
Network Socket Statistics
diff --git a/TESTS/netsocket/tcp/main.cpp b/TESTS/netsocket/tcp/main.cpp
@@ -38,6 +38,10 @@ NetworkInterface *net;
 Timer tc_bucket; // Timer to limit a test cases run time
 }
 
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+mbed_stats_socket_t tcp_stats[MBED_CONF_NSAPI_SOCKET_STATS_MAX_COUNT];
+#endif
+
 char tcp_global::rx_buffer[RX_BUFF_SIZE];
 char tcp_global::tx_buffer[TX_BUFF_SIZE];
 
@@ -115,6 +119,13 @@ int split2half_rmng_tcp_test_time()
     return (tcp_global::TESTS_TIMEOUT - tc_bucket.read()) / 2;
 }
 
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+int fetch_stats()
+{
+    return SocketStats::mbed_stats_socket_get_each(&tcp_stats[0], MBED_CONF_NSAPI_SOCKET_STATS_MAX_COUNT);
+}
+#endif
+
 // Test setup
 utest::v1::status_t greentea_setup(const size_t number_of_cases)
 {
diff --git a/TESTS/netsocket/tcp/tcp_tests.h b/TESTS/netsocket/tcp/tcp_tests.h
@@ -24,6 +24,11 @@ void fill_tx_buffer_ascii(char *buff, size_t len);
 nsapi_error_t tcpsocket_connect_to_echo_srv(TCPSocket &sock);
 nsapi_error_t tcpsocket_connect_to_discard_srv(TCPSocket &sock);
 
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+extern mbed_stats_socket_t tcp_stats[MBED_CONF_NSAPI_SOCKET_STATS_MAX_COUNT];
+int fetch_stats(void);
+#endif
+
 /**
  * Single testcase might take only half of the remaining execution time
  */
diff --git a/TESTS/netsocket/tcp/tcpsocket_echotest.cpp b/TESTS/netsocket/tcp/tcpsocket_echotest.cpp
@@ -114,6 +114,13 @@ void tcpsocket_echotest_nonblock_receiver(void *receive_bytes)
 
 void TCPSOCKET_ECHOTEST_NONBLOCK()
 {
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+    int j = 0;
+    int count = fetch_stats();
+    for (; j < count; j++) {
+        TEST_ASSERT_EQUAL(SOCK_CLOSED, tcp_stats[j].state);
+    }
+#endif
     tc_exec_time.start();
     time_allotted = split2half_rmng_tcp_test_time(); // [s]
 
@@ -160,6 +167,15 @@ void TCPSOCKET_ECHOTEST_NONBLOCK()
             bytes2send -= sent;
         }
         printf("[Sender#%02d] bytes sent: %d\n", s_idx, pkt_s);
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+        count = fetch_stats();
+        for (j = 0; j < count; j++) {
+            if ((tcp_stats[j].state == SOCK_OPEN) && (tcp_stats[j].proto == NSAPI_TCP)) {
+                break;
+            }
+        }
+        TEST_ASSERT_EQUAL(bytes2send, tcp_stats[j].sent_bytes);
+#endif
         tx_sem.wait(split2half_rmng_tcp_test_time());
         thread->join();
         delete thread;
diff --git a/TESTS/netsocket/tcp/tcpsocket_open_close_repeat.cpp b/TESTS/netsocket/tcp/tcpsocket_open_close_repeat.cpp
@@ -26,6 +26,12 @@ using namespace utest::v1;
 
 void TCPSOCKET_OPEN_CLOSE_REPEAT()
 {
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+    int count = fetch_stats();
+    for (int j = 0; j < count; j++) {
+        TEST_ASSERT_EQUAL(SOCK_CLOSED,  tcp_stats[j].state);
+    }
+#endif
     TCPSocket *sock = new TCPSocket;
     if (!sock) {
         TEST_FAIL();
@@ -36,4 +42,10 @@ void TCPSOCKET_OPEN_CLOSE_REPEAT()
         TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->close());
     }
     delete sock;
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+    count = fetch_stats();
+    for (int j = 0; j < count; j++) {
+        TEST_ASSERT_EQUAL(SOCK_CLOSED, tcp_stats[j].state);
+    }
+#endif
 }
diff --git a/TESTS/netsocket/tcp/tcpsocket_open_limit.cpp b/TESTS/netsocket/tcp/tcpsocket_open_limit.cpp
@@ -70,6 +70,17 @@ void TCPSOCKET_OPEN_LIMIT()
             break;
         }
 
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+        int count = fetch_stats();
+        int open_count = 0;
+        for (int j = 0; j < count; j++) {
+            if ((tcp_stats[j].state == SOCK_OPEN) && (tcp_stats[j].proto == NSAPI_TCP)) {
+                open_count++;
+            }
+        }
+        TEST_ASSERT(open_count >= 4);
+#endif
+
         TCPSocketItem *tmp;
         for (TCPSocketItem *it = socket_list_head; it;) {
             ++open_sockets[i];
diff --git a/TESTS/netsocket/udp/main.cpp b/TESTS/netsocket/udp/main.cpp
@@ -37,6 +37,10 @@ namespace {
 NetworkInterface *net;
 }
 
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+mbed_stats_socket_t udp_stats[MBED_CONF_NSAPI_SOCKET_STATS_MAX_COUNT];
+#endif
+
 NetworkInterface *get_interface()
 {
     return net;
@@ -76,6 +80,13 @@ void fill_tx_buffer_ascii(char *buff, size_t len)
     }
 }
 
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+int fetch_stats()
+{
+    return SocketStats::mbed_stats_socket_get_each(&udp_stats[0], MBED_CONF_NSAPI_SOCKET_STATS_MAX_COUNT);
+}
+#endif
+
 // Test setup
 utest::v1::status_t greentea_setup(const size_t number_of_cases)
 {
diff --git a/TESTS/netsocket/udp/udp_tests.h b/TESTS/netsocket/udp/udp_tests.h
@@ -22,6 +22,11 @@ NetworkInterface *get_interface();
 void drop_bad_packets(UDPSocket &sock, int orig_timeout);
 void fill_tx_buffer_ascii(char *buff, size_t len);
 
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+extern mbed_stats_socket_t udp_stats[MBED_CONF_NSAPI_SOCKET_STATS_MAX_COUNT];
+int fetch_stats(void);
+#endif
+
 /*
  * Test cases
  */
diff --git a/TESTS/netsocket/udp/udpsocket_echotest.cpp b/TESTS/netsocket/udp/udpsocket_echotest.cpp
@@ -121,6 +121,14 @@ void udpsocket_echotest_nonblock_receiver(void *receive_bytes)
 
 void UDPSOCKET_ECHOTEST_NONBLOCK()
 {
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+    int j = 0;
+    int count = fetch_stats();
+    for (; j < count; j++) {
+        TEST_ASSERT_EQUAL(SOCK_CLOSED, udp_stats[j].state);
+    }
+#endif
+
     SocketAddress udp_addr;
     get_interface()->gethostbyname(MBED_CONF_APP_ECHO_SERVER_ADDR, &udp_addr);
     udp_addr.set_port(MBED_CONF_APP_ECHO_SERVER_PORT);
@@ -174,11 +182,27 @@ void UDPSOCKET_ECHOTEST_NONBLOCK()
         }
     }
     free(stack_mem);
+
     // Packet loss up to 30% tolerated
     if (packets_sent > 0) {
         double loss_ratio = 1 - ((double)packets_recv / (double)packets_sent);
         printf("Packets sent: %d, packets received %d, loss ratio %.2lf\r\n", packets_sent, packets_recv, loss_ratio);
         TEST_ASSERT_DOUBLE_WITHIN(TOLERATED_LOSS_RATIO, EXPECTED_LOSS_RATIO, loss_ratio);
+
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+        count = fetch_stats();
+        for (j = 0; j < count; j++) {
+            if ((NSAPI_UDP == udp_stats[j].proto) && (SOCK_OPEN == udp_stats[j].state)) {
+                TEST_ASSERT(udp_stats[j].sent_bytes != 0);
+                TEST_ASSERT(udp_stats[j].recv_bytes != 0);
+                break;
+            }
+        }
+        loss_ratio = 1 - ((double)udp_stats[j].recv_bytes / (double)udp_stats[j].sent_bytes);
+        printf("Bytes sent: %d, bytes received %d, loss ratio %.2lf\r\n", udp_stats[j].sent_bytes, udp_stats[j].recv_bytes, loss_ratio);
+        TEST_ASSERT_DOUBLE_WITHIN(TOLERATED_LOSS_RATIO, EXPECTED_LOSS_RATIO, loss_ratio);
+
+#endif
     }
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
diff --git a/TESTS/netsocket/udp/udpsocket_open_close_repeat.cpp b/TESTS/netsocket/udp/udpsocket_open_close_repeat.cpp
@@ -26,6 +26,12 @@ using namespace utest::v1;
 
 void UDPSOCKET_OPEN_CLOSE_REPEAT()
 {
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+    int count = fetch_stats();
+    for (int j = 0; j < count; j++) {
+        TEST_ASSERT_EQUAL(SOCK_CLOSED,  udp_stats[j].state);
+    }
+#endif
     UDPSocket *sock = new UDPSocket;
     if (!sock) {
         TEST_FAIL();
@@ -36,4 +42,10 @@ void UDPSOCKET_OPEN_CLOSE_REPEAT()
         TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->close());
     }
     delete sock;
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+    count = fetch_stats();
+    for (int j = 0; j < count; j++) {
+        TEST_ASSERT_EQUAL(SOCK_CLOSED, udp_stats[j].state);
+    }
+#endif
 }
diff --git a/TESTS/netsocket/udp/udpsocket_open_limit.cpp b/TESTS/netsocket/udp/udpsocket_open_limit.cpp
@@ -21,6 +21,7 @@
 #include "UDPSocket.h"
 #include "unity/unity.h"
 #include "utest.h"
+#include "SocketStats.h"
 
 using namespace utest::v1;
 
@@ -69,7 +70,16 @@ void UDPSOCKET_OPEN_LIMIT()
         if (!socket_list_head) {
             break;
         }
-
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+        int count = fetch_stats();
+        int open_count = 0;
+        for (int j = 0; j < count; j++) {
+            if ((udp_stats[j].state == SOCK_OPEN) && (udp_stats[j].proto == NSAPI_UDP)) {
+                open_count++;
+            }
+        }
+        TEST_ASSERT(open_count >= 3);
+#endif
         UDPSocketItem *tmp;
         for (UDPSocketItem *it = socket_list_head; it;) {
             ++open_sockets[i];
diff --git a/UNITTESTS/features/netsocket/DTLSSocket/unittest.cmake b/UNITTESTS/features/netsocket/DTLSSocket/unittest.cmake
@@ -31,6 +31,7 @@ set(unittest-test-sources
   stubs/stoip4_stub.c
   stubs/ip4tos_stub.c
   stubs/Kernel_stub.cpp
+  stubs/SocketStats_Stub.cpp
 )
 
 set(MBEDTLS_USER_CONFIG_FILE_PATH "\"../UNITTESTS/features/netsocket/DTLSSocket/dtls_test_config.h\"")
diff --git a/UNITTESTS/features/netsocket/DTLSSocketWrapper/unittest.cmake b/UNITTESTS/features/netsocket/DTLSSocketWrapper/unittest.cmake
@@ -30,6 +30,7 @@ set(unittest-test-sources
   stubs/stoip4_stub.c
   stubs/ip4tos_stub.c
   stubs/Kernel_stub.cpp
+  stubs/SocketStats_Stub.cpp
 )
 
 set(MBEDTLS_USER_CONFIG_FILE_PATH "\"../UNITTESTS/features/netsocket/DTLSSocketWrapper/dtls_test_config.h\"")
diff --git a/UNITTESTS/features/netsocket/EthernetInterface/unittest.cmake b/UNITTESTS/features/netsocket/EthernetInterface/unittest.cmake
@@ -33,4 +33,5 @@ set(unittest-test-sources
   stubs/stoip4_stub.c
   stubs/ip4tos_stub.c
   stubs/NetworkStack_stub.cpp
+  stubs/SocketStats_Stub.cpp
 )
diff --git a/UNITTESTS/features/netsocket/InternetSocket/unittest.cmake b/UNITTESTS/features/netsocket/InternetSocket/unittest.cmake
@@ -25,4 +25,5 @@ set(unittest-test-sources
   stubs/EventFlags_stub.cpp
   stubs/stoip4_stub.c
   stubs/ip4tos_stub.c
+  stubs/SocketStats_Stub.cpp
 )
diff --git a/UNITTESTS/features/netsocket/NetworkInterface/unittest.cmake b/UNITTESTS/features/netsocket/NetworkInterface/unittest.cmake
@@ -25,4 +25,5 @@ set(unittest-test-sources
   stubs/nsapi_dns_stub.cpp
   stubs/EventFlags_stub.cpp
   features/netsocket/NetworkInterface/test_NetworkInterface.cpp
+  stubs/SocketStats_Stub.cpp
 )
diff --git a/UNITTESTS/features/netsocket/NetworkStack/unittest.cmake b/UNITTESTS/features/netsocket/NetworkStack/unittest.cmake
@@ -28,4 +28,5 @@ set(unittest-test-sources
   stubs/nsapi_dns_stub.cpp
   stubs/EventFlags_stub.cpp
   features/netsocket/NetworkStack/test_NetworkStack.cpp
+  stubs/SocketStats_Stub.cpp
 )
diff --git a/UNITTESTS/features/netsocket/TCPServer/unittest.cmake b/UNITTESTS/features/netsocket/TCPServer/unittest.cmake
@@ -28,4 +28,5 @@ set(unittest-test-sources
   stubs/nsapi_dns_stub.cpp
   stubs/EventFlags_stub.cpp
   features/netsocket/TCPServer/test_TCPServer.cpp
+  stubs/SocketStats_Stub.cpp
 )
diff --git a/UNITTESTS/features/netsocket/TCPSocket/unittest.cmake b/UNITTESTS/features/netsocket/TCPSocket/unittest.cmake
@@ -26,4 +26,5 @@ set(unittest-test-sources
   stubs/EventFlags_stub.cpp
   stubs/stoip4_stub.c
   stubs/ip4tos_stub.c
+  stubs/SocketStats_Stub.cpp
 )
diff --git a/UNITTESTS/features/netsocket/TLSSocket/unittest.cmake b/UNITTESTS/features/netsocket/TLSSocket/unittest.cmake
@@ -29,6 +29,7 @@ set(unittest-test-sources
   stubs/EventFlags_stub.cpp
   stubs/stoip4_stub.c
   stubs/ip4tos_stub.c
+  stubs/SocketStats_Stub.cpp
 )
 
 set(MBEDTLS_USER_CONFIG_FILE_PATH "\"../UNITTESTS/features/netsocket/TLSSocket/tls_test_config.h\"")
diff --git a/UNITTESTS/features/netsocket/TLSSocketWrapper/unittest.cmake b/UNITTESTS/features/netsocket/TLSSocketWrapper/unittest.cmake
@@ -28,6 +28,7 @@ set(unittest-test-sources
   stubs/EventFlags_stub.cpp
   stubs/stoip4_stub.c
   stubs/ip4tos_stub.c
+  stubs/SocketStats_Stub.cpp
 )
 
 set(MBEDTLS_USER_CONFIG_FILE_PATH "\"../UNITTESTS/features/netsocket/TLSSocketWrapper/tls_test_config.h\"")
diff --git a/UNITTESTS/features/netsocket/UDPSocket/unittest.cmake b/UNITTESTS/features/netsocket/UDPSocket/unittest.cmake
@@ -26,4 +26,5 @@ set(unittest-test-sources
   stubs/nsapi_dns_stub.cpp
   stubs/stoip4_stub.c
   stubs/ip4tos_stub.c
+  stubs/SocketStats_Stub.cpp
 )
diff --git a/UNITTESTS/stubs/SocketStats_Stub.cpp b/UNITTESTS/stubs/SocketStats_Stub.cpp
@@ -0,0 +1,63 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2018 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "SocketStats.h"
+
+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
+int SocketStats::get_entry_position(const Socket *const reference_id)
+{
+    return 0;
+}
+#endif
+
+size_t SocketStats::mbed_stats_socket_get_each(mbed_stats_socket_t *stats, size_t count)
+{
+    return 0;
+}
+
+SocketStats::SocketStats()
+{
+}
+
+void SocketStats::stats_new_socket_entry(const Socket *const reference_id)
+{
+    return;
+}
+
+void SocketStats::stats_update_socket_state(const Socket *const reference_id, socket_state state)
+{
+    return;
+}
+
+void SocketStats::stats_update_peer(const Socket *const reference_id, const SocketAddress &peer)
+{
+    return;
+}
+
+void SocketStats::stats_update_proto(const Socket *const reference_id, nsapi_protocol_t proto)
+{
+    return;
+}
+
+void SocketStats::stats_update_sent_bytes(const Socket *const reference_id, size_t sent_bytes)
+{
+    return;
+}
+
+void SocketStats::stats_update_recv_bytes(const Socket *const reference_id, size_t recv_bytes)
+{
+    return;
+}
diff --git a/features/lwipstack/LWIPStack.h b/features/lwipstack/LWIPStack.h
@@ -450,7 +450,7 @@ class LWIP : public OnboardNetworkStack, private mbed::NonCopyable<LWIP> {
      *  @param func     Callback to be called
      *  @return         0 on success, negative error code on failure
      */
-    nsapi_error_t call_in(int delay, mbed::Callback<void()> func);
+    virtual nsapi_error_t call_in(int delay, mbed::Callback<void()> func);
 
     struct mbed_lwip_socket {
         bool in_use;
diff --git a/features/netsocket/InternetSocket.cpp b/features/netsocket/InternetSocket.cpp
diff --git a/features/netsocket/InternetSocket.h b/features/netsocket/InternetSocket.h
diff --git a/features/netsocket/SocketStats.cpp b/features/netsocket/SocketStats.cpp
diff --git a/features/netsocket/SocketStats.h b/features/netsocket/SocketStats.h
diff --git a/features/netsocket/TCPServer.cpp b/features/netsocket/TCPServer.cpp
diff --git a/features/netsocket/TCPSocket.cpp b/features/netsocket/TCPSocket.cpp
diff --git a/features/netsocket/UDPSocket.cpp b/features/netsocket/UDPSocket.cpp
diff --git a/features/netsocket/mbed_lib.json b/features/netsocket/mbed_lib.json
diff --git a/platform/SingletonPtr.h b/platform/SingletonPtr.h
diff --git a/platform/mbed_error.h b/platform/mbed_error.h
diff --git a/tools/test_configs/target_configs.json b/tools/test_configs/target_configs.json

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,10 @@ namespace {`
`37`	`37`	`NetworkInterface *net;`
`38`	`38`	`}`
`39`	`39`
	`40`	`+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE`
	`41`	`+mbed_stats_socket_t udp_stats[MBED_CONF_NSAPI_SOCKET_STATS_MAX_COUNT];`
	`42`	`+#endif`
	`43`	`+`
`40`	`44`	`NetworkInterface *get_interface()`
`41`	`45`	`{`
`42`	`46`	`return net;`
`@@ -76,6 +80,13 @@ void fill_tx_buffer_ascii(char *buff, size_t len)`
`76`	`80`	`}`
`77`	`81`	`}`
`78`	`82`
	`83`	`+#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE`
	`84`	`+int fetch_stats()`
	`85`	`+{`
	`86`	`+ return SocketStats::mbed_stats_socket_get_each(&udp_stats[0], MBED_CONF_NSAPI_SOCKET_STATS_MAX_COUNT);`
	`87`	`+}`
	`88`	`+#endif`
	`89`	`+`
`79`	`90`	`// Test setup`
`80`	`91`	`utest::v1::status_t greentea_setup(const size_t number_of_cases)`
`81`	`92`	`{`