livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changing deferred retry behaviour

meow-7.2.2
Beq 2024-06-15 16:30:24 +01:00
parent e9a45d709c
commit 214af7a1ec
2 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
indra/llcommon/llqueuedthread.cpp
View File

@ -426,6 +426,20 @@ void LLQueuedThread::processRequest(LLQueuedThread::QueuedRequest* req)
// safe to access req.
if (req)
{
// <FS:Beq> Deferred retry requests
// Potentially when there is nothing else to do this will loop until the retry time.
// note that when there is nothing to do the thread still sleeps normally.
if( req->mDeferUntil > LL::WorkQueue::TimePoint::clock::now() )
{
LL_PROFILE_ZONE_NAMED("qtpr - defer requeue");
lockData();
req->setStatus(STATUS_QUEUED);
mRequestQueue.post([this, req]() { processRequest(req); });
unlockData();
mIdleThread = true;
return;
}
// </FS:Beq>
// process request
bool complete = req->processRequest();
@ -473,21 +487,26 @@ void LLQueuedThread::processRequest(LLQueuedThread::QueuedRequest* req)
llassert(ret);
#else
using namespace std::chrono_literals;
auto retry_time = LL::WorkQueue::TimePoint::clock::now() + 16ms;
mRequestQueue.post([=]
{
LL_PROFILE_ZONE_NAMED("processRequest - retry");
if (LL::WorkQueue::TimePoint::clock::now() < retry_time)
{
auto sleep_time = std::chrono::duration_cast<std::chrono::milliseconds>(retry_time - LL::WorkQueue::TimePoint::clock::now());
auto retry_time = LL::WorkQueue::TimePoint::clock::now() + 2ms; // <FS:Beq/> reduce delay on retry
// <FS:Beq> improve retry behaviour
// mRequestQueue.post([=]
// {
// LL_PROFILE_ZONE_NAMED("processRequest - retry");
// if (LL::WorkQueue::TimePoint::clock::now() < retry_time)
// {
// auto sleep_time = std::chrono::duration_cast<std::chrono::milliseconds>(retry_time - LL::WorkQueue::TimePoint::clock::now());
if (sleep_time.count() > 0)
{
ms_sleep(sleep_time.count());
}
}
processRequest(req);
});
// if (sleep_time.count() > 0)
// {
// ms_sleep(sleep_time.count());
// }
// }
// processRequest(req);
// });
req->defer_until(retry_time);
LL_PROFILE_ZONE_NAMED("processRequest - post deferred");
mRequestQueue.post([this, req]() { processRequest(req); });
// </FS:Beq>
#endif
}
@ -565,6 +584,7 @@ LLQueuedThread::QueuedRequest::QueuedRequest(LLQueuedThread::handle_t handle, U3
LLSimpleHashEntry<LLQueuedThread::handle_t>(handle),
mStatus(STATUS_UNKNOWN),
mFlags(flags)
,mDeferUntil(LL::WorkQueue::TimePoint::clock::now()) // <FS:Beq/> handle deffered retries without an enforced sleep
{
}

5
indra/llcommon/llqueuedthread.h
View File

@ -97,6 +97,10 @@ public:
// NOTE: flags are |'d
mFlags |= flags;
}
void defer_until(std::chrono::steady_clock::time_point time)
{
mDeferUntil = time;
}
virtual bool processRequest() = 0; // Return true when request has completed
virtual void finishRequest(bool completed); // Always called from thread after request has completed or aborted
@ -105,6 +109,7 @@ public:
protected:
LLAtomicBase<status_t> mStatus;
U32 mFlags;
std::chrono::steady_clock::time_point mDeferUntil;
};
//------------------------------------------------------------------------