MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-09-28 19:58:53 +02:00
Code Issues Releases Wiki Activity

ircd::mods: Add workaround for dlclose() recursion issue.

Browse source
This commit is contained in:
Jason Volk 2017-04-02 22:59:30 -07:00
parent 7ff04618c0
commit 17926e095f
2 changed files with 37 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/ircd/mods.h
View file

@ -74,7 +74,10 @@ struct module
template<class T> const T &get(const std::string &name) const;
template<class T> T &get(const std::string &name);
module() = default;
module(std::shared_ptr<mod> ptr = {})
:std::shared_ptr<mod>{std::move(ptr)}
{}
module(const std::string &name);
~module() noexcept;
};

40
ircd/mods.cc
View file

@ -43,6 +43,7 @@ struct mod
filesystem::path path;
load_mode::type mode;
std::deque<mod *> children;
boost::dll::shared_library handle;
mapi::header *header;
@ -61,6 +62,8 @@ struct mod
template<class T = uint8_t> const T *ptr(const std::string &name) const;
template<class T = uint8_t> T *ptr(const std::string &name);
bool unload();
mod(const filesystem::path &,
const load_mode::type & = load_mode::rtld_local | load_mode::rtld_now);
@ -632,6 +635,7 @@ try
if(!loading.empty())
{
const auto &m(mod::loading.top());
m->children.emplace_back(this);
log.debug("Module '%s' recursively loaded by '%s'",
name(),
m->path.filename().string());
@ -663,15 +667,42 @@ bool ircd::mapi::static_destruction;
ircd::mods::mod::~mod()
noexcept try
{
unload();
}
catch(const std::exception &e)
{
log::critical("Module @%p unload: %s", (const void *)this, e.what());
if(!ircd::debugmode)
return;
}
bool
ircd::mods::mod::unload()
{
if(!handle.is_loaded())
return false;
const auto name(this->name());
log.debug("Attempting unload module '%s' @ `%s'", name, location());
const size_t erased(loaded.erase(name));
assert(erased == 1);
if(header->fini)
header->fini();
// Save the children! dlclose() does not like to be called recursively during static
// destruction of a module. The mod ctor recorded all of the modules loaded while this
// module was loading so we can reverse the record and unload them here.
// Note: If the user loaded more modules from inside their module they will have to dtor them
// before 'static destruction' does. They can also do that by adding them to this vector.
std::for_each(rbegin(this->children), rend(this->children), []
(mod *const &ptr)
{
if(shared_from(*ptr).use_count() <= 2)
ptr->unload();
});
log.debug("Attempting static unload for '%s' @ `%s'", name, location());
mapi::static_destruction = false;
handle.unload();
@ -683,13 +714,8 @@ noexcept try
} else {
log.info("Unloaded '%s'", name);
}
}
catch(const std::exception &e)
{
log::critical("Module @%p unload: %s", (const void *)this, e.what());
if(!ircd::debugmode)
return;
return true;
}
template<class T>