espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-09-17 14:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[timer] use function reference (instead of pointer) as timer handler (#5050)

Browse Source
This commit is contained in:
Abtin Keshavarzian
2020-06-05 12:24:28 -07:00
committed by GitHub
parent 82053cc9db
commit 99a42ccadc
31 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cli/cli.cpp
+1 -1
View File
@@ -253,7 +253,7 @@ Interpreter::Interpreter(Instance *aInstance)
, mPingHopLimit(0)
, mPingAllowZeroHopLimit(false)
, mPingIdentifier(0)
, mPingTimer(*aInstance, &Interpreter::HandlePingTimer, this)
, mPingTimer(*aInstance, Interpreter::HandlePingTimer, this)
#if OPENTHREAD_CONFIG_DNS_CLIENT_ENABLE
, mResolvingInProgress(0)
#endif
src/core/coap/coap.cpp
+2 -2
View File
@@ -50,7 +50,7 @@ CoapBase::CoapBase(Instance &aInstance, Sender aSender)
: InstanceLocator(aInstance)
, mPendingRequests()
, mMessageId(Random::NonCrypto::GetUint16())
, mRetransmissionTimer(aInstance, &Coap::HandleRetransmissionTimer, this)
, mRetransmissionTimer(aInstance, Coap::HandleRetransmissionTimer, this)
, mResources()
, mContext(NULL)
, mInterceptor(NULL)
@@ -786,7 +786,7 @@ int CoapBase::Metadata::UpdateIn(Message &aMessage) const
ResponsesQueue::ResponsesQueue(Instance &aInstance)
: mQueue()
, mTimer(aInstance, &ResponsesQueue::HandleTimer, this)
, mTimer(aInstance, ResponsesQueue::HandleTimer, this)
{
}
src/core/common/timer.hpp
+2 -2
View File
@@ -80,12 +80,12 @@ public:
static const uint32_t kMaxDelay = (Time::kMaxDuration >> 1);
/**
* This function pointer is called when the timer expires.
* This type defines a function reference which is invoked when the timer expires.
*
* @param[in] aTimer A reference to the expired timer instance.
*
*/
typedef void (*Handler)(Timer &aTimer);
typedef void (&Handler)(Timer &aTimer);
/**
* This constructor creates a timer instance.
src/core/common/trickle_timer.cpp
+1 -1
View File
@@ -46,7 +46,7 @@ TrickleTimer::TrickleTimer(Instance &aInstance,
Handler aTransmitHandler,
Handler aIntervalExpiredHandler,
void * aOwner)
: TimerMilli(aInstance, &TrickleTimer::HandleTimer, aOwner)
: TimerMilli(aInstance, TrickleTimer::HandleTimer, aOwner)
#ifdef ENABLE_TRICKLE_TIMER_SUPPRESSION_SUPPORT
, mRedundancyConstant(aRedundancyConstant)
, mCounter(0)
src/core/mac/data_poll_sender.cpp
+1 -1
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, this)
, mEnabled(false)
, mAttachMode(false)
, mRetxMode(false)
src/core/mac/mac.cpp
+1 -1
View File
@@ -116,7 +116,7 @@ Mac::Mac(Instance &aInstance)
, mScanHandlerContext(NULL)
, mSubMac(aInstance)
, mOperationTask(aInstance, &Mac::HandleOperationTask, this)
, mTimer(aInstance, &Mac::HandleTimer, this)
, mTimer(aInstance, Mac::HandleTimer, this)
, mOobFrame(NULL)
, mKeyIdMode2FrameCounter(0)
, mCcaSampleCount(0)
src/core/mac/sub_mac.cpp
+1 -1
View File
@@ -61,7 +61,7 @@ SubMac::SubMac(Instance &aInstance)
, mPcapCallbackContext(NULL)
, mFrameCounter(0)
, mKeyId(0)
, mTimer(aInstance, &SubMac::HandleTimer, this)
, mTimer(aInstance, SubMac::HandleTimer, this)
{
mExtAddress.Clear();
mPrevKey.Clear();
src/core/meshcop/dataset_manager.cpp
+3 -3
View File
@@ -707,7 +707,7 @@ ActiveDataset::ActiveDataset(Instance &aInstance)
Dataset::kActive,
OT_URI_PATH_ACTIVE_GET,
OT_URI_PATH_ACTIVE_SET,
&ActiveDataset::HandleTimer)
ActiveDataset::HandleTimer)
, mResourceGet(OT_URI_PATH_ACTIVE_GET, &ActiveDataset::HandleGet, this)
#if OPENTHREAD_FTD
, mResourceSet(OT_URI_PATH_ACTIVE_SET, &ActiveDataset::HandleSet, this)
@@ -755,8 +755,8 @@ PendingDataset::PendingDataset(Instance &aInstance)
Dataset::kPending,
OT_URI_PATH_PENDING_GET,
OT_URI_PATH_PENDING_SET,
&PendingDataset::HandleTimer)
, mDelayTimer(aInstance, &PendingDataset::HandleDelayTimer, this)
PendingDataset::HandleTimer)
, mDelayTimer(aInstance, PendingDataset::HandleDelayTimer, this)
, mResourceGet(OT_URI_PATH_PENDING_GET, &PendingDataset::HandleGet, this)
#if OPENTHREAD_FTD
, mResourceSet(OT_URI_PATH_PENDING_SET, &PendingDataset::HandleSet, this)
src/core/meshcop/dtls.cpp
+1 -1
View File
@@ -61,7 +61,7 @@ Dtls::Dtls(Instance &aInstance, bool aLayerTwoSecurity)
, mState(kStateClosed)
, mPskLength(0)
, mVerifyPeerCertificate(true)
, mTimer(aInstance, &Dtls::HandleTimer, this)
, mTimer(aInstance, Dtls::HandleTimer, this)
, mTimerIntermediate(0)
, mTimerSet(false)
, mLayerTwoSecurity(aLayerTwoSecurity)
src/core/meshcop/joiner.cpp
+1 -1
View File
@@ -62,7 +62,7 @@ Joiner::Joiner(Instance &aInstance)
, mContext(NULL)
, mJoinerRouterIndex(0)
, mFinalizeMessage(NULL)
, mTimer(aInstance, &Joiner::HandleTimer, this)
, mTimer(aInstance, Joiner::HandleTimer, this)
, mJoinerEntrust(OT_URI_PATH_JOINER_ENTRUST, &Joiner::HandleJoinerEntrust, this)
{
memset(mJoinerRouters, 0, sizeof(mJoinerRouters));
src/core/meshcop/joiner_router.cpp
+1 -1
View File
@@ -57,7 +57,7 @@ JoinerRouter::JoinerRouter(Instance &aInstance)
: InstanceLocator(aInstance)
, mSocket(aInstance.Get<Ip6::Udp>())
, mRelayTransmit(OT_URI_PATH_RELAY_TX, &JoinerRouter::HandleRelayTransmit, this)
, mTimer(aInstance, &JoinerRouter::HandleTimer, this)
, mTimer(aInstance, JoinerRouter::HandleTimer, this)
, mNotifierCallback(aInstance, &JoinerRouter::HandleStateChanged, this)
, mJoinerUdpPort(0)
, mIsJoinerPortConfigured(false)
src/core/net/dhcp6_client.cpp
+1 -1
View File
@@ -54,7 +54,7 @@ namespace Dhcp6 {
Dhcp6Client::Dhcp6Client(Instance &aInstance)
: InstanceLocator(aInstance)
, mSocket(Get<Ip6::Udp>())
, mTrickleTimer(aInstance, &Dhcp6Client::HandleTrickleTimer, NULL, this)
, mTrickleTimer(aInstance, Dhcp6Client::HandleTrickleTimer, NULL, this)
, mStartTime(0)
, mIdentityAssociationCurrent(NULL)
{
src/core/net/dns_client.cpp
+1 -1
View File
@@ -75,7 +75,7 @@ QueryMetadata::QueryMetadata(otDnsResponseHandler aHandler, void *aContext)
Client::Client(Ip6::Netif &aNetif)
: mSocket(aNetif.Get<Ip6::Udp>())
, mMessageId(0)
, mRetransmissionTimer(aNetif.GetInstance(), &Client::HandleRetransmissionTimer, this)
, mRetransmissionTimer(aNetif.GetInstance(), Client::HandleRetransmissionTimer, this)
{
}
src/core/net/ip6.cpp
+1 -1
View File
@@ -62,7 +62,7 @@ Ip6::Ip6(Instance &aInstance)
, mUdp(aInstance)
, mMpl(aInstance)
#if OPENTHREAD_CONFIG_IP6_FRAGMENTATION_ENABLE
, mTimer(aInstance, &Ip6::HandleTimer, this)
, mTimer(aInstance, Ip6::HandleTimer, this)
#endif
{
}
src/core/net/ip6_mpl.cpp
+2 -2
View File
@@ -46,11 +46,11 @@ namespace Ip6 {
Mpl::Mpl(Instance &aInstance)
: InstanceLocator(aInstance)
, mMatchingAddress(NULL)
, mSeedSetTimer(aInstance, &Mpl::HandleSeedSetTimer, this)
, mSeedSetTimer(aInstance, Mpl::HandleSeedSetTimer, this)
, mSeedId(0)
, mSequence(0)
#if OPENTHREAD_FTD
, mRetransmissionTimer(aInstance, &Mpl::HandleRetransmissionTimer, this)
, mRetransmissionTimer(aInstance, Mpl::HandleRetransmissionTimer, this)
, mTimerExpirations(0)
#endif
{
src/core/net/sntp_client.cpp
+1 -1
View File
@@ -91,7 +91,7 @@ QueryMetadata::QueryMetadata(otSntpResponseHandler aHandler, void *aContext)
Client::Client(Ip6::Netif &aNetif)
: mSocket(aNetif.Get<Ip6::Udp>())
, mRetransmissionTimer(aNetif.GetInstance(), &Client::HandleRetransmissionTimer, this)
, mRetransmissionTimer(aNetif.GetInstance(), Client::HandleRetransmissionTimer, this)
, mUnixEra(0)
{
}
src/core/thread/address_resolver.cpp
+1 -1
View File
@@ -63,7 +63,7 @@ AddressResolver::AddressResolver(Instance &aInstance)
, mQueryRetryList()
, mUnusedList()
, mIcmpHandler(&AddressResolver::HandleIcmpReceive, this)
, mTimer(aInstance, &AddressResolver::HandleTimer, this)
, mTimer(aInstance, AddressResolver::HandleTimer, this)
{
for (CacheEntry *entry = &mCacheEntries[0]; entry < OT_ARRAY_END(mCacheEntries); entry++)
{
src/core/thread/announce_begin_server.cpp
+1 -1
View File
@@ -48,7 +48,7 @@
namespace ot {
AnnounceBeginServer::AnnounceBeginServer(Instance &aInstance)
: AnnounceSenderBase(aInstance, &AnnounceBeginServer::HandleTimer)
: AnnounceSenderBase(aInstance, AnnounceBeginServer::HandleTimer)
, mAnnounceBegin(OT_URI_PATH_ANNOUNCE_BEGIN, &AnnounceBeginServer::HandleRequest, this)
{
Get<Coap::Coap>().AddResource(mAnnounceBegin);
src/core/thread/announce_sender.cpp
+1 -1
View File
@@ -111,7 +111,7 @@ exit:
#if OPENTHREAD_CONFIG_ANNOUNCE_SENDER_ENABLE
AnnounceSender::AnnounceSender(Instance &aInstance)
: AnnounceSenderBase(aInstance, &AnnounceSender::HandleTimer)
: AnnounceSenderBase(aInstance, AnnounceSender::HandleTimer)
, mNotifierCallback(aInstance, HandleStateChanged, this)
{
}
src/core/thread/energy_scan_server.cpp
+1 -1
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, this)
, mNotifierCallback(aInstance, &EnergyScanServer::HandleStateChanged, this)
, mEnergyScan(OT_URI_PATH_ENERGY_SCAN, &EnergyScanServer::HandleRequest, this)
{
src/core/thread/key_manager.cpp
+1 -1
View File
@@ -76,7 +76,7 @@ KeyManager::KeyManager(Instance &aInstance)
, mKeyRotationTime(kDefaultKeyRotationTime)
, mKeySwitchGuardTime(kDefaultKeySwitchGuardTime)
, mKeySwitchGuardEnabled(false)
, mKeyRotationTimer(aInstance, &KeyManager::HandleKeyRotationTimer, this)
, mKeyRotationTimer(aInstance, KeyManager::HandleKeyRotationTimer, this)
, mKekFrameCounter(0)
, mSecurityPolicyFlags(0xff)
, mIsPskcSet(false)
src/core/thread/mesh_forwarder.cpp
+2 -2
View File
@@ -57,8 +57,8 @@ namespace ot {
MeshForwarder::MeshForwarder(Instance &aInstance)
: InstanceLocator(aInstance)
, mDiscoverTimer(aInstance, &MeshForwarder::HandleDiscoverTimer, this)
, mUpdateTimer(aInstance, &MeshForwarder::HandleUpdateTimer, this)
, mDiscoverTimer(aInstance, MeshForwarder::HandleDiscoverTimer, this)
, mUpdateTimer(aInstance, MeshForwarder::HandleUpdateTimer, this)
, mMessageNextOffset(0)
, mSendMessage(NULL)
, mMeshSource()
src/core/thread/mle.cpp
+4 -4
View File
@@ -69,9 +69,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, this)
, mDelayedResponseTimer(aInstance, Mle::HandleDelayedResponseTimer, this)
, mMessageTransmissionTimer(aInstance, Mle::HandleMessageTransmissionTimer, this)
, mParentLeaderCost(0)
, mParentRequestMode(kAttachAny)
, mParentPriority(0)
@@ -102,7 +102,7 @@ Mle::Mle(Instance &aInstance)
, mParentSearchBackoffWasCanceled(false)
, mParentSearchRecentlyDetached(false)
, mParentSearchBackoffCancelTime(0)
, mParentSearchTimer(aInstance, &Mle::HandleParentSearchTimer, this)
, mParentSearchTimer(aInstance, Mle::HandleParentSearchTimer, this)
#endif
, mAnnounceChannel(0)
, mAlternateChannel(0)
src/core/thread/mle_router.cpp
+2 -2
View File
@@ -58,8 +58,8 @@ namespace Mle {
MleRouter::MleRouter(Instance &aInstance)
: Mle(aInstance)
, mAdvertiseTimer(aInstance, &MleRouter::HandleAdvertiseTimer, NULL, this)
, mStateUpdateTimer(aInstance, &MleRouter::HandleStateUpdateTimer, this)
, mAdvertiseTimer(aInstance, MleRouter::HandleAdvertiseTimer, NULL, this)
, mStateUpdateTimer(aInstance, MleRouter::HandleStateUpdateTimer, this)
, mAddressSolicit(OT_URI_PATH_ADDRESS_SOLICIT, &MleRouter::HandleAddressSolicit, this)
, mAddressRelease(OT_URI_PATH_ADDRESS_RELEASE, &MleRouter::HandleAddressRelease, this)
, mChildTable(aInstance)
src/core/thread/network_data_leader_ftd.cpp
+1 -1
View File
@@ -57,7 +57,7 @@ namespace NetworkData {
Leader::Leader(Instance &aInstance)
: LeaderBase(aInstance)
, mTimer(aInstance, &Leader::HandleTimer, this)
, mTimer(aInstance, Leader::HandleTimer, this)
, mServerData(OT_URI_PATH_SERVER_DATA, &Leader::HandleServerData, this)
, mCommissioningDataGet(OT_URI_PATH_COMMISSIONER_GET, &Leader::HandleCommissioningGet, this)
, mCommissioningDataSet(OT_URI_PATH_COMMISSIONER_SET, &Leader::HandleCommissioningSet, this)
src/core/thread/network_data_notifier.cpp
+1 -1
View File
@@ -47,7 +47,7 @@ namespace NetworkData {
Notifier::Notifier(Instance &aInstance)
: InstanceLocator(aInstance)
, mNotifierCallback(aInstance, &Notifier::HandleStateChanged, this)
, mTimer(aInstance, &Notifier::HandleTimer, this)
, mTimer(aInstance, Notifier::HandleTimer, this)
, mNextDelay(0)
, mWaitingForResponse(false)
{
src/core/thread/panid_query_server.cpp
+1 -1
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, this)
, mPanIdQuery(OT_URI_PATH_PANID_QUERY, &PanIdQueryServer::HandleQuery, this)
{
Get<Coap::Coap>().AddResource(mPanIdQuery);
src/core/utils/channel_manager.cpp
+1 -1
View File
@@ -55,7 +55,7 @@ ChannelManager::ChannelManager(Instance &aInstance)
, mDelay(kMinimumDelay)
, mChannel(0)
, mState(kStateIdle)
, mTimer(aInstance, &ChannelManager::HandleTimer, this)
, mTimer(aInstance, ChannelManager::HandleTimer, this)
, mAutoSelectInterval(kDefaultAutoSelectInterval)
, mAutoSelectEnabled(false)
{
src/core/utils/channel_monitor.cpp
+1 -1
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, this)
{
memset(mChannelOccupancy, 0, sizeof(mChannelOccupancy));
}
src/core/utils/child_supervision.cpp
+2 -2
View File
@@ -50,7 +50,7 @@ namespace Utils {
ChildSupervisor::ChildSupervisor(Instance &aInstance)
: InstanceLocator(aInstance)
, mSupervisionInterval(kDefaultSupervisionInterval)
, mTimer(aInstance, &ChildSupervisor::HandleTimer, this)
, mTimer(aInstance, ChildSupervisor::HandleTimer, this)
, mNotifierCallback(aInstance, &ChildSupervisor::HandleStateChanged, this)
{
}
@@ -180,7 +180,7 @@ void ChildSupervisor::HandleStateChanged(otChangedFlags aFlags)
SupervisionListener::SupervisionListener(Instance &aInstance)
: InstanceLocator(aInstance)
, mTimeout(0)
, mTimer(aInstance, &SupervisionListener::HandleTimer, this)
, mTimer(aInstance, SupervisionListener::HandleTimer, this)
{
SetTimeout(kDefaultTimeout);
}
src/core/utils/jam_detector.cpp
+1 -1
View File
@@ -50,7 +50,7 @@ JamDetector::JamDetector(Instance &aInstance)
, mHandler(NULL)
, mContext(NULL)
, mNotifierCallback(aInstance, HandleStateChanged, this)
, mTimer(aInstance, &JamDetector::HandleTimer, this)
, mTimer(aInstance, JamDetector::HandleTimer, this)
, mHistoryBitmap(0)
, mCurSecondStartTime(0)
, mSampleInterval(0)