espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-06-06 05:24:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

[locator] remove OwnerLocator class (#6138)

Browse Source 
This commit removes the OwnerLocator class since it's actually
useless.

Timer and Tasklet inherited from OwnerLocator to so that they can use
GetOwner<Type>() to find the owner object. However, these two classes
already inherited from InstanceLocator, thus can use Get<Type>() to
get any component of the OT instance.
This commit is contained in:
Simon Lin
2021-02-05 13:29:43 +08:00
committed by GitHub
parent ba9381649d
commit 9fb778089b
54 changed files with 135 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cli/cli.cpp
+4 -10
View File
@@ -120,7 +120,7 @@ Interpreter::Interpreter(Instance *aInstance)
, mPingHopLimit(0)
, mPingAllowZeroHopLimit(false)
, mPingIdentifier(0)
, mPingTimer(*aInstance, Interpreter::HandlePingTimer, this)
, mPingTimer(*aInstance, Interpreter::HandlePingTimer)
#if OPENTHREAD_CONFIG_DNS_CLIENT_ENABLE
, mResolvingInProgress(false)
#endif
@@ -4821,16 +4821,10 @@ void Interpreter::SetUserCommands(const otCliCommand *aCommands, uint8_t aLength
mUserCommandsContext = aContext;
}
Interpreter &Interpreter::GetOwner(OwnerLocator &aOwnerLocator)
Interpreter &Interpreter::GetOwner(InstanceLocator &aInstanceLocator)
{
#if OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE
Interpreter &interpreter = (aOwnerLocator.GetOwner<Interpreter>());
#else
OT_UNUSED_VARIABLE(aOwnerLocator);
Interpreter &interpreter = Interpreter::GetInterpreter();
#endif
return interpreter;
OT_UNUSED_VARIABLE(aInstanceLocator);
return Interpreter::GetInterpreter();
}
void Interpreter::SignalPingRequest(const Ip6::Address &aPeerAddress,
src/cli/cli.hpp
+1 -1
View File
@@ -596,7 +596,7 @@ private:
const char *LinkMetricsStatusToStr(uint8_t aStatus);
#endif // OPENTHREAD_CONFIG_MLE_LINK_METRICS_ENABLE
static Interpreter &GetOwner(OwnerLocator &aOwnerLocator);
static Interpreter &GetOwner(InstanceLocator &aInstanceLocator);
static void HandleDiscoveryRequest(const otThreadDiscoveryRequestInfo *aInfo, void *aContext)
{
src/core/backbone_router/bbr_manager.cpp
+6 -1
View File
@@ -63,7 +63,7 @@ Manager::Manager(Instance &aInstance)
#if OPENTHREAD_CONFIG_BACKBONE_ROUTER_MULTICAST_ROUTING_ENABLE
, mMulticastListenersTable(aInstance)
#endif
, mTimer(aInstance, Manager::HandleTimer, this)
, mTimer(aInstance, Manager::HandleTimer)
, mBackboneTmfAgent(aInstance)
#if OPENTHREAD_CONFIG_REFERENCE_DEVICE_ENABLE
#if OPENTHREAD_CONFIG_BACKBONE_ROUTER_DUA_NDPROXYING_ENABLE
@@ -141,6 +141,11 @@ void Manager::HandleNotifierEvents(Events aEvents)
}
}
void Manager::HandleTimer(Timer &aTimer)
{
aTimer.Get<Manager>().HandleTimer();
}
void Manager::HandleTimer(void)
{
#if OPENTHREAD_CONFIG_BACKBONE_ROUTER_MULTICAST_ROUTING_ENABLE
src/core/backbone_router/bbr_manager.hpp
+1 -1
View File
@@ -229,7 +229,7 @@ private:
#endif
void HandleNotifierEvents(Events aEvents);
static void HandleTimer(Timer &aTimer) { aTimer.GetOwner<Manager>().HandleTimer(); }
static void HandleTimer(Timer &aTimer);
void HandleTimer(void);
#if OPENTHREAD_CONFIG_BACKBONE_ROUTER_MULTICAST_ROUTING_ENABLE
src/core/border_router/routing_manager.cpp
+6 -6
View File
@@ -65,10 +65,10 @@ RoutingManager::RoutingManager(Instance &aInstance)
, mAdvertisedOmrPrefixNum(0)
, mAdvertisedOnLinkPrefix(nullptr)
, mDiscoveredPrefixNum(0)
, mDiscoveredPrefixInvalidTimer(aInstance, HandleDiscoveredPrefixInvalidTimer, this)
, mRouterAdvertisementTimer(aInstance, HandleRouterAdvertisementTimer, this)
, mDiscoveredPrefixInvalidTimer(aInstance, HandleDiscoveredPrefixInvalidTimer)
, mRouterAdvertisementTimer(aInstance, HandleRouterAdvertisementTimer)
, mRouterAdvertisementCount(0)
, mRouterSolicitTimer(aInstance, HandleRouterSolicitTimer, this)
, mRouterSolicitTimer(aInstance, HandleRouterSolicitTimer)
, mRouterSolicitCount(0)
{
mLocalOmrPrefix.Clear();
@@ -772,7 +772,7 @@ bool RoutingManager::IsValidOnLinkPrefix(const Ip6::Prefix &aOnLinkPrefix)
void RoutingManager::HandleRouterAdvertisementTimer(Timer &aTimer)
{
aTimer.GetOwner<RoutingManager>().HandleRouterAdvertisementTimer();
aTimer.Get<RoutingManager>().HandleRouterAdvertisementTimer();
}
void RoutingManager::HandleRouterAdvertisementTimer(void)
@@ -784,7 +784,7 @@ void RoutingManager::HandleRouterAdvertisementTimer(void)
void RoutingManager::HandleRouterSolicitTimer(Timer &aTimer)
{
aTimer.GetOwner<RoutingManager>().HandleRouterSolicitTimer();
aTimer.Get<RoutingManager>().HandleRouterSolicitTimer();
}
void RoutingManager::HandleRouterSolicitTimer(void)
@@ -824,7 +824,7 @@ void RoutingManager::HandleRouterSolicitTimer(void)
void RoutingManager::HandleDiscoveredPrefixInvalidTimer(Timer &aTimer)
{
aTimer.GetOwner<RoutingManager>().HandleDiscoveredPrefixInvalidTimer();
aTimer.Get<RoutingManager>().HandleDiscoveredPrefixInvalidTimer();
}
void RoutingManager::HandleDiscoveredPrefixInvalidTimer(void)
src/core/common/locator-getters.hpp
-9
View File
@@ -63,15 +63,6 @@ template <typename Type> inline Type &InstanceLocator::Get(void) const
return GetInstance().Get<Type>();
}
#if !OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE
template <typename OwnerType> OwnerType &OwnerLocator::GetOwner(void)
{
return Instance::Get().Get<OwnerType>();
}
#endif
} // namespace ot
#endif // LOCATOR_GETTERS_HPP_
src/core/common/locator.hpp
-48
View File
@@ -161,54 +161,6 @@ protected:
}
};
/**
* This class implements a locator for owner of an object.
*
* This is used as the base class for objects that provide a callback (e.g., `Timer` or `Tasklet`).
*
*/
class OwnerLocator
{
public:
/**
* This template method returns a reference to the owner object.
*
* The caller needs to provide the `OwnerType` as part of the template type.
*
* @returns A reference to the owner of this object.
*
*/
template <typename OwnerType> OwnerType &GetOwner(void)
#if OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE
{
return *static_cast<OwnerType *>(mOwner);
}
#else
// Implemented in `locator-getters.hpp`
;
#endif
protected:
/**
* This constructor initializes the object.
*
* @param[in] aOwner A pointer to the owner object (as `void *`).
*
*/
explicit OwnerLocator(void *aOwner)
#if OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE
: mOwner(aOwner)
#endif
{
OT_UNUSED_VARIABLE(aOwner);
}
#if OPENTHREAD_CONFIG_MULTIPLE_INSTANCE_ENABLE
private:
void *mOwner;
#endif
};
/**
* @}
*
src/core/common/notifier.cpp
+2 -2
View File
@@ -43,7 +43,7 @@ namespace ot {
Notifier::Notifier(Instance &aInstance)
: InstanceLocator(aInstance)
, mTask(aInstance, Notifier::EmitEvents, this)
, mTask(aInstance, Notifier::EmitEvents)
{
for (ExternalCallback &callback : mExternalCallbacks)
{
@@ -117,7 +117,7 @@ void Notifier::SignalIfFirst(Event aEvent)
void Notifier::EmitEvents(Tasklet &aTasklet)
{
aTasklet.GetOwner<Notifier>().EmitEvents();
aTasklet.Get<Notifier>().EmitEvents();
}
void Notifier::EmitEvents(void)
src/core/common/tasklet.cpp
+1 -2
View File
@@ -41,9 +41,8 @@
namespace ot {
Tasklet::Tasklet(Instance &aInstance, Handler aHandler, void *aOwner)
Tasklet::Tasklet(Instance &aInstance, Handler aHandler)
: InstanceLocator(aInstance)
, OwnerLocator(aOwner)
, mHandler(aHandler)
, mNext(nullptr)
{
src/core/common/tasklet.hpp
+3 -4
View File
@@ -61,7 +61,7 @@ class TaskletScheduler;
* This class is used to represent a tasklet.
*
*/
class Tasklet : public InstanceLocator, public OwnerLocator
class Tasklet : public InstanceLocator
{
friend class TaskletScheduler;
@@ -79,10 +79,9 @@ public:
*
* @param[in] aInstance A reference to the OpenThread instance object.
* @param[in] aHandler A pointer to a function that is called when the tasklet is run.
* @param[in] aOwner A pointer to owner of this `Tasklet` object.
*
*/
Tasklet(Instance &aInstance, Handler aHandler, void *aOwner);
Tasklet(Instance &aInstance, Handler aHandler);
/**
* This method puts the tasklet on the tasklet scheduler run queue.
@@ -129,7 +128,7 @@ public:
*
*/
TaskletContext(Instance &aInstance, Handler aHandler, void *aContext)
: Tasklet(aInstance, aHandler, aContext)
: Tasklet(aInstance, aHandler)
, mContext(aContext)
{
}
src/core/common/time_ticker.cpp
+2 -2
View File
@@ -45,7 +45,7 @@ namespace ot {
TimeTicker::TimeTicker(Instance &aInstance)
: InstanceLocator(aInstance)
, mReceivers(0)
, mTimer(aInstance, HandleTimer, this)
, mTimer(aInstance, HandleTimer)
{
}
@@ -71,7 +71,7 @@ void TimeTicker::UnregisterReceiver(Receiver aReceiver)
void TimeTicker::HandleTimer(Timer &aTimer)
{
aTimer.GetOwner<TimeTicker>().HandleTimer();
aTimer.Get<TimeTicker>().HandleTimer();
}
void TimeTicker::HandleTimer(void)
src/core/common/timer.hpp
+7 -11
View File
@@ -67,7 +67,7 @@ class TimerMilliScheduler;
* This class implements a timer.
*
*/
class Timer : public InstanceLocator, public OwnerLocator, public LinkedListEntry<Timer>
class Timer : public InstanceLocator, public LinkedListEntry<Timer>
{
friend class TimerScheduler;
friend class LinkedListEntry<Timer>;
@@ -92,12 +92,10 @@ public:
*
* @param[in] aInstance A reference to the OpenThread instance.
* @param[in] aHandler A pointer to a function that is called when the timer expires.
* @param[in] aOwner A pointer to owner of the `Timer` object.
*
*/
Timer(Instance &aInstance, Handler aHandler, void *aOwner)
Timer(Instance &aInstance, Handler aHandler)
: InstanceLocator(aInstance)
, OwnerLocator(aOwner)
, mHandler(aHandler)
, mFireTime()
, mNext(this)
@@ -153,11 +151,10 @@ public:
*
* @param[in] aInstance A reference to the OpenThread instance.
* @param[in] aHandler A pointer to a function that is called when the timer expires.
* @param[in] aOwner A pointer to the owner of the `TimerMilli` object.
*
*/
TimerMilli(Instance &aInstance, Handler aHandler, void *aOwner)
: Timer(aInstance, aHandler, aOwner)
TimerMilli(Instance &aInstance, Handler aHandler)
: Timer(aInstance, aHandler)
{
}
@@ -231,7 +228,7 @@ public:
*
*/
TimerMilliContext(Instance &aInstance, Handler aHandler, void *aContext)
: TimerMilli(aInstance, aHandler, aContext)
: TimerMilli(aInstance, aHandler)
, mContext(aContext)
{
}
@@ -375,11 +372,10 @@ public:
*
* @param[in] aInstance A reference to the OpenThread instance.
* @param[in] aHandler A pointer to a function that is called when the timer expires.
* @param[in] aOwner A pointer to owner of the `TimerMicro` object.
*
*/
TimerMicro(Instance &aInstance, Handler aHandler, void *aOwner)
: Timer(aInstance, aHandler, aOwner)
TimerMicro(Instance &aInstance, Handler aHandler)
: Timer(aInstance, aHandler)
{
}
src/core/common/trickle_timer.cpp
+2 -3
View File
@@ -44,9 +44,8 @@ TrickleTimer::TrickleTimer(Instance &aInstance,
uint32_t aRedundancyConstant,
#endif
Handler aTransmitHandler,
Handler aIntervalExpiredHandler,
void * aOwner)
: TimerMilli(aInstance, TrickleTimer::HandleTimer, aOwner)
Handler aIntervalExpiredHandler)
: TimerMilli(aInstance, TrickleTimer::HandleTimer)
#ifdef ENABLE_TRICKLE_TIMER_SUPPRESSION_SUPPORT
, mRedundancyConstant(aRedundancyConstant)
, mCounter(0)
src/core/common/trickle_timer.hpp
+1 -3
View File
@@ -86,7 +86,6 @@ public:
* @param[in] aRedundancyConstant The redundancy constant for the timer, also known as `k`.
* @param[in] aTransmitHandler A pointer to a function that is called when transmission should occur.
* @param[in] aIntervalExpiredHandler An optional pointer to a function that is called when the interval expires.
* @param[in] aOwner A pointer to owner of the `TrickleTimer` object.
*
*/
TrickleTimer(Instance &aInstance,
@@ -94,8 +93,7 @@ public:
uint32_t aRedundancyConstant,
#endif
Handler aTransmitHandler,
Handler aIntervalExpiredHandler,
void * aOwner);
Handler aIntervalExpiredHandler);
/**
* This method indicates whether or not the trickle timer instance is running.
src/core/mac/data_poll_sender.cpp
+2 -2
View File
@@ -52,7 +52,7 @@ DataPollSender::DataPollSender(Instance &aInstance)
, mPollPeriod(0)
, mExternalPollPeriod(0)
, mFastPollsUsers(0)
, mTimer(aInstance, DataPollSender::HandlePollTimer, this)
, mTimer(aInstance, DataPollSender::HandlePollTimer)
, mEnabled(false)
, mAttachMode(false)
, mRetxMode(false)
@@ -499,7 +499,7 @@ uint32_t DataPollSender::CalculatePollPeriod(void) const
void DataPollSender::HandlePollTimer(Timer &aTimer)
{
IgnoreError(aTimer.GetOwner<DataPollSender>().SendDataPoll());
IgnoreError(aTimer.Get<DataPollSender>().SendDataPoll());
}
uint32_t DataPollSender::GetDefaultPollPeriod(void) const
src/core/mac/mac.cpp
+4 -4
View File
@@ -115,8 +115,8 @@ Mac::Mac(Instance &aInstance)
, mActiveScanHandler(nullptr) // Initialize `mActiveScanHandler` and `mEnergyScanHandler` union
, mScanHandlerContext(nullptr)
, mLinks(aInstance)
, mOperationTask(aInstance, Mac::HandleOperationTask, this)
, mTimer(aInstance, Mac::HandleTimer, this)
, mOperationTask(aInstance, Mac::HandleOperationTask)
, mTimer(aInstance, Mac::HandleTimer)
, mOobFrame(nullptr)
, mKeyIdMode2FrameCounter(0)
, mCcaSampleCount(0)
@@ -755,7 +755,7 @@ void Mac::StartOperation(Operation aOperation)
void Mac::HandleOperationTask(Tasklet &aTasklet)
{
aTasklet.GetOwner<Mac>().PerformNextOperation();
aTasklet.Get<Mac>().PerformNextOperation();
}
void Mac::PerformNextOperation(void)
@@ -1681,7 +1681,7 @@ exit:
void Mac::HandleTimer(Timer &aTimer)
{
aTimer.GetOwner<Mac>().HandleTimer();
aTimer.Get<Mac>().HandleTimer();
}
void Mac::HandleTimer(void)
src/core/mac/sub_mac.cpp
+4 -4
View File
@@ -65,14 +65,14 @@ SubMac::SubMac(Instance &aInstance)
, mPcapCallbackContext(nullptr)
, mFrameCounter(0)
, mKeyId(0)
, mTimer(aInstance, SubMac::HandleTimer, this)
, mTimer(aInstance, SubMac::HandleTimer)
#if OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE
, mCslTimeout(OPENTHREAD_CONFIG_CSL_TIMEOUT)
, mCslPeriod(0)
, mCslChannel(0)
, mIsCslChannelSpecified(false)
, mCslState(kCslIdle)
, mCslTimer(aInstance, SubMac::HandleCslTimer, this)
, mCslTimer(aInstance, SubMac::HandleCslTimer)
#endif
{
mExtAddress.Clear();
@@ -657,7 +657,7 @@ void SubMac::HandleEnergyScanDone(int8_t aMaxRssi)
void SubMac::HandleTimer(Timer &aTimer)
{
aTimer.GetOwner<SubMac>().HandleTimer();
aTimer.Get<SubMac>().HandleTimer();
}
void SubMac::HandleTimer(void)
@@ -971,7 +971,7 @@ void SubMac::SetCslTimeout(uint32_t aTimeout)
void SubMac::HandleCslTimer(Timer &aTimer)
{
aTimer.GetOwner<SubMac>().HandleCslTimer();
aTimer.Get<SubMac>().HandleCslTimer();
}
void SubMac::HandleCslTimer(void)
src/core/meshcop/border_agent.cpp
+2 -2
View File
@@ -284,7 +284,7 @@ BorderAgent::BorderAgent(Instance &aInstance)
, mPendingSet(UriPath::kPendingSet, BorderAgent::HandleRequest<&BorderAgent::mPendingSet>, this)
, mProxyTransmit(UriPath::kProxyTx, BorderAgent::HandleRequest<&BorderAgent::mProxyTransmit>, this)
, mUdpReceiver(BorderAgent::HandleUdpReceive, this)
, mTimer(aInstance, HandleTimeout, this)
, mTimer(aInstance, HandleTimeout)
, mState(kStateStopped)
{
mCommissionerAloc.InitAsThreadOriginRealmLocalScope();
@@ -594,7 +594,7 @@ exit:
void BorderAgent::HandleTimeout(Timer &aTimer)
{
aTimer.GetOwner<BorderAgent>().HandleTimeout();
aTimer.Get<BorderAgent>().HandleTimeout();
}
void BorderAgent::HandleTimeout(void)
src/core/meshcop/commissioner.cpp
+4 -4
View File
@@ -62,8 +62,8 @@ Commissioner::Commissioner(Instance &aInstance)
, mJoinerRloc(0)
, mSessionId(0)
, mTransmitAttempts(0)
, mJoinerExpirationTimer(aInstance, HandleJoinerExpirationTimer, this)
, mTimer(aInstance, HandleTimer, this)
, mJoinerExpirationTimer(aInstance, HandleJoinerExpirationTimer)
, mTimer(aInstance, HandleTimer)
, mRelayReceive(UriPath::kRelayRx, &Commissioner::HandleRelayReceive, this)
, mDatasetChanged(UriPath::kDatasetChanged, &Commissioner::HandleDatasetChanged, this)
, mJoinerFinalize(UriPath::kJoinerFinalize, &Commissioner::HandleJoinerFinalize, this)
@@ -605,7 +605,7 @@ exit:
void Commissioner::HandleTimer(Timer &aTimer)
{
aTimer.GetOwner<Commissioner>().HandleTimer();
aTimer.Get<Commissioner>().HandleTimer();
}
void Commissioner::HandleTimer(void)
@@ -627,7 +627,7 @@ void Commissioner::HandleTimer(void)
void Commissioner::HandleJoinerExpirationTimer(Timer &aTimer)
{
aTimer.GetOwner<Commissioner>().HandleJoinerExpirationTimer();
aTimer.Get<Commissioner>().HandleJoinerExpirationTimer();
}
void Commissioner::HandleJoinerExpirationTimer(void)
src/core/meshcop/dataset_manager.cpp
+5 -5
View File
@@ -55,7 +55,7 @@ DatasetManager::DatasetManager(Instance &aInstance, Dataset::Type aType, Timer::
, mLocal(aInstance, aType)
, mTimestampValid(false)
, mCoapPending(false)
, mTimer(aInstance, aTimerHandler, this)
, mTimer(aInstance, aTimerHandler)
{
mTimestamp.Init();
}
@@ -694,12 +694,12 @@ void ActiveDataset::HandleGet(Coap::Message &aMessage, const Ip6::MessageInfo &a
void ActiveDataset::HandleTimer(Timer &aTimer)
{
aTimer.GetOwner<ActiveDataset>().HandleTimer();
aTimer.Get<ActiveDataset>().HandleTimer();
}
PendingDataset::PendingDataset(Instance &aInstance)
: DatasetManager(aInstance, Dataset::kPending, PendingDataset::HandleTimer)
, mDelayTimer(aInstance, PendingDataset::HandleDelayTimer, this)
, mDelayTimer(aInstance, PendingDataset::HandleDelayTimer)
, mResourceGet(UriPath::kPendingGet, &PendingDataset::HandleGet, this)
#if OPENTHREAD_FTD
, mResourceSet(UriPath::kPendingSet, &PendingDataset::HandleSet, this)
@@ -785,7 +785,7 @@ void PendingDataset::StartDelayTimer(void)
void PendingDataset::HandleDelayTimer(Timer &aTimer)
{
aTimer.GetOwner<PendingDataset>().HandleDelayTimer();
aTimer.Get<PendingDataset>().HandleDelayTimer();
}
void PendingDataset::HandleDelayTimer(void)
@@ -834,7 +834,7 @@ void PendingDataset::HandleGet(Coap::Message &aMessage, const Ip6::MessageInfo &
void PendingDataset::HandleTimer(Timer &aTimer)
{
aTimer.GetOwner<PendingDataset>().HandleTimer();
aTimer.Get<PendingDataset>().HandleTimer();
}
} // namespace MeshCoP
src/core/meshcop/joiner.cpp
+2 -2
View File
@@ -62,7 +62,7 @@ Joiner::Joiner(Instance &aInstance)
, mContext(nullptr)
, mJoinerRouterIndex(0)
, mFinalizeMessage(nullptr)
, mTimer(aInstance, Joiner::HandleTimer, this)
, mTimer(aInstance, Joiner::HandleTimer)
, mJoinerEntrust(UriPath::kJoinerEntrust, &Joiner::HandleJoinerEntrust, this)
{
SetIdFromIeeeEui64();
@@ -615,7 +615,7 @@ exit:
void Joiner::HandleTimer(Timer &aTimer)
{
aTimer.GetOwner<Joiner>().HandleTimer();
aTimer.Get<Joiner>().HandleTimer();
}
void Joiner::HandleTimer(void)
src/core/meshcop/joiner_router.cpp
+2 -2
View File
@@ -55,7 +55,7 @@ JoinerRouter::JoinerRouter(Instance &aInstance)
: InstanceLocator(aInstance)
, mSocket(aInstance)
, mRelayTransmit(UriPath::kRelayTx, &JoinerRouter::HandleRelayTransmit, this)
, mTimer(aInstance, JoinerRouter::HandleTimer, this)
, mTimer(aInstance, JoinerRouter::HandleTimer)
, mJoinerUdpPort(0)
, mIsJoinerPortConfigured(false)
{
@@ -249,7 +249,7 @@ exit:
void JoinerRouter::HandleTimer(Timer &aTimer)
{
aTimer.GetOwner<JoinerRouter>().HandleTimer();
aTimer.Get<JoinerRouter>().HandleTimer();
}
void JoinerRouter::HandleTimer(void)
src/core/meshcop/meshcop_leader.cpp
+2 -2
View File
@@ -56,7 +56,7 @@ Leader::Leader(Instance &aInstance)
: InstanceLocator(aInstance)
, mPetition(UriPath::kLeaderPetition, Leader::HandlePetition, this)
, mKeepAlive(UriPath::kLeaderKeepAlive, Leader::HandleKeepAlive, this)
, mTimer(aInstance, HandleTimer, this)
, mTimer(aInstance, HandleTimer)
, mDelayTimerMinimal(DelayTimerTlv::kDelayTimerMinimal)
, mSessionId(Random::NonCrypto::GetUint16())
{
@@ -266,7 +266,7 @@ uint32_t Leader::GetDelayTimerMinimal(void) const
void Leader::HandleTimer(Timer &aTimer)
{
aTimer.GetOwner<Leader>().HandleTimer();
aTimer.Get<Leader>().HandleTimer();
}
void Leader::HandleTimer(void)
src/core/net/dhcp6_client.cpp
+2 -2
View File
@@ -50,7 +50,7 @@ namespace Dhcp6 {
Client::Client(Instance &aInstance)
: InstanceLocator(aInstance)
, mSocket(aInstance)
, mTrickleTimer(aInstance, Client::HandleTrickleTimer, nullptr, this)
, mTrickleTimer(aInstance, Client::HandleTrickleTimer, nullptr)
, mStartTime(0)
, mIdentityAssociationCurrent(nullptr)
{
@@ -216,7 +216,7 @@ exit:
bool Client::HandleTrickleTimer(TrickleTimer &aTrickleTimer)
{
return aTrickleTimer.GetOwner<Client>().HandleTrickleTimer();
return aTrickleTimer.Get<Client>().HandleTrickleTimer();
}
bool Client::HandleTrickleTimer(void)
src/core/net/dns_client.cpp
+2 -2
View File
@@ -50,7 +50,7 @@ namespace Dns {
Client::Client(Instance &aInstance)
: mSocket(aInstance)
, mRetransmissionTimer(aInstance, Client::HandleRetransmissionTimer, this)
, mRetransmissionTimer(aInstance, Client::HandleRetransmissionTimer)
{
}
@@ -270,7 +270,7 @@ void Client::FinalizeDnsTransaction(Message & aQuery,
void Client::HandleRetransmissionTimer(Timer &aTimer)
{
aTimer.GetOwner<Client>().HandleRetransmissionTimer();
aTimer.Get<Client>().HandleRetransmissionTimer();
}
void Client::HandleRetransmissionTimer(void)
src/core/net/ip6.cpp
+2 -2
View File
@@ -67,7 +67,7 @@ Ip6::Ip6(Instance &aInstance)
, mIsReceiveIp6FilterEnabled(false)
, mReceiveIp6DatagramCallback(nullptr)
, mReceiveIp6DatagramCallbackContext(nullptr)
, mSendQueueTask(aInstance, Ip6::HandleSendQueue, this)
, mSendQueueTask(aInstance, Ip6::HandleSendQueue)
, mIcmp(aInstance)
, mUdp(aInstance)
, mMpl(aInstance)
@@ -525,7 +525,7 @@ exit:
void Ip6::HandleSendQueue(Tasklet &aTasklet)
{
aTasklet.GetOwner<Ip6>().HandleSendQueue();
aTasklet.Get<Ip6>().HandleSendQueue();
}
void Ip6::HandleSendQueue(void)
src/core/net/ip6_mpl.cpp
+4 -4
View File
@@ -46,11 +46,11 @@ namespace Ip6 {
Mpl::Mpl(Instance &aInstance)
: InstanceLocator(aInstance)
, mMatchingAddress(nullptr)
, mSeedSetTimer(aInstance, Mpl::HandleSeedSetTimer, this)
, mSeedSetTimer(aInstance, Mpl::HandleSeedSetTimer)
, mSeedId(0)
, mSequence(0)
#if OPENTHREAD_FTD
, mRetransmissionTimer(aInstance, Mpl::HandleRetransmissionTimer, this)
, mRetransmissionTimer(aInstance, Mpl::HandleRetransmissionTimer)
, mTimerExpirations(0)
#endif
{
@@ -264,7 +264,7 @@ exit:
void Mpl::HandleSeedSetTimer(Timer &aTimer)
{
aTimer.GetOwner<Mpl>().HandleSeedSetTimer();
aTimer.Get<Mpl>().HandleSeedSetTimer();
}
void Mpl::HandleSeedSetTimer(void)
@@ -337,7 +337,7 @@ exit:
void Mpl::HandleRetransmissionTimer(Timer &aTimer)
{
aTimer.GetOwner<Mpl>().HandleRetransmissionTimer();
aTimer.Get<Mpl>().HandleRetransmissionTimer();
}
void Mpl::HandleRetransmissionTimer(void)
src/core/net/sntp_client.cpp
+2 -2
View File
@@ -92,7 +92,7 @@ QueryMetadata::QueryMetadata(otSntpResponseHandler aHandler, void *aContext)
Client::Client(Instance &aInstance)
: mSocket(aInstance)
, mRetransmissionTimer(aInstance, Client::HandleRetransmissionTimer, this)
, mRetransmissionTimer(aInstance, Client::HandleRetransmissionTimer)
, mUnixEra(0)
{
}
@@ -280,7 +280,7 @@ void Client::FinalizeSntpTransaction(Message & aQuery,
void Client::HandleRetransmissionTimer(Timer &aTimer)
{
aTimer.GetOwner<Client>().HandleRetransmissionTimer();
aTimer.Get<Client>().HandleRetransmissionTimer();
}
void Client::HandleRetransmissionTimer(void)
src/core/net/srp_client.cpp
+2 -2
View File
@@ -144,7 +144,7 @@ Client::Client(Instance &aInstance)
, mCallback(nullptr)
, mCallbackContext(nullptr)
, mDomainName(kDefaultDomainName)
, mTimer(aInstance, Client::HandleTimer, this)
, mTimer(aInstance, Client::HandleTimer)
{
mHostInfo.Init();
@@ -1399,7 +1399,7 @@ bool Client::ShouldRenewEarly(const Service &aService) const
void Client::HandleTimer(Timer &aTimer)
{
aTimer.GetOwner<Client>().HandleTimer();
aTimer.Get<Client>().HandleTimer();
}
void Client::HandleTimer(void)
src/core/net/srp_server.cpp
+4 -4
View File
@@ -85,8 +85,8 @@ Server::Server(Instance &aInstance)
, mMaxLease(kDefaultMaxLease)
, mMinKeyLease(kDefaultMinKeyLease)
, mMaxKeyLease(kDefaultMaxKeyLease)
, mLeaseTimer(aInstance, HandleLeaseTimer, this)
, mOutstandingUpdatesTimer(aInstance, HandleOutstandingUpdatesTimer, this)
, mLeaseTimer(aInstance, HandleLeaseTimer)
, mOutstandingUpdatesTimer(aInstance, HandleOutstandingUpdatesTimer)
, mEnabled(false)
{
IgnoreError(SetDomain(kDefaultDomain));
@@ -1130,7 +1130,7 @@ exit:
void Server::HandleLeaseTimer(Timer &aTimer)
{
aTimer.GetOwner<Server>().HandleLeaseTimer();
aTimer.Get<Server>().HandleLeaseTimer();
}
void Server::HandleLeaseTimer(void)
@@ -1250,7 +1250,7 @@ void Server::HandleLeaseTimer(void)
void Server::HandleOutstandingUpdatesTimer(Timer &aTimer)
{
aTimer.GetOwner<Server>().HandleOutstandingUpdatesTimer();
aTimer.Get<Server>().HandleOutstandingUpdatesTimer();
}
void Server::HandleOutstandingUpdatesTimer(void)
src/core/radio/trel_link.cpp
+4 -4
View File
@@ -49,8 +49,8 @@ Link::Link(Instance &aInstance)
, mRxChannel(0)
, mPanId(Mac::kPanIdBroadcast)
, mTxPacketNumber(0)
, mTxTasklet(aInstance, HandleTxTasklet, this)
, mTimer(aInstance, HandleTimer, this)
, mTxTasklet(aInstance, HandleTxTasklet)
, mTimer(aInstance, HandleTimer)
, mInterface(aInstance)
{
memset(&mTxFrame, 0, sizeof(mTxFrame));
@@ -115,7 +115,7 @@ void Link::Send(void)
void Link::HandleTxTasklet(Tasklet &aTasklet)
{
aTasklet.GetOwner<Link>().HandleTxTasklet();
aTasklet.Get<Link>().HandleTxTasklet();
}
void Link::HandleTxTasklet(void)
@@ -248,7 +248,7 @@ void Link::InvokeSendDone(otError aError, Mac::RxFrame *aAckFrame)
void Link::HandleTimer(Timer &aTimer)
{
aTimer.GetOwner<Link>().HandleTimer();
aTimer.Get<Link>().HandleTimer();
}
void Link::HandleTimer(void)
src/core/thread/announce_begin_server.cpp
+1 -1
View File
@@ -92,7 +92,7 @@ exit:
void AnnounceBeginServer::HandleTimer(Timer &aTimer)
{
aTimer.GetOwner<AnnounceBeginServer>().AnnounceSenderBase::HandleTimer();
aTimer.Get<AnnounceBeginServer>().AnnounceSenderBase::HandleTimer();
}
} // namespace ot
src/core/thread/announce_sender.cpp
+2 -2
View File
@@ -52,7 +52,7 @@ AnnounceSenderBase::AnnounceSenderBase(Instance &aInstance, Timer::Handler aHand
, mJitter(0)
, mCount(0)
, mChannel(0)
, mTimer(aInstance, aHandler, this)
, mTimer(aInstance, aHandler)
{
}
@@ -116,7 +116,7 @@ AnnounceSender::AnnounceSender(Instance &aInstance)
void AnnounceSender::HandleTimer(Timer &aTimer)
{
aTimer.GetOwner<AnnounceSender>().AnnounceSenderBase::HandleTimer();
aTimer.Get<AnnounceSender>().AnnounceSenderBase::HandleTimer();
}
void AnnounceSender::CheckState(void)
src/core/thread/discover_scanner.cpp
+2 -2
View File
@@ -48,7 +48,7 @@ DiscoverScanner::DiscoverScanner(Instance &aInstance)
: InstanceLocator(aInstance)
, mHandler(nullptr)
, mHandlerContext(nullptr)
, mTimer(aInstance, DiscoverScanner::HandleTimer, this)
, mTimer(aInstance, DiscoverScanner::HandleTimer)
, mFilterIndexes()
, mState(kStateIdle)
, mScanChannel(0)
@@ -258,7 +258,7 @@ void DiscoverScanner::HandleDiscoverComplete(void)
void DiscoverScanner::HandleTimer(Timer &aTimer)
{
aTimer.GetOwner<DiscoverScanner>().HandleTimer();
aTimer.Get<DiscoverScanner>().HandleTimer();
}
void DiscoverScanner::HandleTimer(void)
src/core/thread/dua_manager.cpp
+6 -1
View File
@@ -51,7 +51,7 @@ namespace ot {
DuaManager::DuaManager(Instance &aInstance)
: InstanceLocator(aInstance)
, mRegistrationTask(aInstance, DuaManager::HandleRegistrationTask, this)
, mRegistrationTask(aInstance, DuaManager::HandleRegistrationTask)
, mDuaNotification(UriPath::kDuaRegistrationNotify, &DuaManager::HandleDuaNotification, this)
, mIsDuaPending(false)
#if OPENTHREAD_CONFIG_DUA_ENABLE
@@ -396,6 +396,11 @@ void DuaManager::HandleTimeTick(void)
UpdateTimeTickerRegistration();
}
void DuaManager::HandleRegistrationTask(Tasklet &aTasklet)
{
aTasklet.Get<DuaManager>().PerformNextRegistration();
}
void DuaManager::UpdateTimeTickerRegistration(void)
{
if (mDelay.mValue == 0)
src/core/thread/dua_manager.hpp
+1 -1
View File
@@ -190,7 +190,7 @@ private:
void HandleTimeTick(void);
static void HandleRegistrationTask(Tasklet &aTasklet) { aTasklet.GetOwner<DuaManager>().PerformNextRegistration(); }
static void HandleRegistrationTask(Tasklet &aTasklet);
void UpdateTimeTickerRegistration(void);
src/core/thread/energy_scan_server.cpp
+2 -2
View File
@@ -55,7 +55,7 @@ EnergyScanServer::EnergyScanServer(Instance &aInstance)
, mCount(0)
, mActive(false)
, mScanResultsLength(0)
, mTimer(aInstance, EnergyScanServer::HandleTimer, this)
, mTimer(aInstance, EnergyScanServer::HandleTimer)
, mEnergyScan(UriPath::kEnergyScan, &EnergyScanServer::HandleRequest, this)
{
Get<Tmf::TmfAgent>().AddResource(mEnergyScan);
@@ -106,7 +106,7 @@ exit:
void EnergyScanServer::HandleTimer(Timer &aTimer)
{
aTimer.GetOwner<EnergyScanServer>().HandleTimer();
aTimer.Get<EnergyScanServer>().HandleTimer();
}
void EnergyScanServer::HandleTimer(void)
src/core/thread/key_manager.cpp
+2 -2
View File
@@ -66,7 +66,7 @@ KeyManager::KeyManager(Instance &aInstance)
, mKeyRotationTime(kDefaultKeyRotationTime)
, mKeySwitchGuardTime(kDefaultKeySwitchGuardTime)
, mKeySwitchGuardEnabled(false)
, mKeyRotationTimer(aInstance, KeyManager::HandleKeyRotationTimer, this)
, mKeyRotationTimer(aInstance, KeyManager::HandleKeyRotationTimer)
, mKekFrameCounter(0)
, mSecurityPolicyFlags(kDefaultSecurityPolicyFlags)
, mIsPskcSet(false)
@@ -323,7 +323,7 @@ void KeyManager::StartKeyRotationTimer(void)
void KeyManager::HandleKeyRotationTimer(Timer &aTimer)
{
aTimer.GetOwner<KeyManager>().HandleKeyRotationTimer();
aTimer.Get<KeyManager>().HandleKeyRotationTimer();
}
void KeyManager::HandleKeyRotationTimer(void)
src/core/thread/mesh_forwarder.cpp
+2 -2
View File
@@ -89,7 +89,7 @@ MeshForwarder::MeshForwarder(Instance &aInstance)
, mEnabled(false)
, mTxPaused(false)
, mSendBusy(false)
, mScheduleTransmissionTask(aInstance, MeshForwarder::ScheduleTransmissionTask, this)
, mScheduleTransmissionTask(aInstance, MeshForwarder::ScheduleTransmissionTask)
#if OPENTHREAD_FTD
, mIndirectSender(aInstance)
#endif
@@ -229,7 +229,7 @@ void MeshForwarder::ResumeMessageTransmissions(void)
void MeshForwarder::ScheduleTransmissionTask(Tasklet &aTasklet)
{
aTasklet.GetOwner<MeshForwarder>().ScheduleTransmissionTask();
aTasklet.Get<MeshForwarder>().ScheduleTransmissionTask();
}
void MeshForwarder::ScheduleTransmissionTask(void)
src/core/thread/mle.cpp
+8 -8
View File
@@ -71,9 +71,9 @@ Mle::Mle(Instance &aInstance)
, mReattachState(kReattachStop)
, mAttachCounter(0)
, mAnnounceDelay(kAnnounceTimeout)
, mAttachTimer(aInstance, Mle::HandleAttachTimer, this)
, mDelayedResponseTimer(aInstance, Mle::HandleDelayedResponseTimer, this)
, mMessageTransmissionTimer(aInstance, Mle::HandleMessageTransmissionTimer, this)
, mAttachTimer(aInstance, Mle::HandleAttachTimer)
, mDelayedResponseTimer(aInstance, Mle::HandleDelayedResponseTimer)
, mMessageTransmissionTimer(aInstance, Mle::HandleMessageTransmissionTimer)
, mParentLeaderCost(0)
, mParentRequestMode(kAttachAny)
, mParentPriority(0)
@@ -101,7 +101,7 @@ Mle::Mle(Instance &aInstance)
, mParentSearchBackoffWasCanceled(false)
, mParentSearchRecentlyDetached(false)
, mParentSearchBackoffCancelTime(0)
, mParentSearchTimer(aInstance, Mle::HandleParentSearchTimer, this)
, mParentSearchTimer(aInstance, Mle::HandleParentSearchTimer)
#endif
, mAnnounceChannel(0)
, mAlternateChannel(0)
@@ -1622,7 +1622,7 @@ exit:
void Mle::HandleAttachTimer(Timer &aTimer)
{
aTimer.GetOwner<Mle>().HandleAttachTimer();
aTimer.Get<Mle>().HandleAttachTimer();
}
void Mle::HandleAttachTimer(void)
@@ -1858,7 +1858,7 @@ exit:
void Mle::HandleDelayedResponseTimer(Timer &aTimer)
{
aTimer.GetOwner<Mle>().HandleDelayedResponseTimer();
aTimer.Get<Mle>().HandleDelayedResponseTimer();
}
void Mle::HandleDelayedResponseTimer(void)
@@ -2174,7 +2174,7 @@ exit:
void Mle::HandleMessageTransmissionTimer(Timer &aTimer)
{
aTimer.GetOwner<Mle>().HandleMessageTransmissionTimer();
aTimer.Get<Mle>().HandleMessageTransmissionTimer();
}
void Mle::HandleMessageTransmissionTimer(void)
@@ -3964,7 +3964,7 @@ exit:
#if OPENTHREAD_CONFIG_PARENT_SEARCH_ENABLE
void Mle::HandleParentSearchTimer(Timer &aTimer)
{
aTimer.GetOwner<Mle>().HandleParentSearchTimer();
aTimer.Get<Mle>().HandleParentSearchTimer();
}
void Mle::HandleParentSearchTimer(void)
src/core/thread/mle_router.cpp
+2 -2
View File
@@ -56,7 +56,7 @@ namespace Mle {
MleRouter::MleRouter(Instance &aInstance)
: Mle(aInstance)
, mAdvertiseTimer(aInstance, MleRouter::HandleAdvertiseTimer, nullptr, this)
, mAdvertiseTimer(aInstance, MleRouter::HandleAdvertiseTimer, nullptr)
, mAddressSolicit(UriPath::kAddressSolicit, &MleRouter::HandleAddressSolicit, this)
, mAddressRelease(UriPath::kAddressRelease, &MleRouter::HandleAddressRelease, this)
, mChildTable(aInstance)
@@ -388,7 +388,7 @@ void MleRouter::SetStateLeader(uint16_t aRloc16)
bool MleRouter::HandleAdvertiseTimer(TrickleTimer &aTimer)
{
return aTimer.GetOwner<MleRouter>().HandleAdvertiseTimer();
return aTimer.Get<MleRouter>().HandleAdvertiseTimer();
}
bool MleRouter::HandleAdvertiseTimer(void)
src/core/thread/network_data_leader_ftd.cpp
+2 -2
View File
@@ -57,7 +57,7 @@ namespace NetworkData {
Leader::Leader(Instance &aInstance)
: LeaderBase(aInstance)
, mTimer(aInstance, Leader::HandleTimer, this)
, mTimer(aInstance, Leader::HandleTimer)
, mServerData(UriPath::kServerData, &Leader::HandleServerData, this)
, mCommissioningDataGet(UriPath::kCommissionerGet, &Leader::HandleCommissioningGet, this)
, mCommissioningDataSet(UriPath::kCommissionerSet, &Leader::HandleCommissioningSet, this)
@@ -1331,7 +1331,7 @@ void Leader::UpdateContextsAfterReset(void)
void Leader::HandleTimer(Timer &aTimer)
{
aTimer.GetOwner<Leader>().HandleTimer();
aTimer.Get<Leader>().HandleTimer();
}
void Leader::HandleTimer(void)
src/core/thread/network_data_notifier.cpp
+2 -2
View File
@@ -46,7 +46,7 @@ namespace NetworkData {
Notifier::Notifier(Instance &aInstance)
: InstanceLocator(aInstance)
, mTimer(aInstance, Notifier::HandleTimer, this)
, mTimer(aInstance, Notifier::HandleTimer)
, mNextDelay(0)
, mWaitingForResponse(false)
{
@@ -115,7 +115,7 @@ void Notifier::HandleNotifierEvents(Events aEvents)
void Notifier::HandleTimer(Timer &aTimer)
{
aTimer.GetOwner<Notifier>().HandleTimer();
aTimer.Get<Notifier>().HandleTimer();
}
void Notifier::HandleTimer(void)
src/core/thread/panid_query_server.cpp
+2 -2
View File
@@ -50,7 +50,7 @@ PanIdQueryServer::PanIdQueryServer(Instance &aInstance)
: InstanceLocator(aInstance)
, mChannelMask(0)
, mPanId(Mac::kPanIdBroadcast)
, mTimer(aInstance, PanIdQueryServer::HandleTimer, this)
, mTimer(aInstance, PanIdQueryServer::HandleTimer)
, mPanIdQuery(UriPath::kPanIdQuery, &PanIdQueryServer::HandleQuery, this)
{
Get<Tmf::TmfAgent>().AddResource(mPanIdQuery);
@@ -140,7 +140,7 @@ exit:
void PanIdQueryServer::HandleTimer(Timer &aTimer)
{
aTimer.GetOwner<PanIdQueryServer>().HandleTimer();
aTimer.Get<PanIdQueryServer>().HandleTimer();
}
void PanIdQueryServer::HandleTimer(void)
src/core/thread/time_sync_service.cpp
+2 -2
View File
@@ -62,7 +62,7 @@ TimeSync::TimeSync(Instance &aInstance)
, mNetworkTimeOffset(0)
, mTimeSyncCallback(nullptr)
, mTimeSyncCallbackContext(nullptr)
, mTimer(aInstance, HandleTimeout, this)
, mTimer(aInstance, HandleTimeout)
, mCurrentStatus(OT_NETWORK_TIME_UNSYNCHRONIZED)
{
CheckAndHandleChanges(false);
@@ -210,7 +210,7 @@ void TimeSync::HandleTimeout(void)
void TimeSync::HandleTimeout(Timer &aTimer)
{
aTimer.GetOwner<TimeSync>().HandleTimeout();
aTimer.Get<TimeSync>().HandleTimeout();
}
void TimeSync::CheckAndHandleChanges(bool aTimeUpdated)
src/core/utils/channel_manager.cpp
+2 -2
View File
@@ -54,7 +54,7 @@ ChannelManager::ChannelManager(Instance &aInstance)
, mDelay(kMinimumDelay)
, mChannel(0)
, mState(kStateIdle)
, mTimer(aInstance, ChannelManager::HandleTimer, this)
, mTimer(aInstance, ChannelManager::HandleTimer)
, mAutoSelectInterval(kDefaultAutoSelectInterval)
, mAutoSelectEnabled(false)
{
@@ -153,7 +153,7 @@ void ChannelManager::HandleDatasetUpdateDone(otError aError)
void ChannelManager::HandleTimer(Timer &aTimer)
{
aTimer.GetOwner<ChannelManager>().HandleTimer();
aTimer.Get<ChannelManager>().HandleTimer();
}
void ChannelManager::HandleTimer(void)
src/core/utils/channel_monitor.cpp
+2 -2
View File
@@ -62,7 +62,7 @@ ChannelMonitor::ChannelMonitor(Instance &aInstance)
: InstanceLocator(aInstance)
, mChannelMaskIndex(0)
, mSampleCount(0)
, mTimer(aInstance, ChannelMonitor::HandleTimer, this)
, mTimer(aInstance, ChannelMonitor::HandleTimer)
{
memset(mChannelOccupancy, 0, sizeof(mChannelOccupancy));
}
@@ -114,7 +114,7 @@ exit:
void ChannelMonitor::HandleTimer(Timer &aTimer)
{
aTimer.GetOwner<ChannelMonitor>().HandleTimer();
aTimer.Get<ChannelMonitor>().HandleTimer();
}
void ChannelMonitor::HandleTimer(void)
src/core/utils/child_supervision.cpp
+2 -2
View File
@@ -155,7 +155,7 @@ void ChildSupervisor::HandleNotifierEvents(Events aEvents)
SupervisionListener::SupervisionListener(Instance &aInstance)
: InstanceLocator(aInstance)
, mTimeout(0)
, mTimer(aInstance, SupervisionListener::HandleTimer, this)
, mTimer(aInstance, SupervisionListener::HandleTimer)
{
SetTimeout(kDefaultTimeout);
}
@@ -206,7 +206,7 @@ void SupervisionListener::RestartTimer(void)
void SupervisionListener::HandleTimer(Timer &aTimer)
{
aTimer.GetOwner<SupervisionListener>().HandleTimer();
aTimer.Get<SupervisionListener>().HandleTimer();
}
void SupervisionListener::HandleTimer(void)
src/core/utils/dataset_updater.cpp
+2 -2
View File
@@ -51,7 +51,7 @@ DatasetUpdater::DatasetUpdater(Instance &aInstance)
, mWaitInterval(kWaitInterval)
, mCallback(nullptr)
, mCallbackContext(nullptr)
, mTimer(aInstance, DatasetUpdater::HandleTimer, this)
, mTimer(aInstance, DatasetUpdater::HandleTimer)
, mDataset(nullptr)
{
}
@@ -100,7 +100,7 @@ void DatasetUpdater::CancelUpdate(void)
void DatasetUpdater::HandleTimer(Timer &aTimer)
{
aTimer.GetOwner<DatasetUpdater>().HandleTimer();
aTimer.Get<DatasetUpdater>().HandleTimer();
}
void DatasetUpdater::HandleTimer(void)
src/core/utils/jam_detector.cpp
+2 -2
View File
@@ -49,7 +49,7 @@ JamDetector::JamDetector(Instance &aInstance)
: InstanceLocator(aInstance)
, mHandler(nullptr)
, mContext(nullptr)
, mTimer(aInstance, JamDetector::HandleTimer, this)
, mTimer(aInstance, JamDetector::HandleTimer)
, mHistoryBitmap(0)
, mCurSecondStartTime(0)
, mSampleInterval(0)
@@ -161,7 +161,7 @@ exit:
void JamDetector::HandleTimer(Timer &aTimer)
{
aTimer.GetOwner<JamDetector>().HandleTimer();
aTimer.Get<JamDetector>().HandleTimer();
}
void JamDetector::HandleTimer(void)
src/ncp/ncp_base.cpp
+1 -1
View File
@@ -207,7 +207,7 @@ NcpBase::NcpBase(Instance *aInstance)
, mDiscoveryScanJoinerFlag(false)
, mDiscoveryScanEnableFiltering(false)
, mDiscoveryScanPanId(0xffff)
, mUpdateChangedPropsTask(*aInstance, NcpBase::UpdateChangedProps, this)
, mUpdateChangedPropsTask(*aInstance, NcpBase::UpdateChangedProps)
, mThreadChangedFlags(0)
, mHostPowerState(SPINEL_HOST_POWER_STATE_ONLINE)
, mHostPowerReplyFrameTag(Spinel::Buffer::kInvalidTag)
src/ncp/ncp_spi.cpp
+1 -1
View File
@@ -82,7 +82,7 @@ NcpSpi::NcpSpi(Instance *aInstance)
, mTxState(kTxStateIdle)
, mHandlingRxFrame(false)
, mResetFlag(true)
, mPrepareTxFrameTask(*aInstance, NcpSpi::PrepareTxFrame, this)
, mPrepareTxFrameTask(*aInstance, NcpSpi::PrepareTxFrame)
, mSendFrameLength(0)
{
SpiFrame sendFrame(mSendFrame);
src/ncp/ncp_uart.cpp
+1 -1
View File
@@ -87,7 +87,7 @@ NcpUart::NcpUart(Instance *aInstance)
, mState(kStartingFrame)
, mByte(0)
, mUartSendImmediate(false)
, mUartSendTask(*aInstance, EncodeAndSendToUart, this)
, mUartSendTask(*aInstance, EncodeAndSendToUart)
#if OPENTHREAD_ENABLE_NCP_SPINEL_ENCRYPTER
, mTxFrameBufferEncrypterReader(mTxFrameBuffer)
#endif // OPENTHREAD_ENABLE_NCP_SPINEL_ENCRYPTER
tests/unit/test_timer.cpp
+1 -1
View File
@@ -87,7 +87,7 @@ template <typename TimerType> class TestTimer : public TimerType
{
public:
explicit TestTimer(ot::Instance &aInstance)
: TimerType(aInstance, TestTimer::HandleTimerFired, nullptr)
: TimerType(aInstance, TestTimer::HandleTimerFired)
, mFiredCounter(0)
{
}