diff --git a/include/openthread/platform/logging-windows.h b/include/openthread/platform/logging-windows.h index 39e369aed..7f94a505e 100644 --- a/include/openthread/platform/logging-windows.h +++ b/include/openthread/platform/logging-windows.h @@ -167,6 +167,11 @@ // otLogWarnApi{LEVEL=TRACE_LEVEL_WARNING,FLAGS=OT_API}(CTX, MSG, ...); // end_wpp +// begin_wpp config +// USEPREFIX (otLogNoteApi, "[%p]API%!SPACE!", &CTX); +// otLogNoteApi{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_API}(CTX, MSG, ...); +// end_wpp + // begin_wpp config // USEPREFIX (otLogInfoApi, "[%p]API%!SPACE!", &CTX); // otLogInfoApi{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_API}(CTX, MSG, ...); @@ -189,6 +194,11 @@ // otLogWarnNcp{LEVEL=TRACE_LEVEL_WARNING,FLAGS=OT_NCP}(CTX, MSG, ...); // end_wpp +// begin_wpp config +// USEPREFIX (otLogNoteNcp, "[%p]NCP%!SPACE!", &CTX); +// otLogNoteNcp{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_NCP}(CTX, MSG, ...); +// end_wpp + // begin_wpp config // USEPREFIX (otLogInfoNcp, "[%p]NCP%!SPACE!", &CTX); // otLogInfoNcp{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_NCP}(CTX, MSG, ...); @@ -211,6 +221,11 @@ // otLogWarnMeshCoP{LEVEL=TRACE_LEVEL_WARNING,FLAGS=OT_MESHCOP}(CTX, MSG, ...); // end_wpp +// begin_wpp config +// USEPREFIX (otLogNoteMeshCoP, "[%p]MESHCOP%!SPACE!", &CTX); +// otLogNoteMeshCoP{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_MESHCOP}(CTX, MSG, ...); +// end_wpp + // begin_wpp config // USEPREFIX (otLogInfoMeshCoP, "[%p]MESHCOP%!SPACE!", &CTX); // otLogInfoMeshCoP{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_MESHCOP}(CTX, MSG, ...); @@ -238,6 +253,11 @@ // otLogWarnMbedTls{LEVEL=TRACE_LEVEL_WARNING,FLAGS=OT_MBEDTLS}(CTX, MSG, ...); // end_wpp +// begin_wpp config +// USEPREFIX (otLogNoteMbedTls, "[%p]MBED%!SPACE!", &CTX); +// otLogNoteMbedTls{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_MBEDTLS}(CTX, MSG, ...); +// end_wpp + // begin_wpp config // USEPREFIX (otLogInfoMbedTls, "[%p]MBED%!SPACE!", &CTX); // otLogInfoMbedTls{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_MBEDTLS}(CTX, MSG, ...); @@ -266,6 +286,11 @@ // USESUFFIX(otLogWarnMleErr, ", %!otError!", EXP); // end_wpp +// begin_wpp config +// USEPREFIX (otLogNoteMle, "[%p]MLE%!SPACE!", &CTX); +// otLogNoteMle{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_MLE}(CTX, MSG, ...); +// end_wpp + // begin_wpp config // USEPREFIX (otLogInfoMle, "[%p]MLE%!SPACE!", &CTX); // otLogInfoMle{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_MLE}(CTX, MSG, ...); @@ -288,6 +313,11 @@ // otLogWarnArp{LEVEL=TRACE_LEVEL_WARNING,FLAGS=OT_ARP}(CTX, MSG, ...); // end_wpp +// begin_wpp config +// USEPREFIX (otLogNoteArp, "[%p]ARP%!SPACE!", &CTX); +// otLogNoteArp{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_ARP}(CTX, MSG, ...); +// end_wpp + // begin_wpp config // USEPREFIX (otLogInfoArp, "[%p]ARP%!SPACE!", &CTX); // otLogInfoArp{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_ARP}(CTX, MSG, ...); @@ -310,6 +340,11 @@ // otLogWarnNetData{LEVEL=TRACE_LEVEL_WARNING,FLAGS=OT_NETD}(CTX, MSG, ...); // end_wpp +// begin_wpp config +// USEPREFIX (otLogNoteNetData, "[%p]NETD%!SPACE!", &CTX); +// otLogNoteNetData{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_NETD}(CTX, MSG, ...); +// end_wpp + // begin_wpp config // USEPREFIX (otLogInfoNetData, "[%p]NETD%!SPACE!", &CTX); // otLogInfoNetData{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_NETD}(CTX, MSG, ...); @@ -332,6 +367,11 @@ // otLogWarnIcmp{LEVEL=TRACE_LEVEL_WARNING,FLAGS=OT_ICMP}(CTX, MSG, ...); // end_wpp +// begin_wpp config +// USEPREFIX (otLogNoteIcmp, "[%p]ICMP%!SPACE!", &CTX); +// otLogNoteIcmp{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_ICMP}(CTX, MSG, ...); +// end_wpp + // begin_wpp config // USEPREFIX (otLogInfoIcmp, "[%p]ICMP%!SPACE!", &CTX); // otLogInfoIcmp{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_ICMP}(CTX, MSG, ...); @@ -354,6 +394,11 @@ // otLogWarnIp6{LEVEL=TRACE_LEVEL_WARNING,FLAGS=OT_IPV6}(CTX, MSG, ...); // end_wpp +// begin_wpp config +// USEPREFIX (otLogNoteIp6, "[%p]IP6%!SPACE!", &CTX); +// otLogNoteIp6{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_IPV6}(CTX, MSG, ...); +// end_wpp + // begin_wpp config // USEPREFIX (otLogInfoIp6, "[%p]IP6%!SPACE!", &CTX); // otLogInfoIp6{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_IPV6}(CTX, MSG, ...); @@ -376,6 +421,11 @@ // otLogWarnMac{LEVEL=TRACE_LEVEL_WARNING,FLAGS=OT_MAC}(CTX, MSG, ...); // end_wpp +// begin_wpp config +// USEPREFIX (otLogNoteMac, "[%p]MAC%!SPACE!", &CTX); +// otLogNoteMac{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_MAC}(CTX, MSG, ...); +// end_wpp + // begin_wpp config // USEPREFIX (otLogInfoMac, "[%p]MAC%!SPACE!", &CTX); // otLogInfoMac{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_MAC}(CTX, MSG, ...); @@ -404,6 +454,11 @@ // otLogWarnCore{LEVEL=TRACE_LEVEL_WARNING,FLAGS=OT_MAC}(CTX, MSG, ...); // end_wpp +// begin_wpp config +// USEPREFIX (otLogNoteCore, "[%p]CORE%!SPACE!", &CTX); +// otLogNoteCore{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_MAC}(CTX, MSG, ...); +// end_wpp + // begin_wpp config // USEPREFIX (otLogInfoCore, "[%p]CORE%!SPACE!", &CTX); // otLogInfoCore{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_MAC}(CTX, MSG, ...); @@ -432,6 +487,11 @@ // otLogWarnUtil{LEVEL=TRACE_LEVEL_WARNING,FLAGS=OT_MAC}(CTX, MSG, ...); // end_wpp +// begin_wpp config +// USEPREFIX (otLogNoteUtil, "[%p]UTIL%!SPACE!", &CTX); +// otLogNoteUtil{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_MAC}(CTX, MSG, ...); +// end_wpp + // begin_wpp config // USEPREFIX (otLogInfoUtil, "[%p]UTIL%!SPACE!", &CTX); // otLogInfoUtil{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_MAC}(CTX, MSG, ...); @@ -461,6 +521,11 @@ // otLogWarnMem{LEVEL=TRACE_LEVEL_WARNING,FLAGS=OT_MEM}(CTX, MSG, ...); // end_wpp +// begin_wpp config +// USEPREFIX (otLogNoteMem, "[%p]MEM%!SPACE!", &CTX); +// otLogNoteMem{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_MEM}(CTX, MSG, ...); +// end_wpp + // begin_wpp config // USEPREFIX (otLogInfoMem, "[%p]MEM%!SPACE!", &CTX); // otLogInfoMem{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_MEM}(CTX, MSG, ...); @@ -489,6 +554,11 @@ // otLogWarnNetDiag{LEVEL=TRACE_LEVEL_WARNING,FLAGS=OT_NDIAG}(CTX, MSG, ...); // end_wpp +// begin_wpp config +// USEPREFIX (otLogNoteNetDiag, "[%p]NETD%!SPACE!", &CTX); +// otLogNoteNetDiag{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_NDIAG}(CTX, MSG, ...); +// end_wpp + // begin_wpp config // USEPREFIX (otLogInfoNetDiag, "[%p]NETD%!SPACE!", &CTX); // otLogInfoNetDiag{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_NDIAG}(CTX, MSG, ...); @@ -511,6 +581,11 @@ // otLogWarnCoap{LEVEL=TRACE_LEVEL_WARNING,FLAGS=OT_COAP}(CTX, MSG, ...); // end_wpp +// begin_wpp config +// USEPREFIX (otLogNoteCoap, "[%p]COAP%!SPACE!", &CTX); +// otLogNoteCoap{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_COAP}(CTX, MSG, ...); +// end_wpp + // begin_wpp config // USEPREFIX (otLogInfoCoap, "[%p]COAP%!SPACE!", &CTX); // otLogInfoCoap{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_COAP}(CTX, MSG, ...); @@ -539,6 +614,11 @@ // otLogWarnCli{LEVEL=TRACE_LEVEL_WARNING,FLAGS=OT_COAP}(CTX, MSG, ...); // end_wpp +// begin_wpp config +// USEPREFIX (otLogNoteCli, "[%p]COAP%!SPACE!", &CTX); +// otLogNoteCli{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_COAP}(CTX, MSG, ...); +// end_wpp + // begin_wpp config // USEPREFIX (otLogInfoCli, "[%p]COAP%!SPACE!", &CTX); // otLogInfoCli{LEVEL=TRACE_LEVEL_INFORMATION,FLAGS=OT_COAP}(CTX, MSG, ...); diff --git a/src/core/net/ip6.cpp b/src/core/net/ip6.cpp index 30648a195..1c2b10a0a 100644 --- a/src/core/net/ip6.cpp +++ b/src/core/net/ip6.cpp @@ -676,12 +676,12 @@ exit: switch (error) { case OT_ERROR_NO_BUFS: - otLogInfoIp6(GetInstance(), "Failed to pass up message (len: %d) to host - out of message buffer.", + otLogWarnIp6(GetInstance(), "Failed to pass up message (len: %d) to host - out of message buffer.", aMessage.GetLength()); break; case OT_ERROR_DROP: - otLogInfoIp6(GetInstance(), "Dropping message (len: %d) from local host since next hop is the host.", + otLogNoteIp6(GetInstance(), "Dropping message (len: %d) from local host since next hop is the host.", aMessage.GetLength()); break; diff --git a/src/core/thread/address_resolver.cpp b/src/core/thread/address_resolver.cpp index 4808f1efd..11724dfd3 100644 --- a/src/core/thread/address_resolver.cpp +++ b/src/core/thread/address_resolver.cpp @@ -196,12 +196,12 @@ void AddressResolver::InvalidateCacheEntry(Cache &aEntry, InvalidationReason aRe switch (aEntry.mState) { case Cache::kStateCached: - otLogInfoArp(GetInstance(), "Cache entry removed: %s, 0x%04x - %s", aEntry.mTarget.ToString().AsCString(), + otLogNoteArp(GetInstance(), "Cache entry removed: %s, 0x%04x - %s", aEntry.mTarget.ToString().AsCString(), aEntry.mRloc16, ConvertInvalidationReasonToString(aReason)); break; case Cache::kStateQuery: - otLogInfoArp(GetInstance(), "Cache entry (query mode) removed: %s, timeout:%d, retry:%d - %s", + otLogNoteArp(GetInstance(), "Cache entry (query mode) removed: %s, timeout:%d, retry:%d - %s", aEntry.mTarget.ToString().AsCString(), aEntry.mTimeout, aEntry.mRetryTimeout, ConvertInvalidationReasonToString(aReason)); break; @@ -241,7 +241,7 @@ void AddressResolver::UpdateCacheEntry(const Ip6::Address &aEid, Mac::ShortAddre GetNetif().GetMeshForwarder().HandleResolved(aEid, OT_ERROR_NONE); } - otLogInfoArp(GetInstance(), "Cache entry updated (snoop): %s, 0x%04x", aEid.ToString().AsCString(), + otLogNoteArp(GetInstance(), "Cache entry updated (snoop): %s, 0x%04x", aEid.ToString().AsCString(), aRloc16); } @@ -445,7 +445,7 @@ void AddressResolver::HandleAddressNotification(Coap::Header & aHeader, mCache[i].mState = Cache::kStateCached; MarkCacheEntryAsUsed(mCache[i]); - otLogInfoArp(GetInstance(), "Cache entry updated (notification): %s, 0x%04x, lastTrans:%d", + otLogNoteArp(GetInstance(), "Cache entry updated (notification): %s, 0x%04x, lastTrans:%d", targetTlv.GetTarget().ToString().AsCString(), rloc16Tlv.GetRloc16(), lastTransactionTime); if (netif.GetCoap().SendEmptyAck(aHeader, aMessageInfo) == OT_ERROR_NONE) diff --git a/src/core/thread/mle.cpp b/src/core/thread/mle.cpp index f0790756b..e35b060aa 100644 --- a/src/core/thread/mle.cpp +++ b/src/core/thread/mle.cpp @@ -298,7 +298,7 @@ void Mle::SetRole(otDeviceRole aRole) { VerifyOrExit(aRole != mRole, GetNotifier().SignalIfFirst(OT_CHANGED_THREAD_ROLE)); - otLogInfoMle(GetInstance(), "Role %s -> %s", RoleToString(mRole), RoleToString(aRole)); + otLogNoteMle(GetInstance(), "Role %s -> %s", RoleToString(mRole), RoleToString(aRole)); mRole = aRole; GetNotifier().Signal(OT_CHANGED_THREAD_ROLE); @@ -637,7 +637,7 @@ uint32_t Mle::GetAttachStartDelay(void) const delay += jitter; } - otLogInfoMle(GetInstance(), "Attach attempt %d unsuccessful, will try again in %u.%03u seconds", mAttachCounter, + otLogNoteMle(GetInstance(), "Attach attempt %d unsuccessful, will try again in %u.%03u seconds", mAttachCounter, delay / 1000, delay % 1000); exit: @@ -1591,12 +1591,12 @@ void Mle::HandleAttachTimer(void) case kAttachStateStart: if (mAttachCounter > 0) { - otLogInfoMle(GetInstance(), "Attempt to attach - attempt %d, %s %s", mAttachCounter, + otLogNoteMle(GetInstance(), "Attempt to attach - attempt %d, %s %s", mAttachCounter, AttachModeToString(mParentRequestMode), ReattachStateToString(mReattachState)); } else { - otLogInfoMle(GetInstance(), "Attempt to attach - %s %s", AttachModeToString(mParentRequestMode), + otLogNoteMle(GetInstance(), "Attempt to attach - %s %s", AttachModeToString(mParentRequestMode), ReattachStateToString(mReattachState)); } @@ -3499,7 +3499,7 @@ otError Mle::HandleAnnounce(const Message &aMessage, const Ip6::MessageInfo &aMe SetAttachState(kAttachStateProcessAnnounce); mAttachTimer.Start(kAnnounceProcessTimeout); - otLogInfoMle(GetInstance(), "Delay processing Announce - channel %d, panid 0x%02x", channel, panId); + otLogNoteMle(GetInstance(), "Delay processing Announce - channel %d, panid 0x%02x", channel, panId); } else if (localTimestamp->Compare(timestamp) < 0) { @@ -3530,7 +3530,7 @@ void Mle::ProcessAnnounce(void) assert(mAttachState == kAttachStateProcessAnnounce); - otLogInfoMle(GetInstance(), "Processing Announce - channel %d, panid 0x%02x", newChannel, newPanId); + otLogNoteMle(GetInstance(), "Processing Announce - channel %d, panid 0x%02x", newChannel, newPanId); Stop(/* aClearNetworkDatasets */ false); @@ -3811,7 +3811,7 @@ otError Mle::InformPreviousParent(void) SuccessOrExit(error = netif.GetIp6().SendDatagram(*message, messageInfo, Ip6::kProtoNone)); - otLogInfoMle(GetInstance(), "Sending message to inform previous parent 0x%04x", mPreviousParentRloc); + otLogNoteMle(GetInstance(), "Sending message to inform previous parent 0x%04x", mPreviousParentRloc); exit: diff --git a/src/core/thread/mle_router.cpp b/src/core/thread/mle_router.cpp index 12d1207d1..107c8242b 100644 --- a/src/core/thread/mle_router.cpp +++ b/src/core/thread/mle_router.cpp @@ -361,7 +361,7 @@ otError MleRouter::SetStateLeader(uint16_t aRloc16) } } - otLogInfoMle(GetInstance(), "Leader partition id 0x%x", mLeaderData.GetPartitionId()); + otLogNoteMle(GetInstance(), "Leader partition id 0x%x", mLeaderData.GetPartitionId()); return OT_ERROR_NONE; } @@ -1179,7 +1179,7 @@ otError MleRouter::HandleAdvertisement(const Message &aMessage, const Ip6::Messa if (partitionId != mLeaderData.GetPartitionId()) { - otLogInfoMle(GetInstance(), "Different partition (peer:%d, local:%d)", leaderData.GetPartitionId(), + otLogNoteMle(GetInstance(), "Different partition (peer:%d, local:%d)", leaderData.GetPartitionId(), mLeaderData.GetPartitionId()); VerifyOrExit(linkMargin >= OPENTHREAD_CONFIG_MLE_PARTITION_MERGE_MARGIN_MIN, error = OT_ERROR_LINK_MARGIN_LOW); @@ -1729,7 +1729,7 @@ void MleRouter::HandleStateUpdateTimer(void) if (routerStateUpdate && mRouterTable.GetActiveRouterCount() > mRouterDowngradeThreshold) { // downgrade to REED - otLogInfoMle(GetInstance(), "Downgrade to REED"); + otLogNoteMle(GetInstance(), "Downgrade to REED"); BecomeChild(kAttachSame1); } diff --git a/src/core/thread/router_table.cpp b/src/core/thread/router_table.cpp index 1f9e24e6d..4abcb07ef 100644 --- a/src/core/thread/router_table.cpp +++ b/src/core/thread/router_table.cpp @@ -249,7 +249,7 @@ Router *RouterTable::Allocate(uint8_t aRouterId) mRouterIdSequenceLastUpdated = TimerMilli::GetNow(); GetNetif().GetMle().ResetAdvertiseInterval(); - otLogInfoMle(GetInstance(), "Allocate router id %d", aRouterId); + otLogNoteMle(GetInstance(), "Allocate router id %d", aRouterId); exit: return rval; @@ -292,7 +292,7 @@ otError RouterTable::Release(uint8_t aRouterId) netif.GetNetworkDataLeader().RemoveBorderRouter(rloc16); netif.GetMle().ResetAdvertiseInterval(); - otLogInfoMle(GetInstance(), "Release router id %d", aRouterId); + otLogNoteMle(GetInstance(), "Release router id %d", aRouterId); exit: return error;