MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2025-01-16 01:26:58 +01:00
Code Issues Releases Wiki Activity

modules/s_dns_resolver: Consolidate tag removal paths; ensure removals from sendq.

Browse source
This commit is contained in:
Jason Volk 2019-03-11 17:39:45 -07:00
parent 92d1416ecc
commit 981cdf03aa
2 changed files with 34 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
modules/s_dns_resolver.cc
View file

@ -243,7 +243,7 @@ ircd::net::dns::resolver::check_timeouts(const milliseconds &timeout)
const auto &id(it->first);
auto &tag(it->second);
if(check_timeout(id, tag, cutoff))
it = tags.erase(it);
it = remove(tag, it);
else
++it;
}
@ -326,8 +326,7 @@ ircd::net::dns::resolver::handle_post_error(const uint16_t id,
assert(tag.cb);
tag.cb(std::make_exception_ptr(ec), tag.hp, {});
const auto erased(tags.erase(tag.id));
assert(erased == 1);
remove(tag);
}
/// Internal resolver entry interface.
@ -344,7 +343,7 @@ ircd::net::dns::resolver::operator()(const hostport &hp,
// Escape trunk
const unwind::exceptional untag{[this, &tag]
{
tags.erase(tag.id);
remove(tag);
}};
tag.question = make_query(tag.qbuf, tag);
@ -411,6 +410,32 @@ ircd::net::dns::resolver::set_tag(A&&... args)
};
}
void
ircd::net::dns::resolver::remove(tag &tag)
{
remove(tag, tags.find(tag.id));
}
decltype(ircd::net::dns::resolver::tags)::iterator
ircd::net::dns::resolver::remove(tag &tag,
const decltype(tags)::iterator &it)
{
unqueue(tag);
return it != end(tags)? tags.erase(it) : it;
}
void
ircd::net::dns::resolver::unqueue(tag &tag)
{
const auto it
{
std::find(begin(sendq), end(sendq), tag.id)
};
if(it != end(sendq))
sendq.erase(it);
}
void
ircd::net::dns::resolver::queue_query(tag &tag)
{
@ -585,9 +610,9 @@ try
string(addr_strbuf[1], tag.server)
};
const unwind untag{[this, &it]
const unwind untag{[this, &tag, &it]
{
tags.erase(it);
remove(tag, it);
}};
log::debug

3
modules/s_dns_resolver.h
View file

@ -46,6 +46,9 @@ struct ircd::net::dns::resolver
void send_query(tag &);
void submit(tag &);
void unqueue(tag &);
void remove(tag &);
decltype(tags)::iterator remove(tag &, const decltype(tags)::iterator &);
template<class... A> tag &set_tag(A&&...);
static const_buffer make_query(const mutable_buffer &buf, const tag &);
void operator()(const hostport &, const opts &, callback &&);