From 8cef1904c5ea3cdbd7ce69d5166bc26ca2198006 Mon Sep 17 00:00:00 2001 From: kegilbert Date: Tue, 11 Dec 2018 18:09:40 -0600 Subject: [PATCH] Move socket-stats-enable to socket-stats-enabled. This conforms with the other stats config option names --- features/netsocket/SocketStats.cpp | 16 ++++++++-------- features/netsocket/mbed_lib.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/features/netsocket/SocketStats.cpp b/features/netsocket/SocketStats.cpp index 1e62c82ffe..946345e3d1 100644 --- a/features/netsocket/SocketStats.cpp +++ b/features/netsocket/SocketStats.cpp @@ -24,7 +24,7 @@ #include #include -#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE +#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED SingletonPtr SocketStats::_mutex; mbed_stats_socket_t SocketStats::_stats[MBED_CONF_NSAPI_SOCKET_STATS_MAX_COUNT]; uint32_t SocketStats::_size = 0; @@ -44,7 +44,7 @@ size_t SocketStats::mbed_stats_socket_get_each(mbed_stats_socket_t *stats, size_ { MBED_ASSERT(stats != NULL); size_t i = 0; -#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE +#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED memset(stats, 0, count * sizeof(mbed_stats_socket_t)); _mutex->lock(); for (uint32_t j = 0; j < count; j++) { @@ -64,7 +64,7 @@ SocketStats::SocketStats() void SocketStats::stats_new_socket_entry(const Socket *const reference_id) { -#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE +#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED _mutex->lock(); if (get_entry_position(reference_id) >= 0) { // Duplicate entry @@ -98,7 +98,7 @@ void SocketStats::stats_new_socket_entry(const Socket *const reference_id) void SocketStats::stats_update_socket_state(const Socket *const reference_id, socket_state state) { -#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE +#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED _mutex->lock(); int position = get_entry_position(reference_id); if (position >= 0) { @@ -113,7 +113,7 @@ void SocketStats::stats_update_socket_state(const Socket *const reference_id, so void SocketStats::stats_update_peer(const Socket *const reference_id, const SocketAddress &peer) { -#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE +#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED _mutex->lock(); int position = get_entry_position(reference_id); if ((position >= 0) && (!_stats[position].peer)) { @@ -125,7 +125,7 @@ void SocketStats::stats_update_peer(const Socket *const reference_id, const Sock void SocketStats::stats_update_proto(const Socket *const reference_id, nsapi_protocol_t proto) { -#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE +#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED _mutex->lock(); int position = get_entry_position(reference_id); if (position >= 0) { @@ -137,7 +137,7 @@ void SocketStats::stats_update_proto(const Socket *const reference_id, nsapi_pro void SocketStats::stats_update_sent_bytes(const Socket *const reference_id, size_t sent_bytes) { -#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE +#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED _mutex->lock(); int position = get_entry_position(reference_id); if ((position >= 0) && ((int32_t)sent_bytes > 0)) { @@ -149,7 +149,7 @@ void SocketStats::stats_update_sent_bytes(const Socket *const reference_id, size void SocketStats::stats_update_recv_bytes(const Socket *const reference_id, size_t recv_bytes) { -#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE +#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLED _mutex->lock(); int position = get_entry_position(reference_id); if ((position >= 0) && ((int32_t)recv_bytes > 0)) { diff --git a/features/netsocket/mbed_lib.json b/features/netsocket/mbed_lib.json index 2a11d9f3a1..e1b90c8142 100644 --- a/features/netsocket/mbed_lib.json +++ b/features/netsocket/mbed_lib.json @@ -58,7 +58,7 @@ "help": "Number of cached host name resolutions", "value": 3 }, - "socket-stats-enable": { + "socket-stats-enabled": { "help": "Enable network socket statistics", "value": false },