mirror of
https://github.com/espressif/openthread.git
synced 2026-08-01 08:37:47 +00:00
[core] add new generic Min(), Max() and Clamp() functions (#8017)
This commit adds generic helper functions: - `Min()` to get the minimum of two values, - `Max()` to get the maximum of two values, and - `Clamp()` to clamp a value to a given closed range from a minimum up to a maximum value. It also adds functions - `ClampToUint8()` and `ClampToUint16()` to clamp a `uint` value to a smaller bit-size (`uint8_t` or `uint16_t`) range.
This commit is contained in:
Abtin Keshavarzian
@@ -421,6 +421,7 @@ openthread_core_files = [
|
||||
"common/logging.hpp",
|
||||
"common/message.cpp",
|
||||
"common/message.hpp",
|
||||
"common/min_max.hpp",
|
||||
"common/new.hpp",
|
||||
"common/non_copyable.hpp",
|
||||
"common/notifier.cpp",
|
||||
|
||||
@@ -455,6 +455,7 @@ HEADERS_COMMON = \
|
||||
common/log.hpp \
|
||||
common/logging.hpp \
|
||||
common/message.hpp \
|
||||
common/min_max.hpp \
|
||||
common/new.hpp \
|
||||
common/non_copyable.hpp \
|
||||
common/notifier.hpp \
|
||||
|
||||
@@ -40,6 +40,7 @@
|
||||
#include "common/instance.hpp"
|
||||
#include "common/locator_getters.hpp"
|
||||
#include "common/log.hpp"
|
||||
#include "common/min_max.hpp"
|
||||
#include "common/random.hpp"
|
||||
#include "thread/mle_types.hpp"
|
||||
#include "thread/thread_netif.hpp"
|
||||
@@ -224,7 +225,7 @@ void Manager::HandleMulticastListenerRegistration(const Coap::Message &aMessage,
|
||||
{
|
||||
uint32_t origTimeout = timeout;
|
||||
|
||||
timeout = OT_MIN(timeout, static_cast<uint32_t>(Mle::kMlrTimeoutMax));
|
||||
timeout = Min(timeout, Mle::kMlrTimeoutMax);
|
||||
|
||||
if (timeout != origTimeout)
|
||||
{
|
||||
|
||||
@@ -38,6 +38,7 @@
|
||||
#include "common/array.hpp"
|
||||
#include "common/locator_getters.hpp"
|
||||
#include "common/log.hpp"
|
||||
#include "common/min_max.hpp"
|
||||
|
||||
namespace ot {
|
||||
|
||||
@@ -66,10 +67,9 @@ void NdProxyTable::NdProxy::Update(uint16_t aRloc16, uint32_t aTimeSinceLastTran
|
||||
{
|
||||
OT_ASSERT(mValid);
|
||||
|
||||
mRloc16 = aRloc16;
|
||||
aTimeSinceLastTransaction =
|
||||
OT_MIN(aTimeSinceLastTransaction, static_cast<uint32_t>(Mle::kTimeSinceLastTransactionMax));
|
||||
mLastRegistrationTime = TimerMilli::GetNow() - TimeMilli::SecToMsec(aTimeSinceLastTransaction);
|
||||
mRloc16 = aRloc16;
|
||||
aTimeSinceLastTransaction = Min(aTimeSinceLastTransaction, Mle::kTimeSinceLastTransactionMax);
|
||||
mLastRegistrationTime = TimerMilli::GetNow() - TimeMilli::SecToMsec(aTimeSinceLastTransaction);
|
||||
}
|
||||
|
||||
bool NdProxyTable::MatchesFilter(const NdProxy &aProxy, Filter aFilter)
|
||||
|
||||
@@ -45,6 +45,7 @@
|
||||
#include "common/instance.hpp"
|
||||
#include "common/locator_getters.hpp"
|
||||
#include "common/log.hpp"
|
||||
#include "common/min_max.hpp"
|
||||
#include "common/random.hpp"
|
||||
#include "common/settings.hpp"
|
||||
#include "meshcop/extended_panid.hpp"
|
||||
@@ -654,7 +655,7 @@ void RoutingManager::StartRoutingPolicyEvaluationDelay(uint32_t aDelayMilli)
|
||||
TimeMilli evaluateTime = now + aDelayMilli;
|
||||
TimeMilli earliestTime = mLastRouterAdvertisementSendTime + kMinDelayBetweenRtrAdvs;
|
||||
|
||||
evaluateTime = OT_MAX(evaluateTime, earliestTime);
|
||||
evaluateTime = Max(evaluateTime, earliestTime);
|
||||
|
||||
LogInfo("Start evaluating routing policy, scheduled in %u milliseconds", evaluateTime - now);
|
||||
|
||||
@@ -1254,9 +1255,9 @@ void RoutingManager::ResetDiscoveredPrefixStaleTimer(void)
|
||||
// Check for stale Router Advertisement Message if learnt from Host.
|
||||
if (mLearntRouterAdvMessageFromHost)
|
||||
{
|
||||
TimeMilli raStaleTime = OT_MAX(now, mTimeRouterAdvMessageLastUpdate + Time::SecToMsec(kRtrAdvStaleTime));
|
||||
TimeMilli raStaleTime = Max(now, mTimeRouterAdvMessageLastUpdate + Time::SecToMsec(kRtrAdvStaleTime));
|
||||
|
||||
nextStaleTime = OT_MIN(nextStaleTime, raStaleTime);
|
||||
nextStaleTime = Min(nextStaleTime, raStaleTime);
|
||||
}
|
||||
|
||||
if (nextStaleTime == now.GetDistantFuture())
|
||||
@@ -1646,22 +1647,22 @@ TimeMilli RoutingManager::DiscoveredPrefixTable::CalculateNextStaleTime(TimeMill
|
||||
{
|
||||
for (const Entry &entry : router.mEntries)
|
||||
{
|
||||
TimeMilli entryStaleTime = OT_MAX(aNow, entry.GetStaleTime());
|
||||
TimeMilli entryStaleTime = Max(aNow, entry.GetStaleTime());
|
||||
|
||||
if (entry.IsOnLinkPrefix() && !entry.IsDeprecated())
|
||||
{
|
||||
onLinkStaleTime = OT_MAX(onLinkStaleTime, entryStaleTime);
|
||||
onLinkStaleTime = Max(onLinkStaleTime, entryStaleTime);
|
||||
foundOnLink = true;
|
||||
}
|
||||
|
||||
if (!entry.IsOnLinkPrefix())
|
||||
{
|
||||
routeStaleTime = OT_MIN(routeStaleTime, entryStaleTime);
|
||||
routeStaleTime = Min(routeStaleTime, entryStaleTime);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return foundOnLink ? OT_MIN(onLinkStaleTime, routeStaleTime) : routeStaleTime;
|
||||
return foundOnLink ? Min(onLinkStaleTime, routeStaleTime) : routeStaleTime;
|
||||
}
|
||||
|
||||
void RoutingManager::DiscoveredPrefixTable::RemoveRoutersWithNoEntries(void)
|
||||
@@ -1801,7 +1802,7 @@ void RoutingManager::DiscoveredPrefixTable::RemoveExpiredEntries(void)
|
||||
{
|
||||
for (const Entry &entry : router.mEntries)
|
||||
{
|
||||
nextExpireTime = OT_MIN(nextExpireTime, entry.GetExpireTime());
|
||||
nextExpireTime = Min(nextExpireTime, entry.GetExpireTime());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1920,7 +1921,7 @@ TimeMilli RoutingManager::DiscoveredPrefixTable::Entry::GetExpireTime(void) cons
|
||||
|
||||
TimeMilli RoutingManager::DiscoveredPrefixTable::Entry::GetStaleTime(void) const
|
||||
{
|
||||
uint32_t delay = OT_MIN(kRtrAdvStaleTime, IsOnLinkPrefix() ? GetPreferredLifetime() : mValidLifetime);
|
||||
uint32_t delay = Min(kRtrAdvStaleTime, IsOnLinkPrefix() ? GetPreferredLifetime() : mValidLifetime);
|
||||
|
||||
return mLastUpdateTime + TimeMilli::SecToMsec(delay);
|
||||
}
|
||||
|
||||
@@ -44,6 +44,7 @@
|
||||
#include "common/const_cast.hpp"
|
||||
#include "common/equatable.hpp"
|
||||
#include "common/error.hpp"
|
||||
#include "common/min_max.hpp"
|
||||
#include "common/type_traits.hpp"
|
||||
|
||||
namespace ot {
|
||||
@@ -360,7 +361,7 @@ public:
|
||||
{
|
||||
Error error = (mLength >= aLength) ? kErrorNone : kErrorNoBufs;
|
||||
|
||||
mLength = OT_MIN(mLength, aLength);
|
||||
mLength = Min(mLength, aLength);
|
||||
memcpy(AsNonConst(mBuffer), aBuffer, mLength);
|
||||
|
||||
return error;
|
||||
|
||||
@@ -39,6 +39,7 @@
|
||||
|
||||
#include "common/code_utils.hpp"
|
||||
#include "common/instance.hpp"
|
||||
#include "common/min_max.hpp"
|
||||
#include "common/string.hpp"
|
||||
|
||||
/*
|
||||
@@ -244,7 +245,7 @@ void Logger::DumpInModule(const char *aModuleName,
|
||||
for (uint16_t i = 0; i < aDataLength; i += kDumpBytesPerLine)
|
||||
{
|
||||
DumpLine(aModuleName, aLogLevel, static_cast<const uint8_t *>(aData) + i,
|
||||
OT_MIN((aDataLength - i), kDumpBytesPerLine));
|
||||
Min(static_cast<uint8_t>(aDataLength - i), kDumpBytesPerLine));
|
||||
}
|
||||
|
||||
string.Clear();
|
||||
|
||||
@@ -0,0 +1,142 @@
|
||||
/*
|
||||
* Copyright (c) 2022, The OpenThread Authors.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. Neither the name of the copyright holder nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file
|
||||
* This file includes definitions for generic min, max and clamp functions.
|
||||
*/
|
||||
|
||||
#ifndef MIN_MAX_HPP_
|
||||
#define MIN_MAX_HPP_
|
||||
|
||||
#include "common/numeric_limits.hpp"
|
||||
#include "common/type_traits.hpp"
|
||||
|
||||
namespace ot {
|
||||
|
||||
/**
|
||||
* This template method returns the minimum of two given values.
|
||||
*
|
||||
* Uses `operator<` to compare the values.
|
||||
*
|
||||
* @tparam Type The value type.
|
||||
*
|
||||
* @param[in] aFirst The first value.
|
||||
* @param[in] aSecond The second value.
|
||||
*
|
||||
* @returns The minimum of @p aFirst and @p aSecond.
|
||||
*
|
||||
*/
|
||||
template <typename Type> Type Min(Type aFirst, Type aSecond)
|
||||
{
|
||||
return (aFirst < aSecond) ? aFirst : aSecond;
|
||||
}
|
||||
|
||||
/**
|
||||
* This template method returns the maximum of two given values.
|
||||
*
|
||||
* Uses `operator<` to compare the values.
|
||||
*
|
||||
* @tparam Type The value type.
|
||||
*
|
||||
* @param[in] aFirst The first value.
|
||||
* @param[in] aSecond The second value.
|
||||
*
|
||||
* @returns The maximum of @p aFirst and @p aSecond.
|
||||
*
|
||||
*/
|
||||
template <typename Type> Type Max(Type aFirst, Type aSecond)
|
||||
{
|
||||
return (aFirst < aSecond) ? aSecond : aFirst;
|
||||
}
|
||||
|
||||
/**
|
||||
* This template method returns clamped version of a given value to a given closed range [min, max].
|
||||
*
|
||||
* Uses `operator<` to compare the values. The behavior is undefined if the value of @p aMin is greater than @p aMax.
|
||||
*
|
||||
* @tparam Type The value type.
|
||||
*
|
||||
* @param[in] aValue The value to clamp.
|
||||
* @param[in] aMin The minimum value.
|
||||
* @param[in] aMax The maximum value.
|
||||
*
|
||||
* @returns The clamped version of @aValue to the closed range [@p aMin, @p aMax].
|
||||
*
|
||||
*/
|
||||
template <typename Type> Type Clamp(Type aValue, Type aMin, Type aMax)
|
||||
{
|
||||
Type value = Max(aValue, aMin);
|
||||
|
||||
return Min(value, aMax);
|
||||
}
|
||||
|
||||
/**
|
||||
* This template method returns a clamped version of given integer to a `uint8_t`.
|
||||
*
|
||||
* If @p aValue is greater than max value of a `uint8_t`, the max value is returned.
|
||||
*
|
||||
* @tparam UintType The value type (MUST be `uint16_t`, `uint32_t`, or `uint64_t`).
|
||||
*
|
||||
* @param[in] aValue The value to clamp.
|
||||
*
|
||||
* @returns The clamped version of @p aValue to `uint8_t`.
|
||||
*
|
||||
*/
|
||||
template <typename UintType> uint8_t ClampToUint8(UintType aValue)
|
||||
{
|
||||
static_assert(TypeTraits::IsSame<UintType, uint16_t>::kValue || TypeTraits::IsSame<UintType, uint32_t>::kValue ||
|
||||
TypeTraits::IsSame<UintType, uint64_t>::kValue,
|
||||
"UintType must be `uint16_t, `uint32_t`, or `uint64_t`");
|
||||
|
||||
return static_cast<uint8_t>(Min(aValue, static_cast<UintType>(NumericLimits<uint8_t>::kMax)));
|
||||
}
|
||||
|
||||
/**
|
||||
* This template method returns a clamped version of given integer to a `uint16_t`.
|
||||
*
|
||||
* If @p aValue is greater than max value of a `uint16_t`, the max value is returned.
|
||||
*
|
||||
* @tparam UintType The value type (MUST be `uint32_t`, or `uint64_t`).
|
||||
*
|
||||
* @param[in] aValue The value to clamp.
|
||||
*
|
||||
* @returns The clamped version of @p aValue to `uint16_t`.
|
||||
*
|
||||
*/
|
||||
template <typename UintType> uint16_t ClampToUint16(UintType aValue)
|
||||
{
|
||||
static_assert(TypeTraits::IsSame<UintType, uint32_t>::kValue || TypeTraits::IsSame<UintType, uint64_t>::kValue,
|
||||
"UintType must be `uint32_t` or `uint64_t`");
|
||||
|
||||
return static_cast<uint16_t>(Min(aValue, static_cast<UintType>(NumericLimits<uint16_t>::kMax)));
|
||||
}
|
||||
|
||||
} // namespace ot
|
||||
|
||||
#endif // MIN_MAX_HPP_
|
||||
@@ -38,6 +38,7 @@
|
||||
#include "common/locator_getters.hpp"
|
||||
#include "common/log.hpp"
|
||||
#include "common/message.hpp"
|
||||
#include "common/min_max.hpp"
|
||||
#include "net/ip6.hpp"
|
||||
#include "net/netif.hpp"
|
||||
#include "thread/mesh_forwarder.hpp"
|
||||
@@ -197,7 +198,7 @@ uint32_t DataPollSender::GetKeepAlivePollPeriod(void) const
|
||||
|
||||
if (mExternalPollPeriod != 0)
|
||||
{
|
||||
period = OT_MIN(period, mExternalPollPeriod);
|
||||
period = Min(period, mExternalPollPeriod);
|
||||
}
|
||||
|
||||
return period;
|
||||
@@ -506,22 +507,22 @@ uint32_t DataPollSender::CalculatePollPeriod(void) const
|
||||
|
||||
if (mAttachMode)
|
||||
{
|
||||
period = OT_MIN(period, kAttachDataPollPeriod);
|
||||
period = Min(period, kAttachDataPollPeriod);
|
||||
}
|
||||
|
||||
if (mRetxMode)
|
||||
{
|
||||
period = OT_MIN(period, kRetxPollPeriod);
|
||||
period = Min(period, kRetxPollPeriod);
|
||||
}
|
||||
|
||||
if (mRemainingFastPolls != 0)
|
||||
{
|
||||
period = OT_MIN(period, kFastPollPeriod);
|
||||
period = Min(period, kFastPollPeriod);
|
||||
}
|
||||
|
||||
if (mExternalPollPeriod != 0)
|
||||
{
|
||||
period = OT_MIN(period, mExternalPollPeriod);
|
||||
period = Min(period, mExternalPollPeriod);
|
||||
}
|
||||
|
||||
if (period == 0)
|
||||
@@ -545,7 +546,7 @@ uint32_t DataPollSender::GetDefaultPollPeriod(void) const
|
||||
#if OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && OPENTHREAD_CONFIG_MAC_CSL_AUTO_SYNC_ENABLE
|
||||
if (Get<Mac::Mac>().IsCslEnabled())
|
||||
{
|
||||
period = OT_MIN(period, Time::SecToMsec(Get<Mle::MleRouter>().GetCslTimeout()));
|
||||
period = Min(period, Time::SecToMsec(Get<Mle::MleRouter>().GetCslTimeout()));
|
||||
pollAhead = static_cast<uint32_t>(kRetxPollPeriod);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -42,6 +42,7 @@
|
||||
#include "common/instance.hpp"
|
||||
#include "common/locator_getters.hpp"
|
||||
#include "common/log.hpp"
|
||||
#include "common/min_max.hpp"
|
||||
#include "common/random.hpp"
|
||||
#include "common/time.hpp"
|
||||
#include "mac/mac_frame.hpp"
|
||||
@@ -612,7 +613,8 @@ void SubMac::HandleTransmitDone(TxFrame &aFrame, RxFrame *aAckFrame, Error aErro
|
||||
{
|
||||
SetState(kStateDelayBeforeRetx);
|
||||
StartTimerForBackoff(mRetxDelayBackOffExponent);
|
||||
mRetxDelayBackOffExponent = OT_MIN(mRetxDelayBackOffExponent + 1, kRetxDelayMaxBackoffExponent);
|
||||
mRetxDelayBackOffExponent =
|
||||
Min(static_cast<uint8_t>(mRetxDelayBackOffExponent + 1), kRetxDelayMaxBackoffExponent);
|
||||
ExitNow();
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -35,6 +35,7 @@
|
||||
|
||||
#include "common/const_cast.hpp"
|
||||
#include "common/debug.hpp"
|
||||
#include "common/min_max.hpp"
|
||||
#include "common/string.hpp"
|
||||
#include "meshcop/meshcop.hpp"
|
||||
|
||||
@@ -154,7 +155,7 @@ bool SecurityPolicyTlv::IsValid(void) const
|
||||
SecurityPolicy SecurityPolicyTlv::GetSecurityPolicy(void) const
|
||||
{
|
||||
SecurityPolicy securityPolicy;
|
||||
uint8_t length = OT_MIN(static_cast<uint8_t>(sizeof(mFlags)), GetFlagsLength());
|
||||
uint8_t length = Min(static_cast<uint8_t>(sizeof(mFlags)), GetFlagsLength());
|
||||
|
||||
securityPolicy.mRotationTime = GetRotationTime();
|
||||
securityPolicy.SetFlags(mFlags, length);
|
||||
|
||||
@@ -37,6 +37,7 @@
|
||||
#include "common/instance.hpp"
|
||||
#include "common/locator_getters.hpp"
|
||||
#include "common/log.hpp"
|
||||
#include "common/min_max.hpp"
|
||||
#include "common/random.hpp"
|
||||
|
||||
/**
|
||||
@@ -1125,7 +1126,7 @@ void Dso::Connection::AdjustInactivityTimeout(uint32_t aNewTimeout)
|
||||
// five seconds or one quarter of the new inactivity
|
||||
// timeout, whichever is greater [RFC 8490 - 7.1.1].
|
||||
|
||||
newExpiration = now + OT_MAX(kMinServerInactivityWaitTime, aNewTimeout / 4);
|
||||
newExpiration = now + Max(kMinServerInactivityWaitTime, aNewTimeout / 4);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1143,7 +1144,7 @@ uint32_t Dso::Connection::CalculateServerInactivityWaitTime(void) const
|
||||
|
||||
OT_ASSERT(mInactivity.IsUsed());
|
||||
|
||||
return OT_MAX(mInactivity.GetInterval() * 2, kMinServerInactivityWaitTime);
|
||||
return Max(mInactivity.GetInterval() * 2, kMinServerInactivityWaitTime);
|
||||
}
|
||||
|
||||
void Dso::Connection::ResetTimeouts(bool aIsKeepAliveMessage)
|
||||
@@ -1219,12 +1220,12 @@ TimeMilli Dso::Connection::GetNextFireTime(TimeMilli aNow) const
|
||||
case kStateConnectedButSessionless:
|
||||
case kStateEstablishingSession:
|
||||
case kStateSessionEstablished:
|
||||
nextTime = OT_MIN(nextTime, mPendingRequests.GetNextFireTime(aNow));
|
||||
nextTime = Min(nextTime, mPendingRequests.GetNextFireTime(aNow));
|
||||
|
||||
if (mKeepAlive.IsUsed())
|
||||
{
|
||||
VerifyOrExit(mKeepAlive.GetExpirationTime() > aNow, nextTime = aNow);
|
||||
nextTime = OT_MIN(nextTime, mKeepAlive.GetExpirationTime());
|
||||
nextTime = Min(nextTime, mKeepAlive.GetExpirationTime());
|
||||
}
|
||||
|
||||
if (mInactivity.IsUsed() && mPendingRequests.IsEmpty() && !mLongLivedOperation)
|
||||
@@ -1234,7 +1235,7 @@ TimeMilli Dso::Connection::GetNextFireTime(TimeMilli aNow) const
|
||||
// active long-lived operation.
|
||||
|
||||
VerifyOrExit(mInactivity.GetExpirationTime() > aNow, nextTime = aNow);
|
||||
nextTime = OT_MIN(nextTime, mInactivity.GetExpirationTime());
|
||||
nextTime = Min(nextTime, mInactivity.GetExpirationTime());
|
||||
}
|
||||
|
||||
break;
|
||||
@@ -1311,7 +1312,7 @@ void Dso::Connection::HandleTimer(TimeMilli aNow, TimeMilli &aNextTime)
|
||||
}
|
||||
|
||||
exit:
|
||||
aNextTime = OT_MIN(aNextTime, GetNextFireTime(aNow));
|
||||
aNextTime = Min(aNextTime, GetNextFireTime(aNow));
|
||||
SignalAnyStateChange();
|
||||
}
|
||||
|
||||
@@ -1435,7 +1436,7 @@ TimeMilli Dso::Connection::PendingRequests::GetNextFireTime(TimeMilli aNow) cons
|
||||
for (const Entry &entry : mRequests)
|
||||
{
|
||||
VerifyOrExit(entry.mTimeout > aNow, nextTime = aNow);
|
||||
nextTime = OT_MIN(entry.mTimeout, nextTime);
|
||||
nextTime = Min(entry.mTimeout, nextTime);
|
||||
}
|
||||
|
||||
exit:
|
||||
|
||||
@@ -42,6 +42,7 @@
|
||||
#include "common/linked_list.hpp"
|
||||
#include "common/locator.hpp"
|
||||
#include "common/message.hpp"
|
||||
#include "common/min_max.hpp"
|
||||
#include "common/non_copyable.hpp"
|
||||
#include "common/timer.hpp"
|
||||
#include "net/dns_types.hpp"
|
||||
@@ -773,7 +774,7 @@ public:
|
||||
// If it is not infinite, limit the interval to `kMaxInterval`.
|
||||
// The max limit ensures that even twice the interval is less
|
||||
// than max OpenThread timer duration.
|
||||
return (aInterval == kInfinite) ? aInterval : OT_MIN(aInterval, kMaxInterval);
|
||||
return (aInterval == kInfinite) ? aInterval : Min(aInterval, kMaxInterval);
|
||||
}
|
||||
|
||||
uint32_t mInterval;
|
||||
|
||||
@@ -36,6 +36,7 @@
|
||||
#include "common/code_utils.hpp"
|
||||
#include "common/debug.hpp"
|
||||
#include "common/instance.hpp"
|
||||
#include "common/min_max.hpp"
|
||||
#include "common/random.hpp"
|
||||
#include "common/string.hpp"
|
||||
|
||||
@@ -334,7 +335,7 @@ Error Name::ReadName(const Message &aMessage, uint16_t &aOffset, char *aNameBuff
|
||||
// here since `iterator.ReadLabel()` would verify it.
|
||||
}
|
||||
|
||||
labelLength = static_cast<uint8_t>(OT_MIN(static_cast<uint8_t>(kMaxLabelSize), aNameBufferSize));
|
||||
labelLength = static_cast<uint8_t>(Min(static_cast<uint16_t>(kMaxLabelSize), aNameBufferSize));
|
||||
SuccessOrExit(error = iterator.ReadLabel(aNameBuffer, labelLength, /* aAllowDotCharInLabel */ false));
|
||||
aNameBuffer += labelLength;
|
||||
aNameBufferSize -= labelLength;
|
||||
|
||||
@@ -40,6 +40,7 @@
|
||||
#include "common/code_utils.hpp"
|
||||
#include "common/encoding.hpp"
|
||||
#include "common/instance.hpp"
|
||||
#include "common/min_max.hpp"
|
||||
#include "common/numeric_limits.hpp"
|
||||
#include "common/random.hpp"
|
||||
#include "net/ip4_types.hpp"
|
||||
@@ -112,7 +113,7 @@ bool Prefix::operator<(const Prefix &aOther) const
|
||||
uint8_t minLength;
|
||||
uint8_t matchedLength;
|
||||
|
||||
minLength = OT_MIN(GetLength(), aOther.GetLength());
|
||||
minLength = Min(GetLength(), aOther.GetLength());
|
||||
matchedLength = MatchLength(GetBytes(), aOther.GetBytes(), SizeForLength(minLength));
|
||||
|
||||
if (matchedLength >= minLength)
|
||||
|
||||
@@ -35,6 +35,7 @@
|
||||
#include "common/debug.hpp"
|
||||
#include "common/instance.hpp"
|
||||
#include "common/locator_getters.hpp"
|
||||
#include "common/min_max.hpp"
|
||||
#include "common/random.hpp"
|
||||
#include "common/settings.hpp"
|
||||
#include "common/string.hpp"
|
||||
@@ -1725,7 +1726,7 @@ uint32_t Client::GetBoundedLeaseInterval(uint32_t aInterval, uint32_t aDefaultIn
|
||||
|
||||
if (aInterval != 0)
|
||||
{
|
||||
boundedInterval = OT_MIN(aInterval, static_cast<uint32_t>(kMaxLease));
|
||||
boundedInterval = Min(aInterval, kMaxLease);
|
||||
}
|
||||
|
||||
return boundedInterval;
|
||||
|
||||
+11
-10
@@ -40,6 +40,7 @@
|
||||
#include "common/instance.hpp"
|
||||
#include "common/locator_getters.hpp"
|
||||
#include "common/log.hpp"
|
||||
#include "common/min_max.hpp"
|
||||
#include "common/new.hpp"
|
||||
#include "common/random.hpp"
|
||||
#include "net/dns_types.hpp"
|
||||
@@ -189,7 +190,7 @@ uint32_t Server::TtlConfig::GrantTtl(uint32_t aLease, uint32_t aTtl) const
|
||||
{
|
||||
OT_ASSERT(mMinTtl <= mMaxTtl);
|
||||
|
||||
return OT_MAX(mMinTtl, OT_MIN(OT_MIN(mMaxTtl, aLease), aTtl));
|
||||
return Clamp(Min(aTtl, aLease), mMinTtl, mMaxTtl);
|
||||
}
|
||||
|
||||
Server::LeaseConfig::LeaseConfig(void)
|
||||
@@ -222,14 +223,14 @@ uint32_t Server::LeaseConfig::GrantLease(uint32_t aLease) const
|
||||
{
|
||||
OT_ASSERT(mMinLease <= mMaxLease);
|
||||
|
||||
return (aLease == 0) ? 0 : OT_MAX(mMinLease, OT_MIN(mMaxLease, aLease));
|
||||
return (aLease == 0) ? 0 : Clamp(aLease, mMinLease, mMaxLease);
|
||||
}
|
||||
|
||||
uint32_t Server::LeaseConfig::GrantKeyLease(uint32_t aKeyLease) const
|
||||
{
|
||||
OT_ASSERT(mMinKeyLease <= mMaxKeyLease);
|
||||
|
||||
return (aKeyLease == 0) ? 0 : OT_MAX(mMinKeyLease, OT_MIN(mMaxKeyLease, aKeyLease));
|
||||
return (aKeyLease == 0) ? 0 : Clamp(aKeyLease, mMinKeyLease, mMaxKeyLease);
|
||||
}
|
||||
|
||||
Error Server::SetLeaseConfig(const LeaseConfig &aLeaseConfig)
|
||||
@@ -1482,7 +1483,7 @@ void Server::HandleLeaseTimer(void)
|
||||
|
||||
Service *next;
|
||||
|
||||
earliestExpireTime = OT_MIN(earliestExpireTime, host->GetKeyExpireTime());
|
||||
earliestExpireTime = Min(earliestExpireTime, host->GetKeyExpireTime());
|
||||
|
||||
// Check if any service instance name expired.
|
||||
for (Service *service = host->mServices.GetHead(); service != nullptr; service = next)
|
||||
@@ -1498,7 +1499,7 @@ void Server::HandleLeaseTimer(void)
|
||||
}
|
||||
else
|
||||
{
|
||||
earliestExpireTime = OT_MIN(earliestExpireTime, service->GetKeyExpireTime());
|
||||
earliestExpireTime = Min(earliestExpireTime, service->GetKeyExpireTime());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1515,7 +1516,7 @@ void Server::HandleLeaseTimer(void)
|
||||
|
||||
RemoveHost(host, kRetainName, kNotifyServiceHandler);
|
||||
|
||||
earliestExpireTime = OT_MIN(earliestExpireTime, host->GetKeyExpireTime());
|
||||
earliestExpireTime = Min(earliestExpireTime, host->GetKeyExpireTime());
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1525,7 +1526,7 @@ void Server::HandleLeaseTimer(void)
|
||||
|
||||
OT_ASSERT(!host->IsDeleted());
|
||||
|
||||
earliestExpireTime = OT_MIN(earliestExpireTime, host->GetExpireTime());
|
||||
earliestExpireTime = Min(earliestExpireTime, host->GetExpireTime());
|
||||
|
||||
for (Service *service = host->mServices.GetHead(); service != nullptr; service = next)
|
||||
{
|
||||
@@ -1539,7 +1540,7 @@ void Server::HandleLeaseTimer(void)
|
||||
else if (service->mIsDeleted)
|
||||
{
|
||||
// The service has been deleted but the name retains.
|
||||
earliestExpireTime = OT_MIN(earliestExpireTime, service->GetKeyExpireTime());
|
||||
earliestExpireTime = Min(earliestExpireTime, service->GetKeyExpireTime());
|
||||
}
|
||||
else if (service->GetExpireTime() <= now)
|
||||
{
|
||||
@@ -1547,11 +1548,11 @@ void Server::HandleLeaseTimer(void)
|
||||
|
||||
// The service is expired, delete it.
|
||||
host->RemoveService(service, kRetainName, kNotifyServiceHandler);
|
||||
earliestExpireTime = OT_MIN(earliestExpireTime, service->GetKeyExpireTime());
|
||||
earliestExpireTime = Min(earliestExpireTime, service->GetKeyExpireTime());
|
||||
}
|
||||
else
|
||||
{
|
||||
earliestExpireTime = OT_MIN(earliestExpireTime, service->GetExpireTime());
|
||||
earliestExpireTime = Min(earliestExpireTime, service->GetExpireTime());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -63,6 +63,7 @@
|
||||
#include "common/heap_string.hpp"
|
||||
#include "common/linked_list.hpp"
|
||||
#include "common/locator.hpp"
|
||||
#include "common/min_max.hpp"
|
||||
#include "common/non_copyable.hpp"
|
||||
#include "common/notifier.hpp"
|
||||
#include "common/numeric_limits.hpp"
|
||||
@@ -472,7 +473,8 @@ public:
|
||||
*/
|
||||
const Ip6::Address *GetAddresses(uint8_t &aAddressesNum) const
|
||||
{
|
||||
aAddressesNum = static_cast<uint8_t>(OT_MIN(mAddresses.GetLength(), NumericLimits<uint8_t>::kMax));
|
||||
aAddressesNum = ClampToUint8(mAddresses.GetLength());
|
||||
|
||||
return mAddresses.AsCArray();
|
||||
}
|
||||
|
||||
|
||||
@@ -43,6 +43,7 @@
|
||||
#include "common/instance.hpp"
|
||||
#include "common/locator_getters.hpp"
|
||||
#include "common/log.hpp"
|
||||
#include "common/min_max.hpp"
|
||||
#include "common/random.hpp"
|
||||
#include "net/checksum.hpp"
|
||||
#include "net/ip6.hpp"
|
||||
@@ -431,7 +432,7 @@ bool Tcp::Endpoint::FirePendingTimers(TimeMilli aNow, bool &aHasFutureTimer, Tim
|
||||
else
|
||||
{
|
||||
aHasFutureTimer = true;
|
||||
aEarliestFutureExpiry = OT_MIN(aEarliestFutureExpiry, expiry);
|
||||
aEarliestFutureExpiry = Min(aEarliestFutureExpiry, expiry);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -38,6 +38,7 @@
|
||||
#include "common/code_utils.hpp"
|
||||
#include "common/instance.hpp"
|
||||
#include "common/locator_getters.hpp"
|
||||
#include "common/min_max.hpp"
|
||||
|
||||
namespace ot {
|
||||
|
||||
@@ -123,7 +124,8 @@ void LqiAverager::Add(uint8_t aLqi)
|
||||
{
|
||||
mCount++;
|
||||
}
|
||||
count = OT_MIN((1 << kCoeffBitShift), mCount);
|
||||
|
||||
count = Min(static_cast<uint8_t>(1 << kCoeffBitShift), mCount);
|
||||
|
||||
mAverage = static_cast<uint8_t>(((mAverage * (count - 1)) + aLqi) / count);
|
||||
}
|
||||
|
||||
@@ -36,6 +36,7 @@
|
||||
#if OPENTHREAD_FTD
|
||||
|
||||
#include "common/locator_getters.hpp"
|
||||
#include "common/min_max.hpp"
|
||||
#include "meshcop/meshcop.hpp"
|
||||
#include "net/ip6.hpp"
|
||||
#include "net/tcp6.hpp"
|
||||
@@ -456,7 +457,7 @@ void MeshForwarder::EvaluateRoutingCost(uint16_t aDest, uint8_t &aBestCost, uint
|
||||
}
|
||||
|
||||
// Choose the minimum cost
|
||||
curCost = OT_MIN(curCost, cost);
|
||||
curCost = Min(curCost, cost);
|
||||
}
|
||||
|
||||
if ((aBestDest == Mac::kShortAddrInvalid) || (curCost < aBestCost))
|
||||
|
||||
@@ -43,6 +43,7 @@
|
||||
#include "common/encoding.hpp"
|
||||
#include "common/instance.hpp"
|
||||
#include "common/locator_getters.hpp"
|
||||
#include "common/min_max.hpp"
|
||||
#include "common/random.hpp"
|
||||
#include "common/serial_number.hpp"
|
||||
#include "common/settings.hpp"
|
||||
@@ -1358,7 +1359,7 @@ bool Mle::HasAcceptableParentCandidate(void) const
|
||||
// in Parent Request was sent to routers, we will keep the
|
||||
// candidate and forward to REED stage to potentially find a
|
||||
// better parent.
|
||||
linkQuality = OT_MIN(mParentCandidate.GetLinkInfo().GetLinkQuality(), mParentCandidate.GetLinkQualityOut());
|
||||
linkQuality = Min(mParentCandidate.GetLinkInfo().GetLinkQuality(), mParentCandidate.GetLinkQualityOut());
|
||||
VerifyOrExit(linkQuality == kLinkQuality3);
|
||||
}
|
||||
|
||||
@@ -2986,7 +2987,7 @@ bool Mle::IsBetterParent(uint16_t aRloc16,
|
||||
bool rval = false;
|
||||
|
||||
LinkQuality candidateLinkQualityIn = mParentCandidate.GetLinkInfo().GetLinkQuality();
|
||||
LinkQuality candidateTwoWayLinkQuality = OT_MIN(candidateLinkQualityIn, mParentCandidate.GetLinkQualityOut());
|
||||
LinkQuality candidateTwoWayLinkQuality = Min(candidateLinkQualityIn, mParentCandidate.GetLinkQualityOut());
|
||||
#if OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE
|
||||
uint64_t candidateCslMetric = 0;
|
||||
uint64_t cslMetric = 0;
|
||||
|
||||
@@ -40,6 +40,7 @@
|
||||
#include "common/debug.hpp"
|
||||
#include "common/instance.hpp"
|
||||
#include "common/locator_getters.hpp"
|
||||
#include "common/min_max.hpp"
|
||||
#include "common/string.hpp"
|
||||
#include "common/timer.hpp"
|
||||
#include "net/ip6_headers.hpp"
|
||||
@@ -436,7 +437,7 @@ void HistoryTracker::Timestamp::SetToNow(void)
|
||||
|
||||
uint32_t HistoryTracker::Timestamp::GetDurationTill(TimeMilli aTime) const
|
||||
{
|
||||
return IsDistantPast() ? kMaxAge : OT_MIN(aTime - mTime, kMaxAge);
|
||||
return IsDistantPast() ? kMaxAge : Min(aTime - mTime, kMaxAge);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -38,6 +38,7 @@
|
||||
#include "common/as_core_type.hpp"
|
||||
#include "common/encoding.hpp"
|
||||
#include "common/locator_getters.hpp"
|
||||
#include "common/min_max.hpp"
|
||||
#include "common/random.hpp"
|
||||
|
||||
namespace ot {
|
||||
@@ -208,17 +209,16 @@ void PingSender::HandleIcmpReceive(const Message & aMessage,
|
||||
SuccessOrExit(aMessage.Read(aMessage.GetOffset(), timestamp));
|
||||
timestamp = HostSwap32(timestamp);
|
||||
|
||||
reply.mSenderAddress = aMessageInfo.GetPeerAddr();
|
||||
reply.mRoundTripTime =
|
||||
static_cast<uint16_t>(OT_MIN(TimerMilli::GetNow() - TimeMilli(timestamp), NumericLimits<uint16_t>::kMax));
|
||||
reply.mSenderAddress = aMessageInfo.GetPeerAddr();
|
||||
reply.mRoundTripTime = ClampToUint16(TimerMilli::GetNow() - TimeMilli(timestamp));
|
||||
reply.mSize = aMessage.GetLength() - aMessage.GetOffset();
|
||||
reply.mSequenceNumber = aIcmpHeader.GetSequence();
|
||||
reply.mHopLimit = aMessageInfo.GetHopLimit();
|
||||
|
||||
mStatistics.mReceivedCount++;
|
||||
mStatistics.mTotalRoundTripTime += reply.mRoundTripTime;
|
||||
mStatistics.mMaxRoundTripTime = OT_MAX(mStatistics.mMaxRoundTripTime, reply.mRoundTripTime);
|
||||
mStatistics.mMinRoundTripTime = OT_MIN(mStatistics.mMinRoundTripTime, reply.mRoundTripTime);
|
||||
mStatistics.mMaxRoundTripTime = Max(mStatistics.mMaxRoundTripTime, reply.mRoundTripTime);
|
||||
mStatistics.mMinRoundTripTime = Min(mStatistics.mMinRoundTripTime, reply.mRoundTripTime);
|
||||
|
||||
#if OPENTHREAD_CONFIG_OTNS_ENABLE
|
||||
Get<Utils::Otns>().EmitPingReply(aMessageInfo.GetPeerAddr(), reply.mSize, timestamp, reply.mHopLimit);
|
||||
|
||||
@@ -32,6 +32,7 @@
|
||||
|
||||
#include "test_util.h"
|
||||
#include "common/code_utils.hpp"
|
||||
#include "common/min_max.hpp"
|
||||
#include "common/numeric_limits.hpp"
|
||||
#include "common/serial_number.hpp"
|
||||
|
||||
@@ -65,6 +66,52 @@ template <typename UintType> void TestSerialNumber(const char *aName)
|
||||
printf("TestSerialNumber<%s>() passed\n", aName);
|
||||
}
|
||||
|
||||
void TestMinMaxClamp(void)
|
||||
{
|
||||
uint16_t u16;
|
||||
uint32_t u32;
|
||||
|
||||
VerifyOrQuit(Min<uint8_t>(1, 2) == 1);
|
||||
VerifyOrQuit(Min<uint8_t>(2, 1) == 1);
|
||||
VerifyOrQuit(Min<uint8_t>(1, 1) == 1);
|
||||
|
||||
VerifyOrQuit(Max<uint8_t>(1, 2) == 2);
|
||||
VerifyOrQuit(Max<uint8_t>(2, 1) == 2);
|
||||
VerifyOrQuit(Max<uint8_t>(1, 1) == 1);
|
||||
|
||||
VerifyOrQuit(Clamp<uint8_t>(1, 5, 10) == 5);
|
||||
VerifyOrQuit(Clamp<uint8_t>(5, 5, 10) == 5);
|
||||
VerifyOrQuit(Clamp<uint8_t>(7, 5, 10) == 7);
|
||||
VerifyOrQuit(Clamp<uint8_t>(10, 5, 10) == 10);
|
||||
VerifyOrQuit(Clamp<uint8_t>(12, 5, 10) == 10);
|
||||
|
||||
VerifyOrQuit(Clamp<uint8_t>(10, 10, 10) == 10);
|
||||
VerifyOrQuit(Clamp<uint8_t>(9, 10, 10) == 10);
|
||||
VerifyOrQuit(Clamp<uint8_t>(11, 10, 10) == 10);
|
||||
|
||||
u16 = 100;
|
||||
VerifyOrQuit(ClampToUint8(u16) == 100);
|
||||
u16 = 255;
|
||||
VerifyOrQuit(ClampToUint8(u16) == 255);
|
||||
u16 = 256;
|
||||
VerifyOrQuit(ClampToUint8(u16) == 255);
|
||||
u16 = 400;
|
||||
VerifyOrQuit(ClampToUint8(u16) == 255);
|
||||
|
||||
u32 = 100;
|
||||
VerifyOrQuit(ClampToUint16(u32) == 100);
|
||||
u32 = 256;
|
||||
VerifyOrQuit(ClampToUint16(u32) == 256);
|
||||
u32 = 0xffff;
|
||||
VerifyOrQuit(ClampToUint16(u32) == 0xffff);
|
||||
u32 = 0x10000;
|
||||
VerifyOrQuit(ClampToUint16(u32) == 0xffff);
|
||||
u32 = 0xfff0000;
|
||||
VerifyOrQuit(ClampToUint16(u32) == 0xffff);
|
||||
|
||||
printf("TestMinMaxClamp() passed\n");
|
||||
}
|
||||
|
||||
} // namespace ot
|
||||
|
||||
int main(void)
|
||||
@@ -73,6 +120,7 @@ int main(void)
|
||||
ot::TestSerialNumber<uint16_t>("uint16_t");
|
||||
ot::TestSerialNumber<uint32_t>("uint32_t");
|
||||
ot::TestSerialNumber<uint64_t>("uint64_t");
|
||||
ot::TestMinMaxClamp();
|
||||
printf("\nAll tests passed.\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user