MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-26 15:33:54 +01:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:fetch: Improve handle worker; request_cleanup() related.

Browse source
This commit is contained in:
Jason Volk 2019-09-03 17:05:52 -07:00
parent cca4f223ff
commit 2c3aca9a4a
1 changed files with 33 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
modules/m_fetch.cc
View file

@ -40,7 +40,7 @@ namespace ircd::m::fetch
static void handle_result(request &);
static bool handle(request &);
static void request_handle(const decltype(requests)::iterator &);
static bool request_handle(const decltype(requests)::iterator &);
static void request_handle();
static size_t request_cleanup();
static void request_worker();
@ -287,11 +287,6 @@ ircd::m::fetch::request_handle()
fetch::dock
};
const unwind cleanup
{
request_cleanup
};
static const auto dereferencer{[]
(auto &it) -> server::request &
{
@ -309,47 +304,50 @@ ircd::m::fetch::request_handle()
ctx::when_any(requests.begin(), requests.end(), dereferencer)
};
bool timeout{true};
bool timedout{true};
{
const unlock_guard unlock
{
lock
};
timeout = !next.wait(seconds(timeout), std::nothrow);
timedout = !next.wait(seconds(timeout), std::nothrow);
};
if(unlikely(timeout))
return;
const auto it
if(likely(!timedout))
{
next.get()
};
const auto it
{
next.get()
};
if(unlikely(it == end(requests)))
return;
if(it != end(requests))
if(!request_handle(it))
return;
}
request_handle(it);
request_cleanup();
}
void
bool
ircd::m::fetch::request_handle(const decltype(requests)::iterator &it)
{
auto &request
{
const_cast<fetch::request &>(*it)
mutable_cast(*it)
};
if(!request.finished)
if(!handle(request))
return;
return false;
requests.erase(it);
return true;
}
size_t
ircd::m::fetch::request_cleanup()
try
{
const auto now
{
@ -359,28 +357,17 @@ ircd::m::fetch::request_cleanup()
size_t ret(0);
for(auto it(begin(requests)); it != end(requests); ++it)
{
auto &request
{
const_cast<fetch::request &>(*it)
};
auto &request(mutable_cast(*it));
if(!request.started)
{
start(request);
continue;
}
if(!request.finished && timedout(request, now))
else if(!request.finished && timedout(request, now))
retry(request);
}
auto it(begin(requests)); while(it != end(requests))
{
auto &request
{
const_cast<fetch::request &>(*it)
};
auto &request(mutable_cast(*it));
if(!!request.finished)
{
it = requests.erase(it);
@ -391,6 +378,16 @@ ircd::m::fetch::request_cleanup()
return ret;
}
catch(const std::exception &e)
{
log::critical
{
log, "request_cleanup(): %s",
e.what(),
};
throw;
}
//
// fetch::request
@ -1013,4 +1010,6 @@ ircd::m::fetch::request::request(const fetch::opts &opts)
ircd::m::fetch::request::~request()
noexcept
{
//TODO: bad things unless this first here
future.reset(nullptr);
}