Add socketstats stub functions for unittest and addressed reviews

Author: deepikabhavnani

TESTS/netsocket/udp/udpsocket_echotest.cpp

@@ -183,18 +183,26 @@ void UDPSOCKET_ECHOTEST_NONBLOCK()
     }
     free(stack_mem);
 
-#ifdef MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
-    TEST_ASSERT_EQUAL(1, fetch_stats());
-    TEST_ASSERT_EQUAL(NSAPI_UDP, udp_stats[0].proto);
-    TEST_ASSERT(udp_stats[0].sent_bytes != 0);
-    TEST_ASSERT(udp_stats[0].recv_bytes != 0);
-#endif
-
     // 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);
+
+#ifdef 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());
 }

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
 )

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
 )

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
 )

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
 )

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
 )

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
 )

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
 )

UNITTESTS/stubs/SocketStats_Stub.cpp

@@ -0,0 +1,61 @@
+/* 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"
+
+int SocketStats::get_entry_position(const Socket *const reference_id)
+{
+    return 0;
+}
+
+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;
+}

features/netsocket/InternetSocket.cpp

@@ -24,6 +24,7 @@ InternetSocket::InternetSocket()
       _readers(0), _writers(0), _pending(0),
       _factory_allocated(false)
 {
+    _socket_stats.stats_new_socket_entry(this);
 }
 
 InternetSocket::~InternetSocket()
@@ -48,6 +49,7 @@ nsapi_error_t InternetSocket::open(NetworkStack *stack)
         return err;
     }
 
+    _socket_stats.stats_update_socket_state(this, SOCK_OPEN);
     _socket = socket;
     _event = callback(this, &InternetSocket::event);
     _stack->socket_attach(_socket, Callback<void()>::thunk, &_event);
@@ -72,7 +74,7 @@ nsapi_error_t InternetSocket::close()
     _socket = 0;
     ret = _stack->socket_close(socket);
     _stack = 0; // Invalidate the stack pointer - otherwise open() fails.
-
+    _socket_stats.stats_update_socket_state(this, SOCK_CLOSED);
     // Wakeup anything in a blocking operation
     // on this socket
     event();