espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-22 10:29:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[scheduler] move schedulers into otInstance (#1997)

Browse Source
This commit is contained in:
Buke Po
2017-07-14 16:23:22 -07:00
committed by Jonathan Hui
parent 028368e4ee
commit e14598c680
44 changed files with 96 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cli/cli.cpp
+1 -1
View File
@@ -244,7 +244,7 @@ Interpreter::Interpreter(otInstance *aInstance):
mLength(8),
mCount(1),
mInterval(1000),
mPingTimer(aInstance->mIp6, &Interpreter::s_HandlePingTimer, this),
mPingTimer(aInstance, &Interpreter::s_HandlePingTimer, this),
#if OPENTHREAD_ENABLE_DNS_CLIENT
mResolvingInProgress(0),
#endif
src/core/api/instance_api.cpp
+5 -1
View File
@@ -66,7 +66,7 @@ ot::MeshForwarder &otGetMeshForwarder(void)
ot::TaskletScheduler &otGetTaskletScheduler(void)
{
return sInstance->mIp6.mTaskletScheduler;
return sInstance->mTaskletScheduler;
}
ot::Ip6::Ip6 &otGetIp6(void)
@@ -82,6 +82,10 @@ otInstance::otInstance(void) :
mActiveScanCallbackContext(NULL),
mEnergyScanCallback(NULL),
mEnergyScanCallbackContext(NULL),
mTimerMilliScheduler(this),
#if OPENTHREAD_CONFIG_ENABLE_PLATFORM_USEC_TIMER
mTimerMicroScheduler(this),
#endif
mThreadNetif(mIp6)
#if OPENTHREAD_ENABLE_RAW_LINK_API
, mLinkRaw(*this)
src/core/api/link_raw_api.cpp
+3 -3
View File
@@ -269,14 +269,14 @@ LinkRaw::LinkRaw(otInstance &aInstance):
mTransmitDoneCallback(NULL),
mEnergyScanDoneCallback(NULL)
#if OPENTHREAD_LINKRAW_TIMER_REQUIRED
, mTimer(aInstance.mIp6, &LinkRaw::HandleTimer, this)
, mTimer(&aInstance, &LinkRaw::HandleTimer, this)
, mTimerReason(kTimerReasonNone)
#if OPENTHREAD_CONFIG_ENABLE_PLATFORM_USEC_TIMER
, mTimerMicro(aInstance.mIp6, &LinkRaw::HandleTimer, this)
, mTimerMicro(&aInstance, &LinkRaw::HandleTimer, this)
#endif
#endif // OPENTHREAD_LINKRAW_TIMER_REQUIRED
#if OPENTHREAD_CONFIG_ENABLE_SOFTWARE_ENERGY_SCAN
, mEnergyScanTask(aInstance.mIp6.mTaskletScheduler, &LinkRaw::HandleEnergyScanTask, this)
, mEnergyScanTask(&aInstance, &LinkRaw::HandleEnergyScanTask, this)
#endif // OPENTHREAD_CONFIG_ENABLE_SOFTWARE_ENERGY_SCAN
{
// Query the capabilities to check asserts
src/core/api/tasklet_api.cpp
+2 -2
View File
@@ -44,13 +44,13 @@ using namespace ot;
void otTaskletsProcess(otInstance *aInstance)
{
otLogFuncEntry();
aInstance->mIp6.mTaskletScheduler.ProcessQueuedTasklets();
aInstance->mTaskletScheduler.ProcessQueuedTasklets();
otLogFuncExit();
}
bool otTaskletsArePending(otInstance *aInstance)
{
return aInstance->mIp6.mTaskletScheduler.AreTaskletsPending();
return aInstance->mTaskletScheduler.AreTaskletsPending();
}
#ifndef _MSC_VER
src/core/coap/coap.cpp
+2 -2
View File
@@ -52,7 +52,7 @@ namespace Coap {
Coap::Coap(ThreadNetif &aNetif):
ThreadNetifLocator(aNetif),
mSocket(aNetif.GetIp6().mUdp),
mRetransmissionTimer(aNetif.GetIp6(), &Coap::HandleRetransmissionTimer, this),
mRetransmissionTimer(aNetif.GetInstance(), &Coap::HandleRetransmissionTimer, this),
mResources(NULL),
mContext(NULL),
mInterceptor(NULL),
@@ -761,7 +761,7 @@ CoapMetadata::CoapMetadata(bool aConfirmable, const Ip6::MessageInfo &aMessageIn
}
ResponsesQueue::ResponsesQueue(ThreadNetif &aNetif):
mTimer(aNetif.GetIp6(), &ResponsesQueue::HandleTimer, this)
mTimer(aNetif.GetInstance(), &ResponsesQueue::HandleTimer, this)
{
}
src/core/coap/coap_secure.cpp
+1 -1
View File
@@ -53,7 +53,7 @@ CoapSecure::CoapSecure(ThreadNetif &aNetif):
mTransportCallback(NULL),
mTransportContext(NULL),
mTransmitMessage(NULL),
mTransmitTask(aNetif.GetIp6().mTaskletScheduler, &CoapSecure::HandleUdpTransmit, this)
mTransmitTask(aNetif.GetInstance(), &CoapSecure::HandleUdpTransmit, this)
{
}
src/core/common/locator.cpp
-5
View File
@@ -54,11 +54,6 @@ otInstance *MeshForwarderLocator::GetInstance(void) const
return otInstanceFromThreadNetif(&GetMeshForwarder().GetNetif());
}
otInstance *TaskletSchedulerLocator::GetInstance(void) const
{
return otInstanceFromIp6(Ip6::Ip6FromTaskletScheduler(&GetTaskletScheduler()));
}
otInstance *Ip6Locator::GetInstance(void) const
{
return otInstanceFromIp6(&GetIp6());
src/core/common/locator.hpp
-41
View File
@@ -167,47 +167,6 @@ protected:
MeshForwarderLocator(MeshForwarder &aMeshForwarder): Locator(aMeshForwarder) { }
};
/**
* This class implements a locator for TaskletScheduler object.
*
*/
class TaskletSchedulerLocator: private Locator<TaskletScheduler>
{
public:
/**
* This method returns a reference to the TaskletScheduler.
*
* @returns A reference to the TaskletScheduler.
*
*/
#if OPENTHREAD_ENABLE_MULTIPLE_INSTANCES
TaskletScheduler &GetTaskletScheduler(void) const { return mLocatorObject; }
#else
TaskletScheduler &GetTaskletScheduler(void) const { return otGetTaskletScheduler(); }
#endif
/**
* This method returns the pointer to the parent otInstance structure.
*
* @returns The pointer to the parent otInstance structure, or NULL if the instance has been finalized.
*
*/
#if OPENTHREAD_ENABLE_MULTIPLE_INSTANCES
otInstance *GetInstance(void) const;
#else
otInstance *GetInstance(void) const { return otGetInstance(); }
#endif
protected:
/**
* This constructor initializes the object.
*
* @param[in] aTaskletScheduler A reference to the TaskletScheduler.
*
*/
TaskletSchedulerLocator(TaskletScheduler &aTaskletScheduler): Locator(aTaskletScheduler) { }
};
/**
* This class implements a locator for Ip6 object.
*
src/core/common/tasklet.cpp
+3 -3
View File
@@ -44,8 +44,8 @@
namespace ot {
Tasklet::Tasklet(TaskletScheduler &aScheduler, Handler aHandler, void *aContext):
TaskletSchedulerLocator(aScheduler),
Tasklet::Tasklet(otInstance *aInstance, Handler aHandler, void *aContext):
InstanceLocator(aInstance),
Context(aContext),
mHandler(aHandler),
mNext(NULL)
@@ -54,7 +54,7 @@ Tasklet::Tasklet(TaskletScheduler &aScheduler, Handler aHandler, void *aContext)
otError Tasklet::Post(void)
{
return GetTaskletScheduler().Post(*this);
return GetInstance()->mTaskletScheduler.Post(*this);
}
TaskletScheduler::TaskletScheduler(void):
src/core/common/tasklet.hpp
+3 -3
View File
@@ -59,7 +59,7 @@ class TaskletScheduler;
* This class is used to represent a tasklet.
*
*/
class Tasklet: public TaskletSchedulerLocator, public Context
class Tasklet: public InstanceLocator, public Context
{
friend class TaskletScheduler;
@@ -75,12 +75,12 @@ public:
/**
* This constructor creates a tasklet instance.
*
* @param[in] aScheduler A reference to the tasklet scheduler.
* @param[in] aInstance A pointer to the instance object.
* @param[in] aHandler A pointer to a function that is called when the tasklet is run.
* @param[in] aContext A pointer to arbitrary context information.
*
*/
Tasklet(TaskletScheduler &aScheduler, Handler aHandler, void *aContext);
Tasklet(otInstance *aInstance, Handler aHandler, void *aContext);
/**
* This method puts the tasklet on the run queue.
src/core/common/timer.cpp
+6 -7
View File
@@ -41,7 +41,6 @@
#include "common/code_utils.hpp"
#include "common/debug.hpp"
#include "common/logging.hpp"
#include "net/ip6.hpp"
namespace ot {
@@ -90,7 +89,7 @@ void TimerMilli::Stop(void)
TimerMilliScheduler &TimerMilli::GetTimerMilliScheduler(void) const
{
return GetIp6().mTimerMilliScheduler;
return GetInstance()->mTimerMilliScheduler;
}
void TimerScheduler::Add(Timer &aTimer, const AlarmApi &aAlarmApi)
@@ -169,14 +168,14 @@ void TimerScheduler::SetAlarm(const AlarmApi &aAlarmApi)
{
if (mHead == NULL)
{
aAlarmApi.AlarmStop(GetIp6().GetInstance());
aAlarmApi.AlarmStop(GetInstance());
}
else
{
uint32_t now = aAlarmApi.AlarmGetNow();
uint32_t remaining = IsStrictlyBefore(now, mHead->mFireTime) ? (mHead->mFireTime - now) : 0;
aAlarmApi.AlarmStartAt(GetIp6().GetInstance(), now, remaining);
aAlarmApi.AlarmStartAt(GetInstance(), now, remaining);
}
}
@@ -217,7 +216,7 @@ bool TimerScheduler::IsStrictlyBefore(uint32_t aTimeA, uint32_t aTimeB)
extern "C" void otPlatAlarmMilliFired(otInstance *aInstance)
{
otLogFuncEntry();
aInstance->mIp6.mTimerMilliScheduler.ProcessTimers();
aInstance->mTimerMilliScheduler.ProcessTimers();
otLogFuncExit();
}
@@ -243,13 +242,13 @@ void TimerMicro::Stop(void)
TimerMicroScheduler &TimerMicro::GetTimerMicroScheduler(void) const
{
return GetIp6().mTimerMicroScheduler;
return GetInstance()->mTimerMicroScheduler;
}
extern "C" void otPlatAlarmMicroFired(otInstance *aInstance)
{
otLogFuncEntry();
aInstance->mIp6.mTimerMicroScheduler.ProcessTimers();
aInstance->mTimerMicroScheduler.ProcessTimers();
otLogFuncExit();
}
#endif // OPENTHREAD_CONFIG_ENABLE_PLATFORM_USEC_TIMER
src/core/common/timer.hpp
+20 -22
View File
@@ -48,8 +48,6 @@
namespace ot {
namespace Ip6 { class Ip6; }
class TimerMilliScheduler;
/**
@@ -66,7 +64,7 @@ class TimerMilliScheduler;
* This class implements a timer.
*
*/
class Timer: public Ip6Locator, public Context
class Timer: public InstanceLocator, public Context
{
friend class TimerScheduler;
@@ -88,13 +86,13 @@ public:
/**
* This constructor creates a timer instance.
*
* @param[in] aIp6 A reference to the IPv6 network object.
* @param[in] aInstance A pointer to the instance.
* @param[in] aHandler A pointer to a function that is called when the timer expires.
* @param[in] aContext A pointer to arbitrary context information.
*
*/
Timer(Ip6::Ip6 &aIp6, Handler aHandler, void *aContext):
Ip6Locator(aIp6),
Timer(otInstance *aInstance, Handler aHandler, void *aContext):
InstanceLocator(aInstance),
Context(aContext),
mHandler(aHandler),
mFireTime(0),
@@ -148,13 +146,13 @@ public:
/**
* This constructor creates a millisecond timer instance.
*
* @param[in] aIp6 A reference to the IPv6 network object.
* @param[in] aInstance A pointer to the instance.
* @param[in] aHandler A pointer to a function that is called when the timer expires.
* @param[in] aContext A pointer to arbitrary context information.
*
*/
TimerMilli(Ip6::Ip6 &aIp6, Handler aHandler, void *aContext):
Timer(aIp6, aHandler, aContext) {
TimerMilli(otInstance *aInstance, Handler aHandler, void *aContext):
Timer(aInstance, aHandler, aContext) {
}
/**
@@ -221,7 +219,7 @@ private:
* This class implements the base timer scheduler.
*
*/
class TimerScheduler: public Ip6Locator
class TimerScheduler: public InstanceLocator
{
friend class Timer;
@@ -240,11 +238,11 @@ protected:
/**
* This constructor initializes the object.
*
* @param[in] aIp6 A reference to the IPv6 network object.
* @param[in] aInstance A pointer to the instance object.
*
*/
TimerScheduler(Ip6::Ip6 &aIp6):
Ip6Locator(aIp6),
TimerScheduler(otInstance *aInstance):
InstanceLocator(aInstance),
mHead(NULL) {
}
@@ -310,11 +308,11 @@ public:
/**
* This constructor initializes the object.
*
* @param[in] aIp6 A reference to the IPv6 network object.
* @param[in] aInstance A pointer to the instance object.
*
*/
TimerMilliScheduler(Ip6::Ip6 &aIp6):
TimerScheduler(aIp6) {
TimerMilliScheduler(otInstance *aInstance):
TimerScheduler(aInstance) {
}
/**
@@ -356,13 +354,13 @@ public:
/**
* This constructor creates a timer instance.
*
* @param[in] aIp6 A reference to the IPv6 network object.
* @param[in] aInstance A pointer to the instance object.
* @param[in] aHandler A pointer to a function that is called when the timer expires.
* @param[in] aContext A pointer to arbitrary context information.
*
*/
TimerMicro(Ip6::Ip6 &aIp6, Handler aHandler, void *aContext):
Timer(aIp6, aHandler, aContext) {
TimerMicro(otInstance *aInstance, Handler aHandler, void *aContext):
Timer(aInstance, aHandler, aContext) {
}
/**
@@ -418,11 +416,11 @@ public:
/**
* This constructor initializes the object.
*
* @param[in] aIp6 A reference to the IPv6 network object.
* @param[in] aInstance A pointer to the instance object.
*
*/
TimerMicroScheduler(Ip6::Ip6 &aIp6):
TimerScheduler(aIp6) {
TimerMicroScheduler(otInstance *aInstance):
TimerScheduler(aInstance) {
}
/**
src/core/common/trickle_timer.cpp
+2 -3
View File
@@ -37,20 +37,19 @@
#include <openthread/platform/random.h>
#include "openthread-instance.h"
#include "common/code_utils.hpp"
#include "common/debug.hpp"
namespace ot {
TrickleTimer::TrickleTimer(
Ip6::Ip6 &aIp6,
otInstance *aInstance,
#ifdef ENABLE_TRICKLE_TIMER_SUPPRESSION_SUPPORT
uint32_t aRedundancyConstant,
#endif
Handler aTransmitHandler, Handler aIntervalExpiredHandler, void *aContext)
:
TimerMilli(aIp6, HandleTimerFired, aContext),
TimerMilli(aInstance, HandleTimerFired, aContext),
#ifdef ENABLE_TRICKLE_TIMER_SUPPRESSION_SUPPORT
k(aRedundancyConstant),
c(0),
src/core/common/trickle_timer.hpp
+2 -2
View File
@@ -80,14 +80,14 @@ public:
/**
* This constructor creates a trickle timer instance.
*
* @param[in] aIp6 A reference to the IPv6 network object.
* @param[in] aInstance A pointer to the instance.
* @param[in] aRedundancyConstant The redundancy constant for the timer, 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] aContext A pointer to arbitrary context information.
*
*/
TrickleTimer(Ip6::Ip6 &aIp6,
TrickleTimer(otInstance *aInstance,
#ifdef ENABLE_TRICKLE_TIMER_SUPPRESSION_SUPPORT
uint32_t aRedundancyConstant,
#endif
src/core/mac/mac.cpp
+4 -4
View File
@@ -107,9 +107,9 @@ void Mac::StartCsmaBackoff(void)
Mac::Mac(ThreadNetif &aThreadNetif):
ThreadNetifLocator(aThreadNetif),
mMacTimer(aThreadNetif.GetIp6(), &Mac::HandleMacTimer, this),
mBackoffTimer(aThreadNetif.GetIp6(), &Mac::HandleBeginTransmit, this),
mReceiveTimer(aThreadNetif.GetIp6(), &Mac::HandleReceiveTimer, this),
mMacTimer(aThreadNetif.GetInstance(), &Mac::HandleMacTimer, this),
mBackoffTimer(aThreadNetif.GetInstance(), &Mac::HandleBeginTransmit, this),
mReceiveTimer(aThreadNetif.GetInstance(), &Mac::HandleReceiveTimer, this),
mShortAddress(kShortAddrInvalid),
mPanId(kPanIdBroadcast),
mChannel(OPENTHREAD_CONFIG_DEFAULT_CHANNEL),
@@ -133,7 +133,7 @@ Mac::Mac(ThreadNetif &aThreadNetif):
mScanContext(NULL),
mActiveScanHandler(NULL), // initialize mActiveScanHandler and mEnergyScanHandler union
mEnergyScanCurrentMaxRssi(kInvalidRssiValue),
mEnergyScanSampleRssiTask(aThreadNetif.GetIp6().mTaskletScheduler, &Mac::HandleEnergyScanSampleRssi, this),
mEnergyScanSampleRssiTask(aThreadNetif.GetInstance(), &Mac::HandleEnergyScanSampleRssi, this),
mPcapCallback(NULL),
mPcapCallbackContext(NULL),
#if OPENTHREAD_ENABLE_MAC_FILTER
src/core/meshcop/commissioner.cpp
+2 -2
View File
@@ -70,8 +70,8 @@ Commissioner::Commissioner(ThreadNetif &aThreadNetif):
mState(OT_COMMISSIONER_STATE_DISABLED),
mJoinerPort(0),
mJoinerRloc(0),
mJoinerExpirationTimer(aThreadNetif.GetIp6(), HandleJoinerExpirationTimer, this),
mTimer(aThreadNetif.GetIp6(), HandleTimer, this),
mJoinerExpirationTimer(aThreadNetif.GetInstance(), HandleJoinerExpirationTimer, this),
mTimer(aThreadNetif.GetInstance(), HandleTimer, this),
mSessionId(0),
mTransmitAttempts(0),
mRelayReceive(OT_URI_PATH_RELAY_RX, &Commissioner::HandleRelayReceive, this),
src/core/meshcop/dataset_manager.cpp
+2 -2
View File
@@ -66,7 +66,7 @@ DatasetManager::DatasetManager(ThreadNetif &aThreadNetif, const Tlv::Type aType,
ThreadNetifLocator(aThreadNetif),
mLocal(aThreadNetif.GetInstance(), aType),
mNetwork(aType),
mTimer(aThreadNetif.GetIp6(), aTimerHander, this),
mTimer(aThreadNetif.GetInstance(), aTimerHander, this),
mUriSet(aUriSet),
mUriGet(aUriGet)
{
@@ -1022,7 +1022,7 @@ static PendingDatasetBase &GetPendingDatasetOwner(const Context &aContext)
PendingDatasetBase::PendingDatasetBase(ThreadNetif &aThreadNetif):
DatasetManager(aThreadNetif, Tlv::kPendingTimestamp, OT_URI_PATH_PENDING_SET, OT_URI_PATH_PENDING_GET,
&PendingDatasetBase::HandleTimer),
mDelayTimer(aThreadNetif.GetIp6(), &PendingDatasetBase::HandleDelayTimer, this),
mDelayTimer(aThreadNetif.GetInstance(), &PendingDatasetBase::HandleDelayTimer, this),
mResourceGet(OT_URI_PATH_PENDING_GET, &PendingDatasetBase::HandleGet, this)
{
aThreadNetif.GetCoap().AddResource(mResourceGet);
src/core/meshcop/dtls.cpp
+1 -1
View File
@@ -57,7 +57,7 @@ Dtls::Dtls(ThreadNetif &aNetif):
ThreadNetifLocator(aNetif),
mPskLength(0),
mStarted(false),
mTimer(aNetif.GetIp6(), &Dtls::HandleTimer, this),
mTimer(aNetif.GetInstance(), &Dtls::HandleTimer, this),
mTimerIntermediate(0),
mTimerSet(false),
mReceiveMessage(NULL),
src/core/meshcop/joiner.cpp
+1 -1
View File
@@ -74,7 +74,7 @@ Joiner::Joiner(ThreadNetif &aNetif):
mVendorModel(NULL),
mVendorSwVersion(NULL),
mVendorData(NULL),
mTimer(aNetif.GetIp6(), &Joiner::HandleTimer, this),
mTimer(aNetif.GetInstance(), &Joiner::HandleTimer, this),
mJoinerEntrust(OT_URI_PATH_JOINER_ENTRUST, &Joiner::HandleJoinerEntrust, this)
{
aNetif.GetCoap().AddResource(mJoinerEntrust);
src/core/meshcop/joiner_router.cpp
+1 -1
View File
@@ -61,7 +61,7 @@ JoinerRouter::JoinerRouter(ThreadNetif &aNetif):
ThreadNetifLocator(aNetif),
mSocket(aNetif.GetIp6().mUdp),
mRelayTransmit(OT_URI_PATH_RELAY_TX, &JoinerRouter::HandleRelayTransmit, this),
mTimer(aNetif.GetIp6(), &JoinerRouter::HandleTimer, this),
mTimer(aNetif.GetInstance(), &JoinerRouter::HandleTimer, this),
mJoinerUdpPort(0),
mIsJoinerPortConfigured(false),
mExpectJoinEntRsp(false)
src/core/meshcop/leader.cpp
+1 -1
View File
@@ -60,7 +60,7 @@ Leader::Leader(ThreadNetif &aThreadNetif):
ThreadNetifLocator(aThreadNetif),
mPetition(OT_URI_PATH_LEADER_PETITION, Leader::HandlePetition, this),
mKeepAlive(OT_URI_PATH_LEADER_KEEP_ALIVE, Leader::HandleKeepAlive, this),
mTimer(aThreadNetif.GetIp6(), HandleTimer, this),
mTimer(aThreadNetif.GetInstance(), HandleTimer, this),
mDelayTimerMinimal(DelayTimerTlv::kDelayTimerMinimal),
mSessionId(0xffff)
{
src/core/net/dhcp6_client.cpp
+1 -1
View File
@@ -59,7 +59,7 @@ namespace Dhcp6 {
Dhcp6Client::Dhcp6Client(ThreadNetif &aThreadNetif) :
ThreadNetifLocator(aThreadNetif),
mTrickleTimer(aThreadNetif.GetIp6(), &Dhcp6Client::HandleTrickleTimer, NULL, this),
mTrickleTimer(aThreadNetif.GetInstance(), &Dhcp6Client::HandleTrickleTimer, NULL, this),
mSocket(aThreadNetif.GetIp6().mUdp),
mStartTime(0),
mAddresses(NULL),
src/core/net/dns_client.hpp
+1 -1
View File
@@ -159,7 +159,7 @@ public:
Client(Ip6::Netif &aNetif):
mSocket(aNetif.GetIp6().mUdp),
mMessageId(0),
mRetransmissionTimer(aNetif.GetIp6(), &Client::HandleRetransmissionTimer, this) {
mRetransmissionTimer(aNetif.GetInstance(), &Client::HandleRetransmissionTimer, this) {
};
/**
src/core/net/ip6.cpp
+1 -5
View File
@@ -58,12 +58,8 @@ Ip6::Ip6(void):
mUdp(*this),
mMpl(*this),
mMessagePool(GetInstance()),
mTimerMilliScheduler(*this),
#if OPENTHREAD_CONFIG_ENABLE_PLATFORM_USEC_TIMER
mTimerMicroScheduler(*this),
#endif
mForwardingEnabled(false),
mSendQueueTask(mTaskletScheduler, HandleSendQueue, this),
mSendQueueTask(GetInstance(), HandleSendQueue, this),
mReceiveIp6DatagramCallback(NULL),
mReceiveIp6DatagramCallbackContext(NULL),
mIsReceiveIp6FilterEnabled(false),
src/core/net/ip6.hpp
-10
View File
@@ -373,11 +373,6 @@ public:
Mpl mMpl;
MessagePool mMessagePool;
TaskletScheduler mTaskletScheduler;
TimerMilliScheduler mTimerMilliScheduler;
#if OPENTHREAD_CONFIG_ENABLE_PLATFORM_USEC_TIMER
TimerMicroScheduler mTimerMicroScheduler;
#endif
private:
static void HandleSendQueue(Tasklet &aTasklet);
@@ -410,11 +405,6 @@ private:
Netif *mNetifListHead;
};
static inline Ip6 *Ip6FromTaskletScheduler(TaskletScheduler *aTaskletScheduler)
{
return (Ip6 *)CONTAINING_RECORD(aTaskletScheduler, Ip6, mTaskletScheduler);
}
/**
* @}
*
src/core/net/ip6_mpl.cpp
+2 -2
View File
@@ -57,8 +57,8 @@ void MplBufferedMessageMetadata::GenerateNextTransmissionTime(uint32_t aCurrentT
Mpl::Mpl(Ip6 &aIp6):
Ip6Locator(aIp6),
mSeedSetTimer(aIp6, &Mpl::HandleSeedSetTimer, this),
mRetransmissionTimer(aIp6, &Mpl::HandleRetransmissionTimer, this),
mSeedSetTimer(aIp6.GetInstance(), &Mpl::HandleSeedSetTimer, this),
mRetransmissionTimer(aIp6.GetInstance(), &Mpl::HandleRetransmissionTimer, this),
mTimerExpirations(0),
mSequence(0),
mSeedId(0),
src/core/net/netif.cpp
+1 -1
View File
@@ -51,7 +51,7 @@ Netif::Netif(Ip6 &aIp6, int8_t aInterfaceId):
mInterfaceId(aInterfaceId),
mAllRoutersSubscribed(false),
mMulticastPromiscuous(false),
mStateChangedTask(aIp6.mTaskletScheduler, &Netif::HandleStateChangedTask, this),
mStateChangedTask(aIp6.GetInstance(), &Netif::HandleStateChangedTask, this),
mNext(NULL),
mStateChangedFlags(0)
{
src/core/openthread-instance.h
+6
View File
@@ -78,6 +78,12 @@ typedef struct otInstance
// State
//
ot::TaskletScheduler mTaskletScheduler;
ot::TimerMilliScheduler mTimerMilliScheduler;
#if OPENTHREAD_CONFIG_ENABLE_PLATFORM_USEC_TIMER
ot::TimerMicroScheduler mTimerMicroScheduler;
#endif
#if !OPENTHREAD_ENABLE_MULTIPLE_INSTANCES
ot::Crypto::MbedTls mMbedTls;
ot::Crypto::Heap mMbedTlsHeap;
src/core/thread/address_resolver.cpp
+1 -1
View File
@@ -64,7 +64,7 @@ AddressResolver::AddressResolver(ThreadNetif &aThreadNetif) :
mAddressQuery(OT_URI_PATH_ADDRESS_QUERY, &AddressResolver::HandleAddressQuery, this),
mAddressNotification(OT_URI_PATH_ADDRESS_NOTIFY, &AddressResolver::HandleAddressNotification, this),
mIcmpHandler(&AddressResolver::HandleIcmpReceive, this),
mTimer(aThreadNetif.GetIp6(), &AddressResolver::HandleTimer, this)
mTimer(aThreadNetif.GetInstance(), &AddressResolver::HandleTimer, this)
{
Clear();
src/core/thread/announce_begin_server.cpp
+1 -1
View File
@@ -58,7 +58,7 @@ AnnounceBeginServer::AnnounceBeginServer(ThreadNetif &aThreadNetif) :
mPeriod(0),
mCount(0),
mChannel(0),
mTimer(aThreadNetif.GetIp6(), &AnnounceBeginServer::HandleTimer, this),
mTimer(aThreadNetif.GetInstance(), &AnnounceBeginServer::HandleTimer, this),
mAnnounceBegin(OT_URI_PATH_ANNOUNCE_BEGIN, &AnnounceBeginServer::HandleRequest, this)
{
aThreadNetif.GetCoap().AddResource(mAnnounceBegin);
src/core/thread/data_poll_manager.cpp
+1 -1
View File
@@ -51,7 +51,7 @@ namespace ot {
DataPollManager::DataPollManager(MeshForwarder &aMeshForwarder):
MeshForwarderLocator(aMeshForwarder),
mTimer(aMeshForwarder.GetNetif().GetIp6(), &DataPollManager::HandlePollTimer, this),
mTimer(aMeshForwarder.GetInstance(), &DataPollManager::HandlePollTimer, this),
mTimerStartTime(0),
mExternalPollPeriod(0),
mPollPeriod(0),
src/core/thread/energy_scan_server.cpp
+1 -1
View File
@@ -59,7 +59,7 @@ EnergyScanServer::EnergyScanServer(ThreadNetif &aThreadNetif) :
mCount(0),
mActive(false),
mScanResultsLength(0),
mTimer(aThreadNetif.GetIp6(), &EnergyScanServer::HandleTimer, this),
mTimer(aThreadNetif.GetInstance(), &EnergyScanServer::HandleTimer, this),
mEnergyScan(OT_URI_PATH_ENERGY_SCAN, &EnergyScanServer::HandleRequest, this)
{
mNetifCallback.Set(&EnergyScanServer::HandleNetifStateChanged, this);
src/core/thread/key_manager.cpp
+1 -1
View File
@@ -61,7 +61,7 @@ KeyManager::KeyManager(ThreadNetif &aThreadNetif):
mKeyRotationTime(kDefaultKeyRotationTime),
mKeySwitchGuardTime(kDefaultKeySwitchGuardTime),
mKeySwitchGuardEnabled(false),
mKeyRotationTimer(aThreadNetif.GetIp6(), &KeyManager::HandleKeyRotationTimer, this),
mKeyRotationTimer(aThreadNetif.GetInstance(), &KeyManager::HandleKeyRotationTimer, this),
mKekFrameCounter(0),
mSecurityPolicyFlags(0xff)
{
src/core/thread/mesh_forwarder.cpp
+3 -3
View File
@@ -62,8 +62,8 @@ MeshForwarder::MeshForwarder(ThreadNetif &aThreadNetif):
ThreadNetifLocator(aThreadNetif),
mMacReceiver(&MeshForwarder::HandleReceivedFrame, &MeshForwarder::HandleDataPollTimeout, this),
mMacSender(&MeshForwarder::HandleFrameRequest, &MeshForwarder::HandleSentFrame, this),
mDiscoverTimer(aThreadNetif.GetIp6(), &MeshForwarder::HandleDiscoverTimer, this),
mReassemblyTimer(aThreadNetif.GetIp6(), &MeshForwarder::HandleReassemblyTimer, this),
mDiscoverTimer(aThreadNetif.GetInstance(), &MeshForwarder::HandleDiscoverTimer, this),
mReassemblyTimer(aThreadNetif.GetInstance(), &MeshForwarder::HandleReassemblyTimer, this),
mMessageNextOffset(0),
mSendMessageFrameCounter(0),
mSendMessage(NULL),
@@ -76,7 +76,7 @@ MeshForwarder::MeshForwarder(ThreadNetif &aThreadNetif):
mMeshDest(Mac::kShortAddrInvalid),
mAddMeshHeader(false),
mSendBusy(false),
mScheduleTransmissionTask(aThreadNetif.GetIp6().mTaskletScheduler, ScheduleTransmissionTask, this),
mScheduleTransmissionTask(aThreadNetif.GetInstance(), ScheduleTransmissionTask, this),
mEnabled(false),
mScanChannels(0),
mScanChannel(0),
src/core/thread/mle.cpp
+3 -3
View File
@@ -68,8 +68,8 @@ Mle::Mle(ThreadNetif &aThreadNetif) :
mDeviceMode(ModeTlv::kModeRxOnWhenIdle | ModeTlv::kModeSecureDataRequest),
mParentRequestState(kParentIdle),
mReattachState(kReattachStop),
mParentRequestTimer(aThreadNetif.GetIp6(), &Mle::HandleParentRequestTimer, this),
mDelayedResponseTimer(aThreadNetif.GetIp6(), &Mle::HandleDelayedResponseTimer, this),
mParentRequestTimer(aThreadNetif.GetInstance(), &Mle::HandleParentRequestTimer, this),
mDelayedResponseTimer(aThreadNetif.GetInstance(), &Mle::HandleDelayedResponseTimer, this),
mLastPartitionRouterIdSequence(0),
mLastPartitionId(0),
mParentLeaderCost(0),
@@ -82,7 +82,7 @@ Mle::Mle(ThreadNetif &aThreadNetif) :
mParentIsSingleton(false),
mSocket(aThreadNetif.GetIp6().mUdp),
mTimeout(kMleEndDeviceTimeout),
mSendChildUpdateRequest(aThreadNetif.GetIp6().mTaskletScheduler, &Mle::HandleSendChildUpdateRequest, this),
mSendChildUpdateRequest(aThreadNetif.GetInstance(), &Mle::HandleSendChildUpdateRequest, this),
mDiscoverHandler(NULL),
mDiscoverContext(NULL),
mIsDiscoverInProgress(false),
src/core/thread/mle_router.cpp
+2 -2
View File
@@ -60,8 +60,8 @@ namespace Mle {
MleRouter::MleRouter(ThreadNetif &aThreadNetif):
Mle(aThreadNetif),
mAdvertiseTimer(aThreadNetif.GetIp6(), &MleRouter::HandleAdvertiseTimer, NULL, this),
mStateUpdateTimer(aThreadNetif.GetIp6(), &MleRouter::HandleStateUpdateTimer, this),
mAdvertiseTimer(aThreadNetif.GetInstance(), &MleRouter::HandleAdvertiseTimer, NULL, this),
mStateUpdateTimer(aThreadNetif.GetInstance(), &MleRouter::HandleStateUpdateTimer, this),
mAddressSolicit(OT_URI_PATH_ADDRESS_SOLICIT, &MleRouter::HandleAddressSolicit, this),
mAddressRelease(OT_URI_PATH_ADDRESS_RELEASE, &MleRouter::HandleAddressRelease, this),
mRouterIdSequence(0),
src/core/thread/network_data_leader_ftd.cpp
+1 -1
View File
@@ -63,7 +63,7 @@ namespace NetworkData {
Leader::Leader(ThreadNetif &aThreadNetif):
LeaderBase(aThreadNetif),
mTimer(aThreadNetif.GetIp6(), &Leader::HandleTimer, this),
mTimer(aThreadNetif.GetInstance(), &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/panid_query_server.cpp
+1 -1
View File
@@ -55,7 +55,7 @@ PanIdQueryServer::PanIdQueryServer(ThreadNetif &aThreadNetif) :
ThreadNetifLocator(aThreadNetif),
mChannelMask(0),
mPanId(Mac::kPanIdBroadcast),
mTimer(aThreadNetif.GetIp6(), &PanIdQueryServer::HandleTimer, this),
mTimer(aThreadNetif.GetInstance(), &PanIdQueryServer::HandleTimer, this),
mPanIdQuery(OT_URI_PATH_PANID_QUERY, &PanIdQueryServer::HandleQuery, this)
{
aThreadNetif.GetCoap().AddResource(mPanIdQuery);
src/core/utils/child_supervision.cpp
+2 -2
View File
@@ -52,7 +52,7 @@ namespace Utils {
ChildSupervisor::ChildSupervisor(ThreadNetif &aThreadNetif) :
ThreadNetifLocator(aThreadNetif),
mTimer(aThreadNetif.GetIp6(), &ChildSupervisor::HandleTimer, this),
mTimer(aThreadNetif.GetInstance(), &ChildSupervisor::HandleTimer, this),
mSupervisionInterval(kDefaultSupervisionInterval)
{
}
@@ -183,7 +183,7 @@ ChildSupervisor &ChildSupervisor::GetOwner(const Context &aContext)
SupervisionListener::SupervisionListener(ThreadNetif &aThreadNetif) :
ThreadNetifLocator(aThreadNetif),
mTimer(aThreadNetif.GetIp6(), &SupervisionListener::HandleTimer, this),
mTimer(aThreadNetif.GetInstance(), &SupervisionListener::HandleTimer, this),
mTimeout(0)
{
SetTimeout(kDefaultTimeout);
src/core/utils/jam_detector.cpp
+1 -1
View File
@@ -52,7 +52,7 @@ JamDetector::JamDetector(ThreadNetif &aNetif) :
mHandler(NULL),
mContext(NULL),
mRssiThreshold(kDefaultRssiThreshold),
mTimer(aNetif.GetIp6(), &JamDetector::HandleTimer, this),
mTimer(aNetif.GetInstance(), &JamDetector::HandleTimer, this),
mHistoryBitmap(0),
mCurSecondStartTime(0),
mSampleInterval(0),
src/ncp/ncp_base.cpp
+1 -1
View File
@@ -666,7 +666,7 @@ NcpBase::NcpBase(otInstance *aInstance):
mDiscoveryScanJoinerFlag(false),
mDiscoveryScanEnableFiltering(false),
mDiscoveryScanPanId(0xffff),
mUpdateChangedPropsTask(aInstance->mIp6.mTaskletScheduler, &NcpBase::UpdateChangedProps, this),
mUpdateChangedPropsTask(aInstance, &NcpBase::UpdateChangedProps, this),
mChangedFlags(NCP_CHANGED_PLATFORM_RESET),
mShouldSignalEndOfScan(false),
mHostPowerState(SPINEL_HOST_POWER_STATE_ONLINE),
src/ncp/ncp_spi.cpp
+1 -1
View File
@@ -105,7 +105,7 @@ NcpSpi::NcpSpi(otInstance *aInstance) :
mTxState(kTxStateIdle),
mHandlingRxFrame(false),
mResetFlag(true),
mPrepareTxFrameTask(aInstance->mIp6.mTaskletScheduler, &NcpSpi::PrepareTxFrame, this),
mPrepareTxFrameTask(aInstance, &NcpSpi::PrepareTxFrame, this),
mSendFrameLen(0)
{
memset(mSendFrame, 0, kSpiHeaderLength);
src/ncp/ncp_uart.cpp
+1 -1
View File
@@ -98,7 +98,7 @@ NcpUart::NcpUart(otInstance *aInstance):
mUartBuffer(),
mState(kStartingFrame),
mByte(0),
mUartSendTask(aInstance->mIp6.mTaskletScheduler, EncodeAndSendToUart, this)
mUartSendTask(aInstance, EncodeAndSendToUart, this)
{
mTxFrameBuffer.SetFrameAddedCallback(HandleFrameAddedToNcpBuffer, this);
tests/unit/test_timer.cpp
+1 -1
View File
@@ -86,7 +86,7 @@ class TestTimer: public ot::TimerMilli
{
public:
TestTimer(otInstance *aInstance):
ot::TimerMilli(aInstance->mIp6, TestTimer::HandleTimerFired, NULL),
ot::TimerMilli(aInstance, TestTimer::HandleTimerFired, NULL),
mFiredCounter(0)
{ }