espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-19 00:49:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[operational-dataset] optimize storing dataset to non-volatile (#2611)

Browse Source 
This commit reduces stack usage when writing operational datasets to
non-volatile by writing out dataset as given and moving the cleanup of TLVs
when reading the dataset out of non-volatile.
This commit is contained in:
Jonathan Hui
2018-03-12 18:26:28 +00:00
committed by GitHub
parent ab0416c201
commit 8ad0e8e0c9
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/meshcop/dataset_local.cpp
+20 -20
View File
@@ -101,18 +101,26 @@ otError DatasetLocal::Get(Dataset &aDataset) const
error = otPlatSettingsGet(&GetInstance(), GetSettingsKey(), 0, aDataset.mTlvs, &aDataset.mLength);
VerifyOrExit(error == OT_ERROR_NONE, aDataset.mLength = 0);
delayTimer = static_cast<DelayTimerTlv *>(aDataset.Get(Tlv::kDelayTimer));
VerifyOrExit(delayTimer);
elapsed = TimerMilli::GetNow() - mUpdateTime;
if (delayTimer->GetDelayTimer() > elapsed)
if (mType == Tlv::kActiveTimestamp)
{
delayTimer->SetDelayTimer(delayTimer->GetDelayTimer() - elapsed);
aDataset.Remove(Tlv::kPendingTimestamp);
aDataset.Remove(Tlv::kDelayTimer);
}
else
{
delayTimer->SetDelayTimer(0);
delayTimer = static_cast<DelayTimerTlv *>(aDataset.Get(Tlv::kDelayTimer));
VerifyOrExit(delayTimer);
elapsed = TimerMilli::GetNow() - mUpdateTime;
if (delayTimer->GetDelayTimer() > elapsed)
{
delayTimer->SetDelayTimer(delayTimer->GetDelayTimer() - elapsed);
}
else
{
delayTimer->SetDelayTimer(0);
}
}
aDataset.mUpdateTime = TimerMilli::GetNow();
@@ -128,8 +136,7 @@ otError DatasetLocal::Get(otOperationalDataset &aDataset) const
memset(&aDataset, 0, sizeof(aDataset));
dataset.mLength = sizeof(dataset.mTlvs);
error = otPlatSettingsGet(&GetInstance(), GetSettingsKey(), 0, dataset.mTlvs, &dataset.mLength);
error = Get(dataset);
SuccessOrExit(error);
dataset.Get(aDataset);
@@ -159,30 +166,23 @@ exit:
otError DatasetLocal::Set(const Dataset &aDataset)
{
Dataset dataset(aDataset);
const Timestamp *timestamp;
otError error;
if (mType == Tlv::kActiveTimestamp)
{
dataset.Remove(Tlv::kPendingTimestamp);
dataset.Remove(Tlv::kDelayTimer);
}
if (dataset.GetSize() == 0)
if (aDataset.GetSize() == 0)
{
error = otPlatSettingsDelete(&GetInstance(), GetSettingsKey(), 0);
otLogInfoMeshCoP(GetInstance(), "%s dataset deleted", mType == Tlv::kActiveTimestamp ? "Active" : "Pending");
}
else
{
error = otPlatSettingsSet(&GetInstance(), GetSettingsKey(), dataset.GetBytes(), dataset.GetSize());
error = otPlatSettingsSet(&GetInstance(), GetSettingsKey(), aDataset.GetBytes(), aDataset.GetSize());
otLogInfoMeshCoP(GetInstance(), "%s dataset set", mType == Tlv::kActiveTimestamp ? "Active" : "Pending");
}
SuccessOrExit(error);
timestamp = dataset.GetTimestamp();
timestamp = aDataset.GetTimestamp();
if (timestamp != NULL)
{