Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

code style only: wrap after open parenthesis if not in one line #138

Merged
merged 1 commit into from
Feb 3, 2020
Merged

code style only: wrap after open parenthesis if not in one line #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion include/class_loader/class_loader.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,8 @@ class ClassLoader
ClassLoader::hasUnmanagedInstanceBeenCreated() &&
isOnDemandLoadUnloadEnabled())
{
CONSOLE_BRIDGE_logInform("%s",
CONSOLE_BRIDGE_logInform(
"%s",
"class_loader::ClassLoader: "
"An attempt is being made to create a managed plugin instance (i.e. boost::shared_ptr), "
"however an unmanaged instance was created within this process address space. "
Expand Down
6 changes: 4 additions & 2 deletions include/class_loader/class_loader_core.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,8 @@ void registerPlugin(const std::string & class_name, const std::string & base_cla
getCurrentlyLoadingLibraryName().c_str());

if (nullptr == getCurrentlyActiveClassLoader()) {
CONSOLE_BRIDGE_logDebug("%s",
CONSOLE_BRIDGE_logDebug(
"%s",
"class_loader.impl: ALERT!!! "
"A library containing plugins has been opened through a means other than through the "
"class_loader or pluginlib package. "
Expand Down Expand Up @@ -274,7 +275,8 @@ Base * createInstance(const std::string & derived_class_name, ClassLoader * load

if (nullptr == obj) { // Was never created
if (factory && factory->isOwnedBy(nullptr)) {
CONSOLE_BRIDGE_logDebug("%s",
CONSOLE_BRIDGE_logDebug(
"%s",
"class_loader.impl: ALERT!!! "
"A metaobject (i.e. factory) exists for desired class, but has no owner. "
"This implies that the library containing the class was dlopen()ed by means other than "
Expand Down
12 changes: 8 additions & 4 deletions src/class_loader_core.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,8 @@ void purgeGraveyardOfMetaobjects(
itr = graveyard.erase(itr);
if (delete_objs) {
if (is_address_in_graveyard_same_as_global_factory_map) {
CONSOLE_BRIDGE_logDebug("%s",
CONSOLE_BRIDGE_logDebug(
"%s",
"class_loader.impl: "
"Newly created metaobject factory in global factory map map has same address as "
"one in graveyard -- metaobject has been purged from graveyard but not deleted.");
Expand Down Expand Up @@ -436,7 +437,8 @@ void loadLibrary(const std::string & library_path, ClassLoader * loader)

// If it's already open, just update existing metaobjects to have an additional owner.
if (isLibraryLoadedByAnybody(library_path)) {
CONSOLE_BRIDGE_logDebug("%s",
CONSOLE_BRIDGE_logDebug(
"%s",
"class_loader.impl: "
"Library already in memory, but binding existing MetaObjects to loader if necesesary.\n");
addClassLoaderOwnerForAllExistingMetaObjectsForLibrary(library_path, loader);
Expand Down Expand Up @@ -587,15 +589,17 @@ void printDebugInfoToScreen()
MetaObjectVector meta_objs = allMetaObjects();
for (size_t c = 0; c < meta_objs.size(); c++) {
AbstractMetaObjectBase * obj = meta_objs.at(c);
printf("Metaobject %zu (ptr = %p):\n TypeId = %s\n Associated Library = %s\n",
printf(
"Metaobject %zu (ptr = %p):\n TypeId = %s\n Associated Library = %s\n",
c,
reinterpret_cast<void *>(obj),
(typeid(*obj).name()),
obj->getAssociatedLibraryPath().c_str());

size_t size = obj->getAssociatedClassLoadersCount();
for (size_t i = 0; i < size; ++i) {
printf(" Associated Loader %zu = %p\n",
printf(
" Associated Loader %zu = %p\n",
i, reinterpret_cast<void *>(obj->getAssociatedClassLoader(i)));
}
printf("--------------------------------------------------------------------------------\n");
Expand Down