Skip to content

Commit

Permalink
Made the temporary SortableSessions list an array on stack as opposed to
Browse files Browse the repository at this point in the history 
being allocated out of the heap.
  • Loading branch information
@mrjerryjohns
mrjerryjohns committed Jun 23, 2022
1 parent e36ef6e commit 279b206
Show file tree
Hide file tree
Showing 2 changed files with 77 additions and 84 deletions.
10 changes: 0 additions & 10 deletions src/controller/python/test/test_scripts/mobile-device-test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,16 +81,6 @@ def ethernet_commissioning(test: BaseTestHelper, discriminator: int, setup_pin:
nodeid=1))
FailIfNot(ok, "Failed to commission multi-fabric")

#
# Run this before the MultiFabric test, since it will result in the resultant CASE session
# on fabric2 to be evicted (due to the stressful nature of that test) on the target.
#
# It doesn't actually evict the CASE session for fabric2 on the client, since we prioritize
# defunct sessions for eviction first, which means our CASE session on fabric2 remains preserved
# throughout the stress test. This results in a mis-match later.
#
# TODO: Once we implement fabric-adjusted LRU, we should see if this issue remains (it shouldn't)
#
logger.info("Testing CASE Eviction")
FailIfNot(asyncio.run(test.TestCaseEviction(device_nodeid)), "Failed TestCaseEviction")

