Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the member variable names in ReliableMessageManager and … #4293

Merged
merged 1 commit into from
Jan 11, 2021
Merged

Update the member variable names in ReliableMessageManager and … #4293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/messaging/ExchangeMgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ namespace Messaging {
* prior to use.
*
*/
ExchangeManager::ExchangeManager() : mReliableMessageMgr(ContextPool)
ExchangeManager::ExchangeManager() : mReliableMessageMgr(mContextPool)
{
mState = State::kState_NotInitialized;
}
Expand Down Expand Up @@ -110,7 +110,7 @@ ExchangeContext * ExchangeManager::NewContext(const NodeId & peerNodeId, Exchang

ExchangeContext * ExchangeManager::FindContext(NodeId peerNodeId, ExchangeDelegate * delegate, bool isInitiator)
{
for (auto & ec : ContextPool)
for (auto & ec : mContextPool)
{
if (ec.GetReferenceCount() > 0 && ec.GetPeerNodeId() == peerNodeId && ec.GetDelegate() == delegate &&
ec.IsInitiator() == isInitiator)
Expand Down Expand Up @@ -150,7 +150,7 @@ ExchangeContext * ExchangeManager::AllocContext(uint16_t ExchangeId, uint64_t Pe
{
CHIP_FAULT_INJECT(FaultInjection::kFault_AllocExchangeContext, return nullptr);

for (auto & ec : ContextPool)
for (auto & ec : mContextPool)
{
if (ec.GetReferenceCount() == 0)
{
Expand All @@ -171,7 +171,7 @@ void ExchangeManager::DispatchMessage(const PacketHeader & packetHeader, const P
bool sendAckAndCloseExchange = false;

// Search for an existing exchange that the message applies to. If a match is found...
for (auto & ec : ContextPool)
for (auto & ec : mContextPool)
{
if (ec.GetReferenceCount() > 0 && ec.MatchExchange(packetHeader, payloadHeader))
{
Expand Down Expand Up @@ -245,7 +245,7 @@ void ExchangeManager::DispatchMessage(const PacketHeader & packetHeader, const P

VerifyOrExit(ec != nullptr, err = CHIP_ERROR_NO_MEMORY);

ChipLogProgress(ExchangeManager, "ec pos: %d, id: %d, Delegate: 0x%x", ec - ContextPool.begin(), ec->GetExchangeId(),
ChipLogProgress(ExchangeManager, "ec pos: %d, id: %d, Delegate: 0x%x", ec - mContextPool.begin(), ec->GetExchangeId(),
ec->GetDelegate());

ec->HandleMessage(packetHeader, payloadHeader, std::move(msgBuf));
Expand Down Expand Up @@ -319,7 +319,7 @@ void ExchangeManager::OnMessageReceived(const PacketHeader & packetHeader, const

void ExchangeManager::OnConnectionExpired(const Transport::PeerConnectionState * state, SecureSessionMgr * mgr)
{
for (auto & ec : ContextPool)
for (auto & ec : mContextPool)
{
if (ec.GetReferenceCount() > 0 && ec.GetPeerNodeId() == state->GetPeerNodeId())
{
Expand Down
2 changes: 1 addition & 1 deletion src/messaging/ExchangeMgr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ class DLL_EXPORT ExchangeManager : public SecureSessionMgrDelegate
SecureSessionMgr * mSessionMgr;
ReliableMessageManager mReliableMessageMgr;

std::array<ExchangeContext, CHIP_CONFIG_MAX_EXCHANGE_CONTEXTS> ContextPool;
std::array<ExchangeContext, CHIP_CONFIG_MAX_EXCHANGE_CONTEXTS> mContextPool;
size_t mContextsInUse;

UnsolicitedMessageHandler UMHandlerPool[CHIP_CONFIG_MAX_UNSOLICITED_MESSAGE_HANDLERS];
Expand Down
80 changes: 40 additions & 40 deletions src/messaging/ReliableMessageManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ void ReliableMessageManager::Shutdown()
StopTimer();

// Clear the retransmit table
for (RetransTableEntry & rEntry : RetransTable)
for (RetransTableEntry & rEntry : mRetransTable)
{
ClearRetransmitTable(rEntry);
}
Expand Down Expand Up @@ -99,10 +99,10 @@ void ReliableMessageManager::TicklessDebugDumpRetransTable(const char * log)

for (int i = 0; i < CHIP_CONFIG_RMP_RETRANS_TABLE_SIZE; i++)
{
if (RetransTable[i].rc)
if (mRetransTable[i].rc)
{
ChipLogProgress(ExchangeManager, "EC:%04" PRIX16 " MsgId:%08" PRIX32 " NextRetransTimeCtr:%04" PRIX16,
RetransTable[i].rc, RetransTable[i].msgId, RetransTable[i].nextRetransTimeTick);
mRetransTable[i].rc, mRetransTable[i].msgId, mRetransTable[i].nextRetransTimeTick);
}
}
}
Expand Down Expand Up @@ -139,50 +139,50 @@ void ReliableMessageManager::ExecuteActions()
}
});

TicklessDebugDumpRetransTable("ReliableMessageManager::ExecuteActions Dumping RetransTable entries before processing");
TicklessDebugDumpRetransTable("ReliableMessageManager::ExecuteActions Dumping mRetransTable entries before processing");

// Retransmit / cancel anything in the retrans table whose retrans timeout
// has expired
for (int i = 0; i < CHIP_CONFIG_RMP_RETRANS_TABLE_SIZE; i++)
{
ReliableMessageContext * rc = RetransTable[i].rc;
ReliableMessageContext * rc = mRetransTable[i].rc;
CHIP_ERROR err = CHIP_NO_ERROR;

if (!rc || RetransTable[i].nextRetransTimeTick != 0)
if (!rc || mRetransTable[i].nextRetransTimeTick != 0)
continue;

uint8_t sendCount = RetransTable[i].sendCount;
uint8_t sendCount = mRetransTable[i].sendCount;

if (sendCount == rc->mConfig.mMaxRetrans)
{
err = CHIP_ERROR_MESSAGE_NOT_ACKNOWLEDGED;

ChipLogError(ExchangeManager, "Failed to Send CHIP MsgId:%08" PRIX32 " sendCount: %" PRIu8 " max retries: %" PRIu8,
RetransTable[i].retainedBuf.GetMsgId(), sendCount, rc->mConfig.mMaxRetrans);
mRetransTable[i].retainedBuf.GetMsgId(), sendCount, rc->mConfig.mMaxRetrans);

// Remove from Table
ClearRetransmitTable(RetransTable[i]);
ClearRetransmitTable(mRetransTable[i]);
}

// Resend from Table (if the operation fails, the entry is cleared)
if (err == CHIP_NO_ERROR)
err = SendFromRetransTable(&(RetransTable[i]));
err = SendFromRetransTable(&(mRetransTable[i]));

if (err == CHIP_NO_ERROR)
{
// If the retransmission was successful, update the passive timer
RetransTable[i].nextRetransTimeTick = static_cast<uint16_t>(rc->GetCurrentRetransmitTimeoutTick());
mRetransTable[i].nextRetransTimeTick = static_cast<uint16_t>(rc->GetCurrentRetransmitTimeoutTick());
#if !defined(NDEBUG)
ChipLogProgress(ExchangeManager, "Retransmit MsgId:%08" PRIX32 " Send Cnt %d", RetransTable[i].retainedBuf.GetMsgId(),
RetransTable[i].sendCount);
ChipLogProgress(ExchangeManager, "Retransmit MsgId:%08" PRIX32 " Send Cnt %d", mRetransTable[i].retainedBuf.GetMsgId(),
mRetransTable[i].sendCount);
#endif
}

if (err != CHIP_NO_ERROR && rc->mDelegate)
rc->mDelegate->OnSendError(err);
}

TicklessDebugDumpRetransTable("ReliableMessageManager::ExecuteActions Dumping RetransTable entries after processing");
TicklessDebugDumpRetransTable("ReliableMessageManager::ExecuteActions Dumping mRetransTable entries after processing");
}

static void TickProceed(uint16_t & time, uint64_t ticks)
Expand Down Expand Up @@ -237,22 +237,22 @@ void ReliableMessageManager::ExpireTicks()
// Check Throttle timeout stored in EC to set/unset Throttle flag
for (int i = 0; i < CHIP_CONFIG_RMP_RETRANS_TABLE_SIZE; i++)
{
ReliableMessageContext * rc = RetransTable[i].rc;
ReliableMessageContext * rc = mRetransTable[i].rc;
if (rc)
{
// Process Retransmit Table
// Decrement Throttle timeout by elapsed timeticks
TickProceed(rc->mThrottleTimeoutTick, deltaTicks);
#if defined(RMP_TICKLESS_DEBUG)
ChipLogProgress(ExchangeManager, "ReliableMessageManager::ExpireTicks set mThrottleTimeoutTick to %u",
RetransTable[i].nextRetransTimeTick);
mRetransTable[i].nextRetransTimeTick);
#endif

// Decrement Retransmit timeout by elapsed timeticks
TickProceed(RetransTable[i].nextRetransTimeTick, deltaTicks);
TickProceed(mRetransTable[i].nextRetransTimeTick, deltaTicks);
#if defined(RMP_TICKLESS_DEBUG)
ChipLogProgress(ExchangeManager, "ReliableMessageManager::ExpireTicks set nextRetransTimeTick to %u",
RetransTable[i].nextRetransTimeTick);
mRetransTable[i].nextRetransTimeTick);
#endif
} // rc entry is allocated
}
Expand Down Expand Up @@ -311,16 +311,16 @@ CHIP_ERROR ReliableMessageManager::AddToRetransTable(ReliableMessageContext * rc
for (int i = 0; i < CHIP_CONFIG_RMP_RETRANS_TABLE_SIZE; i++)
{
// Check the exchContext pointer for finding an empty slot in Table
if (!RetransTable[i].rc)
if (!mRetransTable[i].rc)
{
// Expire any virtual ticks that have expired so all wakeup sources reflect the current time
ExpireTicks();

RetransTable[i].rc = rc;
RetransTable[i].sendCount = 0;
RetransTable[i].retainedBuf = EncryptedPacketBufferHandle();
mRetransTable[i].rc = rc;
mRetransTable[i].sendCount = 0;
mRetransTable[i].retainedBuf = EncryptedPacketBufferHandle();

*rEntry = &RetransTable[i];
*rEntry = &mRetransTable[i];

// Increment the reference count
rc->Retain();
Expand All @@ -332,7 +332,7 @@ CHIP_ERROR ReliableMessageManager::AddToRetransTable(ReliableMessageContext * rc

if (!added)
{
ChipLogError(ExchangeManager, "RetransTable Already Full");
ChipLogError(ExchangeManager, "mRetransTable Already Full");
err = CHIP_ERROR_RETRANS_TABLE_FULL;
}

Expand All @@ -354,10 +354,10 @@ void ReliableMessageManager::PauseRetransTable(ReliableMessageContext * rc, uint
{
for (int i = 0; i < CHIP_CONFIG_RMP_RETRANS_TABLE_SIZE; i++)
{
if (RetransTable[i].rc == rc)
if (mRetransTable[i].rc == rc)
{
RetransTable[i].nextRetransTimeTick =
static_cast<uint16_t>(RetransTable[i].nextRetransTimeTick + (PauseTimeMillis >> mTimerIntervalShift));
mRetransTable[i].nextRetransTimeTick =
static_cast<uint16_t>(mRetransTable[i].nextRetransTimeTick + (PauseTimeMillis >> mTimerIntervalShift));
break;
}
}
Expand All @@ -367,9 +367,9 @@ void ReliableMessageManager::ResumeRetransTable(ReliableMessageContext * rc)
{
for (int i = 0; i < CHIP_CONFIG_RMP_RETRANS_TABLE_SIZE; i++)
{
if (RetransTable[i].rc == rc)
if (mRetransTable[i].rc == rc)
{
RetransTable[i].nextRetransTimeTick = 0;
mRetransTable[i].nextRetransTimeTick = 0;
break;
}
}
Expand All @@ -379,10 +379,10 @@ bool ReliableMessageManager::CheckAndRemRetransTable(ReliableMessageContext * rc
{
for (int i = 0; i < CHIP_CONFIG_RMP_RETRANS_TABLE_SIZE; i++)
{
if ((RetransTable[i].rc == rc) && RetransTable[i].retainedBuf.GetMsgId() == ackMsgId)
if ((mRetransTable[i].rc == rc) && mRetransTable[i].retainedBuf.GetMsgId() == ackMsgId)
{
// Clear the entry from the retransmision table.
ClearRetransmitTable(RetransTable[i]);
ClearRetransmitTable(mRetransTable[i]);

#if !defined(NDEBUG)
ChipLogProgress(ExchangeManager, "Rxd Ack; Removing MsgId:%08" PRIX32 " from Retrans Table", ackMsgId);
Expand Down Expand Up @@ -443,10 +443,10 @@ void ReliableMessageManager::ClearRetransmitTable(ReliableMessageContext * rc)
{
for (int i = 0; i < CHIP_CONFIG_RMP_RETRANS_TABLE_SIZE; i++)
{
if (RetransTable[i].rc == rc)
if (mRetransTable[i].rc == rc)
{
// Clear the retransmit table entry.
ClearRetransmitTable(RetransTable[i]);
ClearRetransmitTable(mRetransTable[i]);
}
}
}
Expand Down Expand Up @@ -489,10 +489,10 @@ void ReliableMessageManager::FailRetransmitTableEntries(ReliableMessageContext *
{
for (int i = 0; i < CHIP_CONFIG_RMP_RETRANS_TABLE_SIZE; i++)
{
if (RetransTable[i].rc == rc)
if (mRetransTable[i].rc == rc)
{
// Remove the entry from the retransmission table.
ClearRetransmitTable(RetransTable[i]);
ClearRetransmitTable(mRetransTable[i]);

// Application callback OnSendError.
rc->mDelegate->OnSendError(err);
Expand Down Expand Up @@ -527,7 +527,7 @@ void ReliableMessageManager::StartTimer()

for (int i = 0; i < CHIP_CONFIG_RMP_RETRANS_TABLE_SIZE; i++)
{
ReliableMessageContext * rc = RetransTable[i].rc;
ReliableMessageContext * rc = mRetransTable[i].rc;
if (rc)
{
// When do we need to next wake up for throttle retransmission?
Expand All @@ -541,9 +541,9 @@ void ReliableMessageManager::StartTimer()
}

// When do we need to next wake up for ReliableMessageProtocol retransmit?
if (RetransTable[i].nextRetransTimeTick < nextWakeTimeTick)
if (mRetransTable[i].nextRetransTimeTick < nextWakeTimeTick)
{
nextWakeTimeTick = RetransTable[i].nextRetransTimeTick;
nextWakeTimeTick = mRetransTable[i].nextRetransTimeTick;
foundWake = true;
#if defined(RMP_TICKLESS_DEBUG)
ChipLogProgress(ExchangeManager, "ReliableMessageManager::StartTimer RetransTime %u", nextWakeTimeTick);
Expand Down Expand Up @@ -593,7 +593,7 @@ void ReliableMessageManager::StartTimer()
StopTimer();
}

TicklessDebugDumpRetransTable("ReliableMessageManager::StartTimer Dumping RetransTable entries after setting wakeup times");
TicklessDebugDumpRetransTable("ReliableMessageManager::StartTimer Dumping mRetransTable entries after setting wakeup times");
}

void ReliableMessageManager::StopTimer()
Expand All @@ -606,7 +606,7 @@ int ReliableMessageManager::TestGetCountRetransTable()
int count = 0;
for (int i = 0; i < CHIP_CONFIG_RMP_RETRANS_TABLE_SIZE; i++)
{
ReliableMessageContext * rc = RetransTable[i].rc;
ReliableMessageContext * rc = mRetransTable[i].rc;
if (rc)
count++;
}
Expand Down
2 changes: 1 addition & 1 deletion src/messaging/ReliableMessageManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class ReliableMessageManager
void TicklessDebugDumpRetransTable(const char * log);

// ReliableMessageProtocol Global tables for timer context
RetransTableEntry RetransTable[CHIP_CONFIG_RMP_RETRANS_TABLE_SIZE];
RetransTableEntry mRetransTable[CHIP_CONFIG_RMP_RETRANS_TABLE_SIZE];
};

} // namespace Messaging
Expand Down