3 files changed, 63 insertions, 3 deletions
diff --git a/host/lib/utils/CMakeLists.txt b/host/lib/utils/CMakeLists.txt
index a28e1f9ef..2252f3221 100644
--- a/host/lib/utils/CMakeLists.txt
+++ b/host/lib/utils/CMakeLists.txt
@@ -87,6 +87,7 @@ CHECK_CXX_SOURCE_COMPILES("
 UNSET(CMAKE_REQUIRED_LIBRARIES)
 
 CHECK_CXX_SOURCE_COMPILES("
+    #define WIN32_LEAN_AND_MEAN
     #include <windows.h>
     int main(){
         LoadLibrary(0);
@@ -136,6 +137,7 @@ LIBUHD_APPEND_SOURCES(
     ${CMAKE_CURRENT_SOURCE_DIR}/log.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/msg.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/paths.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/platform.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/static.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tasks.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/thread_priority.cpp
diff --git a/host/lib/utils/gain_group.cpp b/host/lib/utils/gain_group.cpp
index 85f4977a6..d422b3d52 100644
--- a/host/lib/utils/gain_group.cpp
+++ b/host/lib/utils/gain_group.cpp
@@ -64,7 +64,7 @@ public:
     }
 
     gain_range_t get_range(const std::string &name){
-        if (not name.empty()) return _name_to_fcns[name].get_range();
+        if (not name.empty()) return _name_to_fcns.get(name).get_range();
 
         double overall_min = 0, overall_max = 0, overall_step = 0;
         BOOST_FOREACH(const gain_fcns_t &fcns, get_all_fcns()){
@@ -79,7 +79,7 @@ public:
     }
 
     double get_value(const std::string &name){
-        if (not name.empty()) return _name_to_fcns[name].get_value();
+        if (not name.empty()) return _name_to_fcns.get(name).get_value();
 
         double overall_gain = 0;
         BOOST_FOREACH(const gain_fcns_t &fcns, get_all_fcns()){
@@ -89,7 +89,7 @@ public:
     }
 
     void set_value(double gain, const std::string &name){
-        if (not name.empty()) return _name_to_fcns[name].set_value(gain);
+        if (not name.empty()) return _name_to_fcns.get(name).set_value(gain);
 
         std::vector<gain_fcns_t> all_fcns = get_all_fcns();
         if (all_fcns.size() == 0) return; //nothing to set!
diff --git a/host/lib/utils/platform.cpp b/host/lib/utils/platform.cpp
new file mode 100644
index 000000000..e2f92039e
--- /dev/null
+++ b/host/lib/utils/platform.cpp
@@ -0,0 +1,58 @@
+//
+// Copyright 2010-2012 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#include <uhd/utils/platform.hpp>
+#include <uhd/config.hpp>
+#include <boost/functional/hash.hpp>
+#ifdef UHD_PLATFORM_WIN32
+#include <Windows.h>
+#else
+#include <unistd.h>
+#endif
+
+namespace uhd {
+
+    boost::int32_t get_process_id() {
+#ifdef UHD_PLATFORM_WIN32
+    return boost::int32_t(GetCurrentProcessId());
+#else
+    return boost::int32_t(getpid());
+#endif
+    }
+
+    boost::uint32_t get_host_id() {
+#ifdef UHD_PLATFORM_WIN32
+        //extract volume serial number
+        char szVolName[MAX_PATH+1], szFileSysName[MAX_PATH+1];
+        DWORD dwSerialNumber, dwMaxComponentLen, dwFileSysFlags;
+        GetVolumeInformation("C:\\", szVolName, MAX_PATH,
+            &dwSerialNumber, &dwMaxComponentLen,
+            &dwFileSysFlags, szFileSysName, sizeof(szFileSysName));
+
+        return boost::uint32_t(dwSerialNumber);
+#else
+        return boost::uint32_t(gethostid());
+#endif
+    }
+
+    boost::uint32_t get_process_hash() {
+        size_t hash = 0;
+        boost::hash_combine(hash, uhd::get_process_id());
+        boost::hash_combine(hash, uhd::get_host_id());
+        return boost::uint32_t(hash);
+    }
+}