Skip to content

Commit

Permalink
vector size() returns size_t
Browse files Browse the repository at this point in the history
  • Loading branch information
mikaelarguedas committed Feb 8, 2018
1 parent 25a6677 commit 6af51e5
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion include/class_loader/multi_library_class_loader.h
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ class MultiLibraryClassLoader
{
std::vector<std::string> available_classes;
ClassLoaderVector loaders = getAllAvailableClassLoaders();
for (unsigned int c = 0; c < loaders.size(); c++) {
for (size_t c = 0; c < loaders.size(); c++) {
ClassLoader * current = loaders.at(c);
std::vector<std::string> loader_classes = current->getAvailableClasses<Base>();
available_classes.insert(
Expand Down
26 changes: 13 additions & 13 deletions src/class_loader_core.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,8 @@ bool isLibraryLoadedByAnybody(const std::string & library_path)
bool isLibraryLoaded(const std::string & library_path, ClassLoader * loader)
{
bool is_lib_loaded_by_anyone = isLibraryLoadedByAnybody(library_path);
int num_meta_objs_for_lib = allMetaObjectsForLibrary(library_path).size();
int num_meta_objs_for_lib_bound_to_loader =
size_t num_meta_objs_for_lib = allMetaObjectsForLibrary(library_path).size();
size_t num_meta_objs_for_lib_bound_to_loader =
allMetaObjectsForLibraryOwnedBy(library_path, loader).size();
bool are_meta_objs_bound_to_loader =
(0 == num_meta_objs_for_lib) ? true : (
Expand All @@ -321,7 +321,7 @@ std::vector<std::string> getAllLibrariesUsedByClassLoader(const ClassLoader * lo
{
MetaObjectVector all_loader_meta_objs = allMetaObjectsForClassLoader(loader);
std::vector<std::string> all_libs;
for (unsigned int c = 0; c < all_loader_meta_objs.size(); c++) {
for (size_t c = 0; c < all_loader_meta_objs.size(); c++) {
std::string lib_path = all_loader_meta_objs.at(c)->getAssociatedLibraryPath();
if (std::find(all_libs.begin(), all_libs.end(), lib_path) == all_libs.end()) {
all_libs.push_back(lib_path);
Expand All @@ -337,7 +337,7 @@ void addClassLoaderOwnerForAllExistingMetaObjectsForLibrary(
const std::string & library_path, ClassLoader * loader)
{
MetaObjectVector all_meta_objs = allMetaObjectsForLibrary(library_path);
for (unsigned int c = 0; c < all_meta_objs.size(); c++) {
for (size_t c = 0; c < all_meta_objs.size(); c++) {
AbstractMetaObjectBase * meta_obj = all_meta_objs.at(c);
CONSOLE_BRIDGE_logDebug(
"class_loader.class_loader_private: "
Expand Down Expand Up @@ -484,7 +484,7 @@ void loadLibrary(const std::string & library_path, ClassLoader * loader)
library_path.c_str(), reinterpret_cast<void *>(library_handle));

// Graveyard scenario
unsigned int num_lib_objs = allMetaObjectsForLibrary(library_path).size();
size_t num_lib_objs = allMetaObjectsForLibrary(library_path).size();
if (0 == num_lib_objs) {
CONSOLE_BRIDGE_logDebug(
"class_loader.class_loader_private: "
Expand All @@ -503,7 +503,7 @@ void loadLibrary(const std::string & library_path, ClassLoader * loader)
purgeGraveyardOfMetaobjects(library_path, loader, true);
}

// Insert library into global loaded library vectory
// Insert library into global loaded library vector
boost::recursive_mutex::scoped_lock llv_lock(getLoadedLibraryVectorMutex());
LibraryVector & open_libraries = getLoadedLibraryVector();
// Note: Poco::SharedLibrary automatically calls load() when library passed to constructor
Expand Down Expand Up @@ -572,33 +572,33 @@ void unloadLibrary(const std::string & library_path, ClassLoader * loader)
void printDebugInfoToScreen()
{
printf("*******************************************************************************\n");
printf("***** class_loader_private DEBUG INFORMATION *****\n");
printf("***** class_loader_private DEBUG INFORMATION *****\n");
printf("*******************************************************************************\n");

printf("OPEN LIBRARIES IN MEMORY:\n");
printf("--------------------------------------------------------------------------------\n");
boost::recursive_mutex::scoped_lock lock(getLoadedLibraryVectorMutex());
LibraryVector libs = getLoadedLibraryVector();
for (unsigned int c = 0; c < libs.size(); c++) {
for (size_t c = 0; c < libs.size(); c++) {
printf(
"Open library %i = %s (Poco SharedLibrary handle = %p)\n",
"Open library %zu = %s (Poco SharedLibrary handle = %p)\n",
c, (libs.at(c)).first.c_str(), reinterpret_cast<void *>((libs.at(c)).second));
}

printf("METAOBJECTS (i.e. FACTORIES) IN MEMORY:\n");
printf("--------------------------------------------------------------------------------\n");
MetaObjectVector meta_objs = allMetaObjects();
for (unsigned int c = 0; c < meta_objs.size(); c++) {
for (size_t c = 0; c < meta_objs.size(); c++) {
AbstractMetaObjectBase * obj = meta_objs.at(c);
printf("Metaobject %i (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());

ClassLoaderVector loaders = obj->getAssociatedClassLoaders();
for (unsigned int i = 0; i < loaders.size(); i++) {
printf(" Associated Loader %i = %p\n", i, reinterpret_cast<void *>(loaders.at(i)));
for (size_t i = 0; i < loaders.size(); i++) {
printf(" Associated Loader %zu = %p\n", i, reinterpret_cast<void *>(loaders.at(i)));
}
printf("--------------------------------------------------------------------------------\n");
}
Expand Down
2 changes: 1 addition & 1 deletion src/multi_library_class_loader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ void MultiLibraryClassLoader::loadLibrary(const std::string & library_path)
void MultiLibraryClassLoader::shutdownAllClassLoaders()
{
std::vector<std::string> available_libraries = getRegisteredLibraries();
for (unsigned int c = 0; c < available_libraries.size(); c++) {
for (size_t c = 0; c < available_libraries.size(); c++) {
unloadLibrary(available_libraries.at(c));
}
}
Expand Down
6 changes: 3 additions & 3 deletions test/unique_ptr_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ void wait(int seconds)
void run(ClassLoader * loader)
{
std::vector<std::string> classes = loader->getAvailableClasses<Base>();
for (unsigned int c = 0; c < classes.size(); c++) {
for (size_t c = 0; c < classes.size(); c++) {
loader->createUniqueInstance<Base>(classes.at(c))->saySomething();
}
}
Expand All @@ -123,11 +123,11 @@ TEST(ClassLoaderUniquePtrTest, threadSafety) {
try {
std::vector<boost::thread> client_threads;

for (unsigned int c = 0; c < 1000; c++) {
for (size_t c = 0; c < 1000; c++) {
client_threads.emplace_back(std::bind(&run, &loader1));
}

for (unsigned int c = 0; c < client_threads.size(); c++) {
for (size_t c = 0; c < client_threads.size(); c++) {
client_threads.at(c).join();
}

Expand Down
8 changes: 4 additions & 4 deletions test/utest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ void wait(int seconds)
void run(class_loader::ClassLoader * loader)
{
std::vector<std::string> classes = loader->getAvailableClasses<Base>();
for (unsigned int c = 0; c < classes.size(); c++) {
for (size_t c = 0; c < classes.size(); c++) {
loader->createInstance<Base>(classes.at(c))->saySomething();
}
}
Expand All @@ -173,15 +173,15 @@ TEST(ClassLoaderTest, threadSafety) {
try {
std::vector<boost::thread *> client_threads;

for (unsigned int c = 0; c < 1000; c++) {
for (size_t c = 0; c < 1000; c++) {
client_threads.push_back(new boost::thread(boost::bind(&run, &loader1)));
}

for (unsigned int c = 0; c < client_threads.size(); c++) {
for (size_t c = 0; c < client_threads.size(); c++) {
client_threads.at(c)->join();
}

for (unsigned int c = 0; c < client_threads.size(); c++) {
for (size_t c = 0; c < client_threads.size(); c++) {
delete (client_threads.at(c));
}

Expand Down

0 comments on commit 6af51e5

Please sign in to comment.