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

ircd::ctx: Fix detach-mode deallocation points.

Browse source
This commit is contained in:
Jason Volk 2019-03-30 13:07:52 -07:00
parent b6732b5fdf
commit 672bb6f10c
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ircd/ctx.cc
View file

@ -96,15 +96,15 @@ noexcept try
notes = 1;
stack.base = uintptr_t(__builtin_frame_address(0));
mark(prof::event::ENTER);
const unwind atexit([this]
const unwind atexit{[this]
{
mark(prof::event::LEAVE);
adjoindre.notify_all();
this->yc = nullptr;
ircd::ctx::current = nullptr;
if(flags & context::DETACH)
if(flags & context::DETACH && !std::uncaught_exceptions())
delete this;
});
}};
// Check for a precocious interrupt
interruption_point();
@ -117,10 +117,14 @@ noexcept try
catch(const ircd::ctx::interrupted &)
{
assert(!std::uncaught_exceptions());
if(flags & context::DETACH)
delete this;
}
catch(const ircd::ctx::terminated &)
{
assert(!std::uncaught_exceptions());
if(flags & context::DETACH)
delete this;
}
catch(const std::exception &e)
{
@ -131,15 +135,10 @@ catch(const std::exception &e)
id,
e.what()
};
}
catch(...)
{
log::critical
{
log, "ctx('%s' id:%u): unexpected",
name,
id
};
assert(!std::uncaught_exceptions());
if(flags & context::DETACH)
delete this;
}
/// Direct context switch to this context.