MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-26 15:33:54 +01:00
Code Issues Releases Wiki Activity

ircd::mods: Move the call to the init function after the mod ctor.

Browse source
This commit is contained in:
Jason Volk 2018-03-25 15:42:52 -07:00
parent 291b6dc286
commit 34abaea046
2 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/ircd/mods/module.h
View file

@ -35,7 +35,6 @@ struct ircd::mods::module
module(std::shared_ptr<mod> ptr = {});
module(const string_view &name);
~module() noexcept;
};
inline

32
ircd/mods.cc
View file

@ -263,7 +263,23 @@ try
name,
path.string());
return std::make_shared<mod>(path, flags);
const auto ret
{
std::make_shared<mod>(path, flags)
};
// Call the user-supplied init function well after fully loading and
// construction of the module. This way the init function sees the module
// as loaded and can make shared_ptr references, etc.
if(ret->header->init)
ret->header->init();
log.info("Loaded module %s v%u \"%s\"",
ret->name(),
ret->header->version,
!ret->description().empty()? ret->description() : "<no description>"s);
return ret;
}()}
{
}
@ -275,11 +291,6 @@ catch(const std::exception &e)
throw;
}
ircd::mods::module::~module()
noexcept
{
}
ircd::string_view
ircd::mods::module::path()
const
@ -723,15 +734,6 @@ try
m->path.filename().string());
}
// If init throws an exception from here the loading process will back out.
if(header->init)
header->init();
log.info("Loaded module %s v%u \"%s\"",
name(),
header->version,
description().size()? description() : "<no description>"s);
// Without init exception, the module is now considered loaded.
assert(!loaded.count(name()));
loaded.emplace(name(), this);