Merge branch 'master' into next

author: Tom Rondeau <trondeau@vt.edu> 2013-02-07 11:43:26 -0500
committer: Tom Rondeau <trondeau@vt.edu> 2013-02-07 11:43:26 -0500
commit: 032de913ced39c2e82b69f1abab0d9d8cb563a4e (patch)
tree: b299c8c27c8310cfdb43017599ea267cc9a3c120 /gruel
parent: 55d09297e002966835731cbf54b6c78b7bcc419a (diff)
parent: 23e56ce76921dc6aafd868dac421023646641925 (diff)
3 files changed, 328 insertions, 1 deletions
diff --git a/gruel/src/include/gruel/thread.h b/gruel/src/include/gruel/thread.h
index c0b54b0a46..60832675cd 100644
--- a/gruel/src/include/gruel/thread.h
+++ b/gruel/src/include/gruel/thread.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2009,2010,2011 Free Software Foundation, Inc.
+ * Copyright 2009-2012 Free Software Foundation, Inc.
  *
  * This file is part of GNU Radio
  *
@@ -26,6 +26,17 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/locks.hpp>
 #include <boost/thread/condition_variable.hpp>
+#include <vector>
+
+#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
+
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+
+#include <windows.h>
+
+#endif
 
 namespace gruel {
 
@@ -34,6 +45,95 @@ namespace gruel {
   typedef boost::unique_lock<boost::mutex> scoped_lock;
   typedef boost::condition_variable        condition_variable;
 
+  /*! \brief a system-dependent typedef for the underlying thread type.
+   */
+#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
+  typedef HANDLE gr_thread_t;
+#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
+  typedef pthread_t gr_thread_t;
+#else
+  typedef pthread_t gr_thread_t;
+#endif
+
+  /*! \brief Get the current thread's ID as a gr_thread_t
+   *
+   * We use this when setting the thread affinity or any other
+   * low-level thread settings. Can be called withing a GNU Radio
+   * block to get a reference to its current thread ID.
+   */
+  GRUEL_API gr_thread_t get_current_thread_id();
+
+  /*! \brief Bind the current thread to a set of cores.
+   *
+   * Wrapper for system-dependent calls to set the affinity of the
+   * current thread to the processor mask. The mask is simply a
+   * 1-demensional vector containing the processor or core number from
+   * 0 to N-1 for N cores.
+   *
+   * Note: this does not work on OSX; it is a nop call since OSX does
+   * not support the concept of thread affinity (and what they do
+   * support in this way since 10.5 is not what we want or can use in
+   * this fashion).
+   */
+  GRUEL_API void thread_bind_to_processor(const std::vector<unsigned int> &mask);
+
+  /*! \brief Convineince function to bind the current thread to a single core.
+   *
+   * Wrapper for system-dependent calls to set the affinity of the
+   * current thread to a given core from 0 to N-1 for N cores.
+   *
+   * Note: this does not work on OSX; it is a nop call since OSX does
+   * not support the concept of thread affinity (and what they do
+   * support in this way since 10.5 is not what we want or can use in
+   * this fashion).
+   */
+  GRUEL_API void thread_bind_to_processor(unsigned int n);
+
+  /*! \brief Bind a thread to a set of cores.
+   *
+   * Wrapper for system-dependent calls to set the affinity of the
+   * given thread ID to the processor mask. The mask is simply a
+   * 1-demensional vector containing the processor or core number from
+   * 0 to N-1 for N cores.
+   *
+   * Note: this does not work on OSX; it is a nop call since OSX does
+   * not support the concept of thread affinity (and what they do
+   * support in this way since 10.5 is not what we want or can use in
+   * this fashion).
+   */
+  GRUEL_API void thread_bind_to_processor(gr_thread_t thread, const std::vector<unsigned int> &mask);
+
+
+  /*! \brief Convineince function to bind the a thread to a single core.
+   *
+   * Wrapper for system-dependent calls to set the affinity of the
+   * given thread ID to a given core from 0 to N-1 for N cores.
+   *
+   * Note: this does not work on OSX; it is a nop call since OSX does
+   * not support the concept of thread affinity (and what they do
+   * support in this way since 10.5 is not what we want or can use in
+   * this fashion).
+   */
+  GRUEL_API void thread_bind_to_processor(gr_thread_t thread, unsigned int n);
+
+  /*! \brief Remove any thread-processor affinity for the current thread.
+   *
+   * Note: this does not work on OSX; it is a nop call since OSX does
+   * not support the concept of thread affinity (and what they do
+   * support in this way since 10.5 is not what we want or can use in
+   * this fashion).
+   */
+  GRUEL_API void thread_unbind();
+
+  /*! \brief Remove any thread-processor affinity for a given thread ID.
+   *
+   * Note: this does not work on OSX; it is a nop call since OSX does
+   * not support the concept of thread affinity (and what they do
+   * support in this way since 10.5 is not what we want or can use in
+   * this fashion).
+   */
+  GRUEL_API void thread_unbind(gr_thread_t thread);
+
 } /* namespace gruel */
 
 #endif /* INCLUDED_THREAD_H */
diff --git a/gruel/src/lib/CMakeLists.txt b/gruel/src/lib/CMakeLists.txt
index 5d7980dd57..ae32ae066d 100644
--- a/gruel/src/lib/CMakeLists.txt
+++ b/gruel/src/lib/CMakeLists.txt
@@ -77,6 +77,7 @@ link_directories(${Boost_LIBRARY_DIRS})
 list(APPEND gruel_sources
     realtime.cc
     sys_pri.cc
+    thread.cc
     thread_body_wrapper.cc
     thread_group.cc
 )
diff --git a/gruel/src/lib/thread.cc b/gruel/src/lib/thread.cc
new file mode 100644
index 0000000000..8ebe822fbf
--- /dev/null
+++ b/gruel/src/lib/thread.cc
@@ -0,0 +1,226 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio 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, or (at your option)
+ * any later version.
+ *
+ * GNU Radio 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, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gruel/thread.h>
+
+#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
+
+#include <Windows.h>
+
+namespace gruel {
+
+  gr_thread_t
+  get_current_thread_id()
+  {
+    return GetCurrentThread();
+  }
+
+  void
+  thread_bind_to_processor(unsigned int n)
+  {
+    std::vector<unsigned int> mask(1, n);
+    thread_bind_to_processor(get_current_thread_id(), mask);
+  }
+
+  void
+  thread_bind_to_processor(const std::vector<unsigned int> &mask)
+  {
+    thread_bind_to_processor(get_current_thread_id(), mask);
+  }
+
+  void
+  thread_bind_to_processor(gr_thread_t thread, unsigned int n)
+  {
+    std::vector<unsigned int> mask(1, n);
+    thread_bind_to_processor(thread, mask);
+  }
+
+  void
+  thread_bind_to_processor(gr_thread_t thread, const std::vector<unsigned int> &mask)
+  {
+    //DWORD_PTR mask = (1 << n);
+    DWORD_PTR dword_mask = 0;
+
+    std::vector<unsigned int> _mask = mask;
+    std::vector<unsigned int>::iterator itr;
+    for(itr = _mask.begin(); itr != _mask.end(); itr++)
+      dword_mask |= (1 << (*itr));
+
+    DWORD_PTR ret = SetThreadAffinityMask(thread, dword_mask);
+    if(ret == 0) {
+      std::stringstream s;
+      s << "thread_bind_to_processor failed with error: " << GetLastError() << std::endl;
+      throw std::runtime_error(s.str());
+    }
+  }
+
+  void
+  thread_unbind()
+  {
+    thread_unbind(get_current_thread_id());
+  }
+
+  void
+  thread_unbind(gr_thread_t thread)
+  {
+    DWORD_PTR dword_mask = sizeof(DWORD_PTR) - 1;
+    DWORD_PTR ret = SetThreadAffinityMask(thread, dword_mask);
+    if(ret == 0) {
+      std::stringstream s;
+      s << "thread_unbind failed with error: " << GetLastError() << std::endl;
+      throw std::runtime_error(s.str());
+    }
+  }
+} /* namespace gruel */
+
+#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
+
+namespace gruel {
+
+  gr_thread_t
+  get_current_thread_id()
+  {
+    // Not implemented on OSX
+  }
+
+  void
+  thread_bind_to_processor(unsigned int n)
+  {
+    // Not implemented on OSX
+  }
+
+  void
+  thread_bind_to_processor(gr_thread_t thread, unsigned int n)
+  {
+    // Not implemented on OSX
+  }
+
+  void
+  thread_bind_to_processor(const std::vector<unsigned int> &mask)
+  {
+    // Not implemented on OSX
+  }
+
+  void
+  thread_bind_to_processor(gr_thread_t thread, const std::vector<unsigned int> &mask)
+  {
+    // Not implemented on OSX
+  }
+
+  void
+  thread_unbind()
+  {
+    // Not implemented on OSX
+  }
+
+  void
+  thread_unbind(gr_thread_t thread)
+  {
+    // Not implemented on OSX
+  }
+} /* namespace gruel */
+
+#else
+
+#include <sstream>
+#include <stdexcept>
+#include <pthread.h>
+
+namespace gruel {
+
+  gr_thread_t
+  get_current_thread_id()
+  {
+    return pthread_self();
+  }
+
+  void
+  thread_bind_to_processor(unsigned int n)
+  {
+    std::vector<unsigned int> mask(1, n);
+    thread_bind_to_processor(get_current_thread_id(), mask);
+  }
+
+  void
+  thread_bind_to_processor(const std::vector<unsigned int> &mask)
+  {
+    thread_bind_to_processor(get_current_thread_id(), mask);
+  }
+
+  void
+  thread_bind_to_processor(gr_thread_t thread, unsigned int n)
+  {
+    std::vector<unsigned int> mask(1, n);
+    thread_bind_to_processor(thread, mask);
+  }
+
+  void
+  thread_bind_to_processor(gr_thread_t thread, const std::vector<unsigned int> &mask)
+  {
+    cpu_set_t set;
+    size_t len = sizeof(cpu_set_t);
+    std::vector<unsigned int> _mask = mask;
+    std::vector<unsigned int>::iterator itr;
+
+    CPU_ZERO(&set);
+    for(itr = _mask.begin(); itr != _mask.end(); itr++)
+      CPU_SET(*itr, &set);
+
+    int ret = pthread_setaffinity_np(thread, len, &set);
+    if(ret != 0) {
+      std::stringstream s;
+      s << "thread_bind_to_processor failed with error: " << ret << std::endl;
+      throw std::runtime_error(s.str());
+    }
+  }
+
+  void
+  thread_unbind()
+  {
+    thread_unbind(get_current_thread_id());
+  }
+
+  void
+  thread_unbind(gr_thread_t thread)
+  {
+    cpu_set_t set;
+    size_t len = sizeof(cpu_set_t);
+
+    CPU_ZERO(&set);
+    long ncpus = sysconf(_SC_NPROCESSORS_ONLN);
+    for(long n = 0; n < ncpus; n++) {
+      CPU_SET(n, &set);
+    }
+
+    int ret = pthread_setaffinity_np(thread, len, &set);
+    if(ret != 0) {
+      std::stringstream s;
+      s << "thread_unbind failed with error: " << ret << std::endl;
+      throw std::runtime_error(s.str());
+    }
+  }
+} /* namespace gruel */
+
+#endif
author	Tom Rondeau <trondeau@vt.edu>	2013-02-07 11:43:26 -0500
committer	Tom Rondeau <trondeau@vt.edu>	2013-02-07 11:43:26 -0500
commit	032de913ced39c2e82b69f1abab0d9d8cb563a4e (patch)
tree	b299c8c27c8310cfdb43017599ea267cc9a3c120 /gruel
parent	55d09297e002966835731cbf54b6c78b7bcc419a (diff)
parent	23e56ce76921dc6aafd868dac421023646641925 (diff)