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

ircd: Towards a modern refactor of variadic arguments passed to functions.

Browse source
This commit is contained in:
Jason Volk 2017-03-20 19:26:23 -07:00
parent e48c93e42a
commit a8fc400130
1 changed files with 23 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
ircd/mods.cc
View file

@ -133,19 +133,14 @@ try
load_mode::rtld_now load_mode::rtld_now
}; };
log.debug("Attempting to load '%s' @ `%s'", log.debug("Attempting to load '%s' @ `%s'", filename, path.string());
filename.c_str(),
path.string().c_str());
return std::make_shared<mod>(path, flags); return std::make_shared<mod>(path, flags);
}()} }()}
{ {
} }
catch(const std::exception &e) catch(const std::exception &e)
{ {
log.error("Failed to load '%s': %s", log.error("Failed to load '%s': %s", name, e.what());
name.c_str(),
e.what());
throw; throw;
} }
@ -270,11 +265,9 @@ ircd::mods::fullpath(const std::string &name)
if(path.empty()) if(path.empty())
{ {
for(const auto &str : why) for(const auto &str : why)
log.error("candidate for module '%s' failed: %s", log.error("candidate for module '%s' failed: %s", name, str);
name.c_str(),
str.c_str());
throw error("No valid module by name `%s'", name.c_str()); throw error("No valid module by name `%s'", name);
} }
return path; return path;
@ -317,9 +310,7 @@ ircd::mods::available()
} }
catch(const filesystem::filesystem_error &e) catch(const filesystem::filesystem_error &e)
{ {
log.warning("Module path [%s]: %s", log.warning("Module path [%s]: %s", dir, e.what());
dir.c_str(),
e.what());
continue; continue;
} }
@ -375,20 +366,17 @@ bool
ircd::mods::is_module(const filesystem::path &path) ircd::mods::is_module(const filesystem::path &path)
{ {
if(!exists(path)) if(!exists(path))
throw filesystem_error("`%s' does not exist", throw filesystem_error("`%s' does not exist", path.string());
path.string().c_str());
if(!is_regular_file(path)) if(!is_regular_file(path))
throw filesystem_error("`%s' is not a file", throw filesystem_error("`%s' is not a file", path.string());
path.string().c_str());
const auto syms(symbols(path)); const auto syms(symbols(path));
const auto &header_name(mapi::header_symbol_name); const auto &header_name(mapi::header_symbol_name);
const auto it(std::find(begin(syms), end(syms), header_name)); const auto it(std::find(begin(syms), end(syms), header_name));
if(it == end(syms)) if(it == end(syms))
throw error("`%s': has no MAPI header (%s)", throw error("`%s': has no MAPI header (%s)", path.string(), header_name);
path.string().c_str(),
header_name);
return true; return true;
} }
@ -449,12 +437,10 @@ ircd::mods::info(const filesystem::path &path,
F&& closure) F&& closure)
{ {
if(!exists(path)) if(!exists(path))
throw filesystem_error("`%s' does not exist", throw filesystem_error("`%s' does not exist", path.string());
path.string().c_str());
if(!is_regular_file(path)) if(!is_regular_file(path))
throw filesystem_error("`%s' is not a file", throw filesystem_error("`%s' is not a file", path.string());
path.string().c_str());
boost::dll::library_info info(path); boost::dll::library_info info(path);
return closure(info); return closure(info);
@ -494,14 +480,10 @@ ircd::mods::paths::add(const std::string &dir)
const path path(prefix_if_relative(dir)); const path path(prefix_if_relative(dir));
if(!exists(path)) if(!exists(path))
throw filesystem_error("path `%s' (%s) does not exist", throw filesystem_error("path `%s' (%s) does not exist", dir, path.string());
dir.c_str(),
path.string().c_str());
if(!is_directory(path)) if(!is_directory(path))
throw filesystem_error("path `%s' (%s) is not a directory", throw filesystem_error("path `%s' (%s) is not a directory", dir, path.string());
dir.c_str(),
path.string().c_str());
if(added(dir)) if(added(dir))
return false; return false;
@ -586,17 +568,13 @@ try
&handle.get<mapi::header>(mapi::header_symbol_name) &handle.get<mapi::header>(mapi::header_symbol_name)
} }
{ {
log.debug("Loaded static segment of '%s' @ `%s'", log.debug("Loaded static segment of '%s' @ `%s'", name(), path.string());
name().c_str(),
path.string().c_str());
if(unlikely(!header)) if(unlikely(!header))
throw error("Unexpected null header"); throw error("Unexpected null header");
if(header->magic != mapi::MAGIC) if(header->magic != mapi::MAGIC)
throw error("Bad magic [%04x] need: [%04x]", throw error("Bad magic [%04x] need: [%04x]", header->magic, mapi::MAGIC);
header->magic,
mapi::MAGIC);
// Set some basic metadata // Set some basic metadata
auto &meta(header->meta); auto &meta(header->meta);
@ -610,9 +588,9 @@ try
// Without init exception, the module is now considered loaded. // Without init exception, the module is now considered loaded.
loaded.emplace(name(), this); loaded.emplace(name(), this);
log.info("Loaded module %s v%u \"%s\"", log.info("Loaded module %s v%u \"%s\"",
name().c_str(), name(),
header->version, header->version,
description().size()? description().c_str() : "<no description>"); description().size()? description() : "<no description>"s);
} }
catch(const boost::system::system_error &e) catch(const boost::system::system_error &e)
{ {
@ -628,9 +606,7 @@ ircd::mods::mod::~mod()
noexcept try noexcept try
{ {
const auto name(this->name()); const auto name(this->name());
log.debug("Attempting unload module '%s' @ `%s'", log.debug("Attempting unload module '%s' @ `%s'", name, location());
name.c_str(),
location().c_str());
const size_t erased(loaded.erase(name)); const size_t erased(loaded.erase(name));
assert(erased == 1); assert(erased == 1);
@ -638,26 +614,21 @@ noexcept try
if(header->fini) if(header->fini)
header->fini(); header->fini();
log.debug("Attempting static unload for '%s' @ `%s'", log.debug("Attempting static unload for '%s' @ `%s'", name, location());
name.c_str(),
location().c_str());
mapi::static_destruction = false; mapi::static_destruction = false;
handle.unload(); handle.unload();
assert(!handle.is_loaded()); assert(!handle.is_loaded());
if(!mapi::static_destruction) if(!mapi::static_destruction)
{ {
log.error("Module \"%s\" is stuck and failing to unload.", name.c_str()); log.error("Module \"%s\" is stuck and failing to unload.", name);
log.warning("Module \"%s\" may result in undefined behavior if not fixed.", name.c_str()); log.warning("Module \"%s\" may result in undefined behavior if not fixed.", name);
} else { } else {
log.info("Unloaded '%s'", name.c_str()); log.info("Unloaded '%s'", name);
} }
} }
catch(const std::exception &e) catch(const std::exception &e)
{ {
log::critical("Module @%p unload: %s", log::critical("Module @%p unload: %s", (const void *)this, e.what());
(const void *)this,
e.what());
if(!ircd::debugmode) if(!ircd::debugmode)
return; return;