MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-09-27 11:18:51 +02:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:fetch: Clear request on retry; elaborate comparator; minor cleanup.

Browse source
This commit is contained in:
Jason Volk 2019-09-03 22:14:53 -07:00
parent a205e722f3
commit 791c64c35b
1 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
modules/m_fetch.cc
View file

@ -290,11 +290,7 @@ ircd::m::fetch::request_handle()
static const auto dereferencer{[]
(auto &it) -> server::request &
{
auto &request
{
const_cast<fetch::request &>(*it)
};
auto &request(mutable_cast(*it));
assert(request.future);
return *request.future;
}};
@ -658,6 +654,12 @@ try
assert(!request.finished);
assert(!!request.started && !!request.last);
if(request.future)
{
server::cancel(*request.future);
request.future.reset(nullptr);
}
request.eptr = std::exception_ptr{};
request.origin = {};
start(request);
@ -946,9 +948,26 @@ bool
ircd::m::fetch::operator<(const opts &a, const opts &b)
noexcept
{
return uint(a.op) < uint(b.op) ||
a.event_id < b.event_id ||
a.room_id < b.room_id;
if(uint(a.op) < uint(b.op))
return true;
else if(uint(a.op) > uint(b.op))
return false;
else if(a.room_id < b.room_id)
return true;
else if(a.room_id > b.room_id)
return false;
else if(a.event_id < b.event_id)
return true;
else if(a.event_id > b.event_id)
return false;
assert(operator==(a, b));
return false;
}
bool