Allow configure to force use of hwloc even when it is unnecessary (#12)

* Added option to build using hwloc even when it is not required and fixed unit tests.
* Updated tests to test with and without hwloc on linux and fixed hwloc implementation.
* Now the code builds with -Wall -Werror -pedantic (because @eddelbuettel likes it that way)

Author: dcdillon

.travis.yml

@@ -16,7 +16,7 @@ compiler:
 before_install:
   - echo $LANG
   - echo $LC_ALL
-  - sudo apt-get update && sudo apt-get install -y automake autoconf
+  - sudo apt-get update && sudo apt-get install -y automake autoconf libhwloc-dev
   - if [ $CXX == g++ ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; sudo apt-get update -qq; fi
 
 install:
@@ -26,7 +26,7 @@ before_script:
   - if [ $TRAVIS_OS_NAME == linux ]; then ./bootstrap.sh; fi
 
 script: 
-  - ./configure && make && make check
+  - ./configure && make && make check && ./cleanup.sh && ./bootstrap.sh && ./configure --with-hwloc && make && make check
 
 notifications:
   email:

configure.ac

@@ -31,4 +31,10 @@ case $host in
 		;;
 esac
 
+AC_ARG_WITH([hwloc], AS_HELP_STRING([--with-hwloc],
+	    [Use hwloc library even if this platform doesn't require it]),
+	    CPPFLAGS="$CPPFLAGS -DCPUAFF_USE_HWLOC" LIBS="$LIBS -lhwloc")
+	   
+CXXFLAGS="$CXXFLAGS -Wall -Werror -pedantic"
+
 AC_OUTPUT

include/cpuaff/config.hpp

@@ -112,4 +112,4 @@ namespace cpuaff
 typedef basic_traits< impl::null::traits, impl::null::traits > traits;
 }  // namespace cpuaff
 
-#endif
+#endif

include/cpuaff/impl/basic_affinity_manager.hpp

@@ -152,7 +152,7 @@ class basic_affinity_manager
     {
         if (has_cpus())
         {
-            if (i >= 0 && i < cpu_by_index_.size())
+            if (i >= 0 && uint32_t(i) < cpu_by_index_.size())
             {
                 cpu = cpu_by_index_[i];
                 return true;

include/cpuaff/impl/basic_affinity_stack.hpp

@@ -126,4 +126,4 @@ class basic_affinity_stack
     std::stack< cpu_set_type > affinity_stack_;
 };
 }  // namespace impl
-}  // namespace cpuaff
+}  // namespace cpuaff

include/cpuaff/impl/basic_cpu.hpp

@@ -161,4 +161,4 @@ class basic_cpu
     numa_type numa_;
 };
 }  // namespace impl
-}  // namespace cpuaff
+}  // namespace cpuaff

include/cpuaff/impl/basic_cpu_set.hpp

@@ -66,4 +66,4 @@ class basic_cpu_set : public std::set< basic_cpu< TRAITS > >
 };
 
 }  // namespace impl
-}  // namespace cpuaff
+}  // namespace cpuaff

include/cpuaff/impl/hwloc_impl/hwloc.hpp

@@ -39,6 +39,8 @@
 
 #include <hwloc.h>
 #include <iostream>
+#include <cstdio>
+
 namespace cpuaff
 {
 namespace impl
@@ -214,9 +216,9 @@ struct set_affinity
         hwloc_cpuset_t cpu_set = hwloc_bitmap_alloc();
         hwloc_bitmap_zero(cpu_set);
 
-        typename std::set< cpu_identifier_wrapper >::const_iterator i =
+        std::set< cpu_identifier_wrapper >::const_iterator i =
             cpus.begin();
-        typename std::set< cpu_identifier_wrapper >::const_iterator iend =
+        std::set< cpu_identifier_wrapper >::const_iterator iend =
             cpus.end();
 
         for (; i != iend; ++i)
@@ -227,6 +229,8 @@ struct set_affinity
         bool retval = (0 == hwloc_set_cpubind(topology::instance().get(),
                                               cpu_set, HWLOC_CPUBIND_THREAD));
         hwloc_bitmap_free(cpu_set);
+        
+        return retval;
     }
 };
 

include/cpuaff/impl/linux_impl/pci_device_reader.hpp

@@ -176,4 +176,4 @@ class pci_device_reader
 
 }  // namespace linux_impl
 }  // namespace impl
-}  // namespace cpuaff
+}  // namespace cpuaff

include/cpuaff/impl/linux_impl/set_reader.hpp

@@ -96,4 +96,4 @@ inline bool read_int_set(std::set< int32_t > &set, const std::string &str)
 }  // namespace set_reader
 }  // namespace linux_impl
 }  // namespace impl
-}  // namespace cpuaff
+}  // namespace cpuaff