MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-12 13:01:07 +01:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:init::backfill: Improve worker termination and release of context.

Browse source
This commit is contained in:
Jason Volk 2020-11-19 12:34:47 -08:00
parent d16dca495f
commit 7d091f8d55
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
matrix/init_backfill.cc
View file

@ -16,7 +16,7 @@ namespace ircd::m::init::backfill
extern size_t count, complete;
extern ircd::run::changed handle_quit;
extern std::unique_ptr<context> worker_context;
extern ctx::ctx *worker_context;
extern ctx::pool *worker_pool;
extern conf::item<seconds> delay;
extern conf::item<seconds> gossip_timeout;
@ -100,11 +100,7 @@ ircd::m::init::backfill::handle_quit
{
run::level::QUIT, []
{
if(worker_context)
worker_context->terminate();
if(worker_pool)
worker_pool->terminate();
fini();
}
};
@ -122,23 +118,25 @@ ircd::m::init::backfill::init()
return;
}
assert(!worker_context);
worker_context.reset(new context
ctx::context context
{
"m.init.backfill",
512_KiB,
&worker,
context::POST
});
};
// Detach into the worker_context ptr. When the worker finishes it
// will free itself.
assert(!worker_context);
worker_context = context.detach();
}
void
ircd::m::init::backfill::fini()
noexcept
{
if(!worker_context)
return;
if(worker_context)
log::debug
{
log, "Terminating worker context..."
@ -147,7 +145,11 @@ noexcept
if(worker_pool)
worker_pool->terminate();
worker_context.reset(nullptr);
if(worker_context)
{
ctx::terminate(*worker_context);
worker_context = nullptr;
}
}
void