Merge pull request #5 from iklionsky/master

added stream operator overloads for cpu_spec

Author: dcdillon

include/cpuaff/cpu_spec.hpp

@@ -31,6 +31,10 @@
 #pragma once
 
 #include "fwd.hpp"
+#include <string>
+#include <iostream>
+#include <stdlib.h>
+#include <sstream>
 
 namespace cpuaff
 {
@@ -63,6 +67,21 @@ class cpu_spec
     }
 
    public:
+    /*!
+     * Parse a string into a cpu_spec
+     *
+     * \param rhs the string to parse
+     *
+     * \return a cpu_spec parsed from the string
+     */
+    static inline cpu_spec parse(const std::string &rhs)
+    {
+        std::istringstream buf(rhs);
+        cpu_spec spec;
+        buf >> spec;
+        return spec;
+    }
+
     /*!
      * Get the zero based socket identifier for this cpu_spec.
      *
@@ -157,6 +176,32 @@ class cpu_spec
         return (socket_ == rhs.socket_ && core_ == rhs.core_ &&
                 processing_unit_ == rhs.processing_unit_);
     }
+    /*!
+    *  Stream in operator
+    *
+    * \parse a string triplet of socket,core,processing_unit into a cpu spec
+    */
+    friend inline std::istream &operator>>(std::istream &s, cpu_spec &rhs)
+    {
+        s >> rhs.socket_;
+        s.get();
+        s >> rhs.core_;
+        s.get();
+        s >> rhs.processing_unit_;
+
+        return s;
+    }
+    /*!
+    *  Stream out operator
+    *
+    * \ stream out socket,core,processing_unit
+    */
+
+    friend inline std::ostream &operator<<(std::ostream &s, const cpu_spec &rhs)
+    {
+        s << rhs.socket_ << "," << rhs.core_ << "," << rhs.processing_unit_;
+        return s;
+    }
 
    private:
     socket_type socket_;

include/cpuaff/cpuaff.hpp

@@ -96,6 +96,12 @@ typedef traits::native_cpu_wrapper_type native_cpu_wrapper;
  */
 typedef impl::basic_cpu_set< traits > cpu_set;
 
+/*!
+ *  a set that can hold unique cpu_specs
+ */
+
+typedef std::set< cpu_spec > cpu_spec_set;
+
 /*!
  * round_robin_allocator is a utility class that takes a set of cpus
  * and returns them as requested in a round-robin fashion.  It organizes the

include/cpuaff/impl/basic_cpu.hpp

@@ -148,6 +148,12 @@ class basic_cpu
 };
 }  // namespace impl
 }  // namespace cpuaff
+   /*!
+    * Stream operator
+    *
+    * \print id, numa, socket, core, processing unit
+    *
+    */
 
 template < typename TRAITS >
 std::ostream &operator<<(std::ostream &s,

include/cpuaff/impl/basic_round_robin_allocator.hpp

@@ -96,6 +96,8 @@ class basic_round_robin_allocator
         return true;
     }
 
+    inline int size() { return cpu_queue_.size(); }
+
    private:
     /*!
      * Initializes a basic_round_robin_allocator with the given set of cpus.
@@ -138,4 +140,4 @@ class basic_round_robin_allocator
     std::queue< cpu_type > cpu_queue_;
 };
 }  // namespace impl
-}  // namespace cpuaff
+}  // namespace cpuaff

include/cpuaff/pci_device_description.hpp

@@ -109,7 +109,7 @@ class pci_device_description
 }  // namespace cpuaff
 
 inline std::ostream &operator<<(std::ostream &s,
-                         const cpuaff::pci_device_description &dev)
+                                const cpuaff::pci_device_description &dev)
 {
     s << dev.vendor_description() << ":" << dev.device_description();
     return s;