Hardening tests (#9)

Hardening tests and they now work on travis-ci properly.

Author: dcdillon

include/cpuaff/impl/basic_affinity_manager.hpp

@@ -409,6 +409,7 @@ class basic_affinity_manager
             cpus_by_numa_[i->numa].insert(cpu);
             cpus_by_socket_[i->spec.socket()].insert(cpu);
             cpus_by_core_[i->spec.core()].insert(cpu);
+            cpus_by_socket_and_core_[std::make_pair(i->spec.socket(), i->spec.core())].insert(cpu);
             cpus_by_processing_unit_[i->spec.processing_unit()].insert(cpu);
         }
 

include/cpuaff/impl/basic_cpu.hpp

@@ -141,27 +141,25 @@ class basic_cpu
         return spec_ == rhs.spec_;
     }
 
+    /*!
+     * Stream operator
+     *
+     * Print [id, numa, socket, core, processing unit]
+     *
+     */
+    friend std::ostream &operator<<(std::ostream &s,
+                         const basic_cpu &cpu)
+    {
+        s << "[id: " << cpu.id().get() << ", numa: " << cpu.numa()
+          << ", socket: " << cpu.socket() << ", core: " << cpu.core()
+          << ", processing_unit: " << cpu.processing_unit() << "]";
+        return s;
+    }
+
    private:
     cpu_spec spec_;
     cpu_identifier_wrapper_type id_;
     numa_type numa_;
 };
 }  // namespace impl
-}  // namespace cpuaff
-
-/*!
-* Stream operator
-*
-* Print [id, numa, socket, core, processing unit]
-*
-*/
-
-template < typename TRAITS >
-std::ostream &operator<<(std::ostream &s,
-                         const cpuaff::impl::basic_cpu< TRAITS > &cpu)
-{
-    s << "[id: " << cpu.id().get() << ", numa: " << cpu.numa()
-      << ", socket: " << cpu.socket() << ", core: " << cpu.core()
-      << ", processing_unit: " << cpu.processing_unit() << "]";
-    return s;
-}
+}  // namespace cpuaff

include/cpuaff/impl/basic_cpu_set.hpp

@@ -33,6 +33,7 @@
 #include "../config.hpp"
 #include "basic_cpu.hpp"
 #include <set>
+#include <iostream>
 
 namespace cpuaff
 {
@@ -44,6 +45,26 @@ namespace impl
 template < typename TRAITS >
 class basic_cpu_set : public std::set< basic_cpu< TRAITS > >
 {
+public:
+    friend std::ostream &operator<<(std::ostream &s, const basic_cpu_set &obj)
+    {
+        typename basic_cpu_set::const_iterator i = obj.begin();
+        typename basic_cpu_set::const_iterator iend = obj.end();
+        
+        for ( ; i != iend; ++i)
+        {
+            if (i != obj.begin())
+            {
+                s << ", ";
+            }
+            
+            s << (*i);
+        }
+        
+        return s;
+    }
 };
+
+
 }  // namespace impl
-}  // namespace cpuaff
+}  // namespace cpuaff

tests/Makefile.am

@@ -1,3 +1,2 @@
-exampledir = $(datarootdir)/cpuaff/examples
 noinst_PROGRAMS = test
 test_SOURCES = test.cpp catch.hpp