Expand Down
151 changes: 77 additions & 74 deletions src/transport/SecureSessionTable.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,16 +121,16 @@ SecureSession * SecureSessionTable::EvictAndAllocate(uint16_t localSessionId, Se
// session table, but are swappable. This allows them to then be used with a sorting algorithm
// without affecting the sessions in the table itself.
//
Platform::ScopedMemoryBufferWithSize<SortableSession> sortableSessions;
sortableSessions.Calloc(mEntries.Allocated());
if (!sortableSessions)
{
VerifyOrDieWithMsg(false, SecureChannel, "We couldn't allocate a session!");
return nullptr;
}
SortableSession sortableSessions[CHIP_CONFIG_SECURE_SESSION_POOL_SIZE];

unsigned int index = 0;

//
// Compute two key stats for each session - the number of other sessions that
// match its fabric, as well as the number of other sessions that match its peer.
//
// This will be used by the session eviction algorithm later.
//
ForEachSession([&index, &sortableSessions, this](auto session) {
sortableSessions[index].mSession = session;
sortableSessions[index].mNumMatchingOnFabric = 0;
Expand All @@ -157,7 +157,7 @@ SecureSession * SecureSessionTable::EvictAndAllocate(uint16_t localSessionId, Se
return Loop::Continue;
});

auto sortableSessionSpan = Span<SortableSession>(sortableSessions.Get(), mEntries.Allocated());
auto sortableSessionSpan = Span<SortableSession>(sortableSessions, mEntries.Allocated());
EvictionPolicyContext policyContext(sortableSessionSpan, sessionEvictionHint);

DefaultEvictionPolicy(policyContext);
Expand All @@ -167,19 +167,19 @@ SecureSession * SecureSessionTable::EvictAndAllocate(uint16_t localSessionId, Se

#if CHIP_DETAIL_LOGGING
ChipLogDetail(SecureChannel, "Sorted Eviction Candidates (ranked from best candidate to worst):");
for (auto * session = sortableSessions.Get(); session != (sortableSessions.Get() + numSessions); session++)
for (auto * session = sortableSessions; session != (sortableSessions + numSessions); session++)
{
ChipLogDetail(SecureChannel,
"\t%ld: [%p] -- Peer: [%u:" ChipLogFormatX64
"] State: '%s', NumMatchingOnFabric: %d NumMatchingOnPeer: %d ActivityTime: %lu",
static_cast<long int>(session - sortableSessions.Get()), session->mSession,
static_cast<long int>(session - sortableSessions), session->mSession,
session->mSession->GetPeer().GetFabricIndex(), ChipLogValueX64(session->mSession->GetPeer().GetNodeId()),
session->mSession->GetStateStr(), session->mNumMatchingOnFabric, session->mNumMatchingOnPeer,
static_cast<unsigned long>(session->mSession->GetLastActivityTime().count()));
}
#endif

for (auto * session = sortableSessions.Get(); session != (sortableSessions.Get() + numSessions); session++)
for (auto * session = sortableSessions; session != (sortableSessions + numSessions); session++)
{
if (session->mSession->IsPendingEviction())
{
Expand Down Expand Up @@ -220,69 +220,6 @@ SecureSession * SecureSessionTable::EvictAndAllocate(uint16_t localSessionId, Se

void SecureSessionTable::DefaultEvictionPolicy(EvictionPolicyContext & evictionContext)
{
#if 0
evictionContext.Sort([](const auto & a, const auto & b) {
int aStateScore = 0, bStateScore = 0;

auto assignStateScore = [](auto & score, const auto & session) {
if (session.IsDefunct())
{
score = 2;
}
else if (session.IsActiveSession())
{
score = 1;
}
else
{
score = 0;
}
};

assignStateScore(aStateScore, *a.mSession);
assignStateScore(bStateScore, *b.mSession);

if (aStateScore > bStateScore) {
return true;
}

if (aStateScore == bStateScore) {
return (a->GetLastActivityTime() < b->GetLastActivityTime());
}

return false;
});

evictionContext.Sort([&evictionContext](const SortableSession& a, const SortableSession& b) {
(void)evictionContext;

if (a.mNumMatchingOnPeer > b.mNumMatchingOnPeer) {
return true;
}

if (a.mNumMatchingOnPeer == b.mNumMatchingOnPeer) {
int ScoreA = a.mSession->GetPeer() == evictionContext.GetSessionEvictionHint();
int ScoreB = b.mSession->GetPeer() == evictionContext.GetSessionEvictionHint();
return (ScoreA > ScoreB);
}

return false;
});

evictionContext.Sort([&evictionContext](const SortableSession& a, const SortableSession& b) {
if (a.mNumMatchingOnFabric > b.mNumMatchingOnFabric) {
return true;
}

if (a.mNumMatchingOnFabric == b.mNumMatchingOnFabric) {
int ScoreA = a.mSession->GetPeer().GetFabricIndex() == evictionContext.GetSessionEvictionHint().GetFabricIndex();
int ScoreB = b.mSession->GetPeer().GetFabricIndex() == evictionContext.GetSessionEvictionHint().GetFabricIndex();
return (ScoreA > ScoreB);
}

return false;
});
#else
evictionContext.Sort([&evictionContext](const SortableSession & a, const SortableSession & b) {
//
// Sorting on Key1
Expand Down Expand Up @@ -370,6 +307,72 @@ void SecureSessionTable::DefaultEvictionPolicy(EvictionPolicyContext & evictionC
}
}

return false;
});

#if 0
//
// Alternative implementation that uses multiple sorts.
//
evictionContext.Sort([](const auto & a, const auto & b) {
int aStateScore = 0, bStateScore = 0;

auto assignStateScore = [](auto & score, const auto & session) {
if (session.IsDefunct())
{
score = 2;
}
else if (session.IsActiveSession())
{
score = 1;
}
else
{
score = 0;
}
};

assignStateScore(aStateScore, *a.mSession);
assignStateScore(bStateScore, *b.mSession);

if (aStateScore > bStateScore) {
return true;
}

if (aStateScore == bStateScore) {
return (a->GetLastActivityTime() < b->GetLastActivityTime());
}

return false;
});

evictionContext.Sort([&evictionContext](const SortableSession& a, const SortableSession& b) {
(void)evictionContext;

if (a.mNumMatchingOnPeer > b.mNumMatchingOnPeer) {
return true;
}

if (a.mNumMatchingOnPeer == b.mNumMatchingOnPeer) {
int ScoreA = a.mSession->GetPeer() == evictionContext.GetSessionEvictionHint();
int ScoreB = b.mSession->GetPeer() == evictionContext.GetSessionEvictionHint();
return (ScoreA > ScoreB);
}

return false;
});

evictionContext.Sort([&evictionContext](const SortableSession& a, const SortableSession& b) {
if (a.mNumMatchingOnFabric > b.mNumMatchingOnFabric) {
return true;
}

if (a.mNumMatchingOnFabric == b.mNumMatchingOnFabric) {
int ScoreA = a.mSession->GetPeer().GetFabricIndex() == evictionContext.GetSessionEvictionHint().GetFabricIndex();
int ScoreB = b.mSession->GetPeer().GetFabricIndex() == evictionContext.GetSessionEvictionHint().GetFabricIndex();
return (ScoreA > ScoreB);
}

return false;
});
#endif
Expand Down

0 comments on commit 279b206

Please sign in to comment.