Merge pull request #533 from openweave/bug/network-telemetry-mgr-fixes-contd
Network telemetry mgr fixes contd
diff --git a/src/adaptations/device-layer/NetworkTelemetryManager.cpp b/src/adaptations/device-layer/NetworkTelemetryManager.cpp
index 82ab5f3..6087814 100644
--- a/src/adaptations/device-layer/NetworkTelemetryManager.cpp
+++ b/src/adaptations/device-layer/NetworkTelemetryManager.cpp
@@ -116,8 +116,7 @@
WEAVE_ERROR err;
if (ConnectivityMgr().IsWiFiStationProvisioned() &&
- ConnectivityMgr().IsWiFiStationEnabled() &&
- ConfigurationMgr().IsPairedToAccount())
+ ConnectivityMgr().IsWiFiStationEnabled())
{
err = ConnectivityMgr().GetAndLogWifiStatsCounters();
SuccessOrExit(err);
@@ -135,8 +134,7 @@
WEAVE_ERROR err;
if (ConnectivityMgr().IsThreadProvisioned() &&
- ConnectivityMgr().IsThreadEnabled() &&
- ConfigurationMgr().IsPairedToAccount())
+ ConnectivityMgr().IsThreadEnabled())
{
err = ThreadStackMgr().GetAndLogThreadStatsCounters();
SuccessOrExit(err);
@@ -151,8 +149,7 @@
WEAVE_ERROR err;
if (ConnectivityMgr().IsThreadProvisioned() &&
- ConnectivityMgr().IsThreadEnabled() &&
- ConfigurationMgr().IsPairedToAccount())
+ ConnectivityMgr().IsThreadEnabled())
{
#if WEAVE_DEVICE_CONFIG_ENABLE_THREAD_TELEMETRY_FULL
err = ThreadStackMgr().GetAndLogThreadTopologyFull();
@@ -172,8 +169,7 @@
#if WEAVE_DEVICE_CONFIG_ENABLE_TUNNEL_TELEMETRY
void TunnelTelemetry::GetTelemetryStatsAndLogEvent(void)
{
- if (ConnectivityMgr().GetServiceTunnelMode() == ConnectivityManager::kServiceTunnelMode_Enabled &&
- ConfigurationMgr().IsPairedToAccount())
+ if (ConnectivityMgr().GetServiceTunnelMode() == ConnectivityManager::kServiceTunnelMode_Enabled)
{
nl::Weave::Profiles::DataManagement_Current::event_id_t eventId;
nl::Weave::Profiles::WeaveTunnel::WeaveTunnelStatistics tunnelStats;
diff --git a/src/adaptations/device-layer/include/Weave/DeviceLayer/OpenThread/GenericThreadStackManagerImpl_OpenThread.ipp b/src/adaptations/device-layer/include/Weave/DeviceLayer/OpenThread/GenericThreadStackManagerImpl_OpenThread.ipp
index 8907606..081e2fd 100644
--- a/src/adaptations/device-layer/include/Weave/DeviceLayer/OpenThread/GenericThreadStackManagerImpl_OpenThread.ipp
+++ b/src/adaptations/device-layer/include/Weave/DeviceLayer/OpenThread/GenericThreadStackManagerImpl_OpenThread.ipp
@@ -673,14 +673,18 @@
"MAC Rx Unicast: %d\n"
"MAC Rx Broadcast: %d\n"
"MAC Rx Data: %d\n"
- "MAC Rx Data Polls: %d\n"
+ "MAC Rx Data Polls: %d",
+ counterEvent.phyRx, counterEvent.macUnicastRx, counterEvent.macBroadcastRx,
+ counterEvent.macRxData, counterEvent.macRxDataPoll);
+
+ WeaveLogProgress(DeviceLayer,
+ "Rx Counters (Contd.):\n"
"MAC Rx Beacons: %d\n"
"MAC Rx Beacon Reqs: %d\n"
"MAC Rx Other: %d\n"
"MAC Rx Filtered Whitelist: %d\n"
- "MAC Rx Filtered DestAddr: %d\n",
- counterEvent.phyRx, counterEvent.macUnicastRx, counterEvent.macBroadcastRx, counterEvent.macRxData,
- counterEvent.macRxDataPoll, counterEvent.macRxBeacon, counterEvent.macRxBeaconReq, counterEvent.macRxOtherPkt,
+ "MAC Rx Filtered DestAddr: %d",
+ counterEvent.macRxBeacon, counterEvent.macRxBeaconReq, counterEvent.macRxOtherPkt,
counterEvent.macRxFilterWhitelist, counterEvent.macRxFilterDestAddr);
WeaveLogProgress(DeviceLayer,
@@ -689,14 +693,18 @@
"MAC Tx Unicast: %d\n"
"MAC Tx Broadcast: %d\n"
"MAC Tx Data: %d\n"
- "MAC Tx Data Polls: %d\n"
+ "MAC Tx Data Polls: %d",
+ counterEvent.phyTx, counterEvent.macUnicastTx, counterEvent.macBroadcastTx, counterEvent.macTxData,
+ counterEvent.macTxDataPoll);
+
+ WeaveLogProgress(DeviceLayer,
+ "Tx Counters (Contd.):\n"
"MAC Tx Beacons: %d\n"
"MAC Tx Beacon Reqs: %d\n"
"MAC Tx Other: %d\n"
"MAC Tx Retry: %d\n"
- "MAC Tx CCA Fail: %d\n",
- counterEvent.phyTx, counterEvent.macUnicastTx, counterEvent.macBroadcastTx, counterEvent.macTxData,
- counterEvent.macTxDataPoll, counterEvent.macTxBeacon, counterEvent.macTxBeaconReq, counterEvent.macTxOtherPkt,
+ "MAC Tx CCA Fail: %d",
+ counterEvent.macTxBeacon, counterEvent.macTxBeaconReq, counterEvent.macTxOtherPkt,
counterEvent.macTxRetry, counterEvent.macTxFailCca);
WeaveLogProgress(DeviceLayer,
@@ -706,12 +714,12 @@
"MAC Rx Unknown Neighbor Fail: %d\n"
"MAC Rx Invalid Src Addr Fail: %d\n"
"MAC Rx FCS Fail: %d\n"
- "MAC Rx Other Fail: %d\n",
+ "MAC Rx Other Fail: %d",
counterEvent.macRxFailDecrypt, counterEvent.macRxFailNoFrame, counterEvent.macRxFailUnknownNeighbor,
counterEvent.macRxFailInvalidSrcAddr, counterEvent.macRxFailFcs, counterEvent.macRxFailOther);
eventId = nl::LogEvent(&counterEvent);
- WeaveLogProgress(DeviceLayer, "OpenThread Telemetry Stats Event Id: %u\n", eventId);
+ WeaveLogProgress(DeviceLayer, "OpenThread Telemetry Stats Event Id: %u", eventId);
Impl()->UnlockThreadStack();
@@ -761,14 +769,14 @@
"Parent Last RSSI: %d\n"
"Partition ID: %d\n"
"Extended Address: %02X%02X:%02X%02X:%02X%02X:%02X%02X\n"
- "Instant RSSI: %d\n",
+ "Instant RSSI: %d",
topologyEvent.rloc16, topologyEvent.routerId, topologyEvent.leaderRouterId, topologyEvent.parentAverageRssi,
topologyEvent.parentLastRssi, topologyEvent.partitionId, topologyEvent.extAddress.mBuf[0], topologyEvent.extAddress.mBuf[1],
topologyEvent.extAddress.mBuf[2], topologyEvent.extAddress.mBuf[3], topologyEvent.extAddress.mBuf[4],
topologyEvent.extAddress.mBuf[5], topologyEvent.extAddress.mBuf[6], topologyEvent.extAddress.mBuf[7], topologyEvent.instantRssi);
eventId = nl::LogEvent(&topologyEvent);
- WeaveLogProgress(DeviceLayer, "OpenThread Telemetry Stats Event Id: %u\n", eventId);
+ WeaveLogProgress(DeviceLayer, "OpenThread Telemetry Stats Event Id: %u", eventId);
Impl()->UnlockThreadStack();
@@ -873,26 +881,30 @@
"Leader Router ID: %u\n"
"Leader Address: %02X%02X:%02X%02X:%02X%02X:%02X%02X:%02X%02X:%02X%02X:%02X%02X:%02X%02X\n"
"Leader Weight: %d\n"
- "Local Leader Weight: %d\n"
+ "Local Leader Weight: %d",
+ fullTopoEvent.rloc16, fullTopoEvent.routerId, fullTopoEvent.leaderRouterId,
+ fullTopoEvent.leaderAddress.mBuf[0], fullTopoEvent.leaderAddress.mBuf[1], fullTopoEvent.leaderAddress.mBuf[2], fullTopoEvent.leaderAddress.mBuf[3],
+ fullTopoEvent.leaderAddress.mBuf[4], fullTopoEvent.leaderAddress.mBuf[5], fullTopoEvent.leaderAddress.mBuf[6], fullTopoEvent.leaderAddress.mBuf[7],
+ fullTopoEvent.leaderAddress.mBuf[8], fullTopoEvent.leaderAddress.mBuf[9], fullTopoEvent.leaderAddress.mBuf[10], fullTopoEvent.leaderAddress.mBuf[11],
+ fullTopoEvent.leaderAddress.mBuf[12], fullTopoEvent.leaderAddress.mBuf[13], fullTopoEvent.leaderAddress.mBuf[14], fullTopoEvent.leaderAddress.mBuf[15],
+ fullTopoEvent.leaderWeight, fullTopoEvent.leaderLocalWeight);
+
+ WeaveLogProgress(DeviceLayer,
+ "Thread Topology (Contd.):\n"
"Network Data Len: %d\n"
"Network Data Version: %d\n"
"Extended Address: %02X%02X:%02X%02X:%02X%02X:%02X%02X\n"
"Partition ID: %X\n"
"Instant RSSI: %d\n"
"Neighbor Table Length: %d\n"
- "Child Table Length: %d\n",
- fullTopoEvent.rloc16, fullTopoEvent.routerId, fullTopoEvent.leaderRouterId,
- fullTopoEvent.leaderAddress.mBuf[0], fullTopoEvent.leaderAddress.mBuf[1], fullTopoEvent.leaderAddress.mBuf[2], fullTopoEvent.leaderAddress.mBuf[3],
- fullTopoEvent.leaderAddress.mBuf[4], fullTopoEvent.leaderAddress.mBuf[5], fullTopoEvent.leaderAddress.mBuf[6], fullTopoEvent.leaderAddress.mBuf[7],
- fullTopoEvent.leaderAddress.mBuf[8], fullTopoEvent.leaderAddress.mBuf[9], fullTopoEvent.leaderAddress.mBuf[10], fullTopoEvent.leaderAddress.mBuf[11],
- fullTopoEvent.leaderAddress.mBuf[12], fullTopoEvent.leaderAddress.mBuf[13], fullTopoEvent.leaderAddress.mBuf[14], fullTopoEvent.leaderAddress.mBuf[15],
- fullTopoEvent.leaderWeight, fullTopoEvent.leaderLocalWeight, fullTopoEvent.networkData.mLen, fullTopoEvent.networkDataVersion,
+ "Child Table Length: %d",
+ fullTopoEvent.networkData.mLen, fullTopoEvent.networkDataVersion,
fullTopoEvent.extAddress.mBuf[0], fullTopoEvent.extAddress.mBuf[1], fullTopoEvent.extAddress.mBuf[2], fullTopoEvent.extAddress.mBuf[3],
fullTopoEvent.extAddress.mBuf[4], fullTopoEvent.extAddress.mBuf[5], fullTopoEvent.extAddress.mBuf[6], fullTopoEvent.extAddress.mBuf[7],
fullTopoEvent.partitionId, fullTopoEvent.instantRssi, fullTopoEvent.neighborTableSize, fullTopoEvent.childTableSize);
eventId = nl::LogEvent(&fullTopoEvent);
- WeaveLogProgress(DeviceLayer, "OpenThread Full Topology Event Id: %u\n", eventId);
+ WeaveLogProgress(DeviceLayer, "OpenThread Full Topology Event Id: %u", eventId);
// Populate the neighbor event options.
// This way the neighbor topology entries are linked to the actual topology full event.
@@ -953,22 +965,25 @@
"AvgRSSI: %3d\n"
"LastRSSI: %3d\n"
"LinkFrameCounter: %10d\n"
- "MleFrameCounter: %10d\n"
- "RxOnWhenIdle: %c\n"
- "SecureDataRequest: %c\n"
- "FullFunction: %c\n"
- "FullNetworkData: %c\n"
- "IsChild: %c%s\n",
+ "MleFrameCounter: %10d",
i, neighborTopoEvent.extAddress.mBuf[0], neighborTopoEvent.extAddress.mBuf[1], neighborTopoEvent.extAddress.mBuf[2],
neighborTopoEvent.extAddress.mBuf[3], neighborTopoEvent.extAddress.mBuf[4], neighborTopoEvent.extAddress.mBuf[5],
neighborTopoEvent.extAddress.mBuf[6], neighborTopoEvent.extAddress.mBuf[7], neighborTopoEvent.rloc16, neighborTopoEvent.age,
neighborTopoEvent.linkQualityIn, neighborTopoEvent.averageRssi, neighborTopoEvent.lastRssi, neighborTopoEvent.linkFrameCounter,
- neighborTopoEvent.mleFrameCounter, neighborTopoEvent.rxOnWhenIdle ? 'Y' : 'n', neighborTopoEvent.secureDataRequest ? 'Y' : 'n',
+ neighborTopoEvent.mleFrameCounter);
+
+ WeaveLogProgress(DeviceLayer,
+ "RxOnWhenIdle: %c\n"
+ "SecureDataRequest: %c\n"
+ "FullFunction: %c\n"
+ "FullNetworkData: %c\n"
+ "IsChild: %c%s",
+ neighborTopoEvent.rxOnWhenIdle ? 'Y' : 'n', neighborTopoEvent.secureDataRequest ? 'Y' : 'n',
neighborTopoEvent.fullFunction ? 'Y' : 'n', neighborTopoEvent.fullNetworkData ? 'Y' : 'n',
neighborTopoEvent.isChild ? 'Y' : 'n', printBuf);
eventId = nl::LogEvent(&neighborTopoEvent, neighborTopoOpts);
- WeaveLogProgress(DeviceLayer, "OpenThread Neighbor TopoEntry[%u] Event Id: %ld\n", i, eventId);
+ WeaveLogProgress(DeviceLayer, "OpenThread Neighbor TopoEntry[%u] Event Id: %ld", i, eventId);
}
Impl()->UnlockThreadStack();
