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

[mac] invoke HandleTransmitDone from tasklet in case OT_ERROR_ABORT (#3173)

Browse Source 
This commit re-uses the `mOperationTask` tasklet (in addition to it
being used for starting a scheduled MAC operation) to invoke the
`HandleTransmitDone()` in case of `OT_ERROR_ABORT` failure. This
ensures that frame retransmission attempt (in case of back-to-back
failures) are not done through the same long call chain.
This commit is contained in:
Abtin Keshavarzian
2018-10-17 13:23:30 +02:00
committed by Jonathan Hui
parent 8a5b9fc5c0
commit 4c6801ad73
2 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/mac/mac.cpp
+29 -4
View File
@@ -160,10 +160,11 @@ Mac::Mac(Instance &aInstance)
, mPendingWaitingForData(false)
, mRxOnWhenIdle(false)
, mBeaconsEnabled(false)
, mTransmitAborted(false)
#if OPENTHREAD_CONFIG_STAY_AWAKE_BETWEEN_FRAGMENTS
, mDelaySleep(false)
#endif
, mOperationTask(aInstance, &Mac::PerformOperation, this)
, mOperationTask(aInstance, &Mac::HandleOperationTask, this)
, mMacTimer(aInstance, &Mac::HandleMacTimer, this)
, mBackoffTimer(aInstance, &Mac::HandleBackoffTimer, this)
, mReceiveTimer(aInstance, &Mac::HandleReceiveTimer, this)
@@ -755,9 +756,29 @@ void Mac::StartOperation(Operation aOperation)
}
}
void Mac::PerformOperation(Tasklet &aTasklet)
void Mac::HandleOperationTask(Tasklet &aTasklet)
{
aTasklet.GetOwner<Mac>().PerformOperation();
aTasklet.GetOwner<Mac>().HandleOperationTask();
}
void Mac::HandleOperationTask(void)
{
// `mOperationTask` tasklet is used for two separate purposes:
//
// 1) To invoke `HandleTransmitDone()` from a tasklet with
// `OT_ERROR_ABORT` error.
//
// 2) To perform a scheduled MAC operation.
if (mTransmitAborted)
{
mTransmitAborted = false;
HandleTransmitDone(GetOperationFrame(), NULL, OT_ERROR_ABORT);
}
else
{
PerformOperation();
}
}
void Mac::PerformOperation(void)
@@ -1242,7 +1263,11 @@ exit:
if (error != OT_ERROR_NONE)
{
HandleTransmitDone(&sendFrame, NULL, OT_ERROR_ABORT);
// `HandleTrasnmitDone()` will be invoked from `mOperationTask`
// tasklet handler with error `OT_ERROR_ABORT`.
mTransmitAborted = true;
mOperationTask.Post();
}
}
src/core/mac/mac.hpp
+4 -2
View File
@@ -977,6 +977,7 @@ private:
void BeginTransmit(void);
otError HandleMacCommand(Frame &aFrame);
Frame * GetOperationFrame(void);
void PerformOperation(void);
static void HandleMacTimer(Timer &aTimer);
void HandleMacTimer(void);
@@ -984,8 +985,8 @@ private:
void HandleBackoffTimer(void);
static void HandleReceiveTimer(Timer &aTimer);
void HandleReceiveTimer(void);
static void PerformOperation(Tasklet &aTasklet);
void PerformOperation(void);
static void HandleOperationTask(Tasklet &aTasklet);
void HandleOperationTask(void);
void StartCsmaBackoff(void);
@@ -1021,6 +1022,7 @@ private:
bool mPendingWaitingForData : 1;
bool mRxOnWhenIdle : 1;
bool mBeaconsEnabled : 1;
bool mTransmitAborted : 1;
#if OPENTHREAD_CONFIG_STAY_AWAKE_BETWEEN_FRAGMENTS
bool mDelaySleep : 1;
#endif