From 8088f125a9a432de321c62b82755a895d5184080 Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Fri, 29 Mar 2013 13:12:36 -0400
Subject: core: addressing issue #529. Using vector<int> instead of
vector<unsigned int> for affinity mask vector.
This is wrong as the mask should be unsigned, but necessary for SWIG to work cleanly on both 32-bit and 64-bit platforms.
---
gnuradio-core/src/lib/runtime/gr_block.cc | 2 +-
gnuradio-core/src/lib/runtime/gr_block.h | 8 ++--
gnuradio-core/src/lib/runtime/gr_block.i | 4 +-
gnuradio-core/src/lib/runtime/gr_block_detail.cc | 2 +-
gnuradio-core/src/lib/runtime/gr_block_detail.h | 4 +-
gnuradio-core/src/lib/runtime/qa_gr_top_block.cc | 2 +-
.../src/python/gnuradio/gr/qa_affinity.py | 49 ++++++++++++++++++++++
7 files changed, 60 insertions(+), 11 deletions(-)
create mode 100644 gnuradio-core/src/python/gnuradio/gr/qa_affinity.py
(limited to 'gnuradio-core')
diff --git a/gnuradio-core/src/lib/runtime/gr_block.cc b/gnuradio-core/src/lib/runtime/gr_block.cc
index 4950e8666c..674e52084a 100644
--- a/gnuradio-core/src/lib/runtime/gr_block.cc
+++ b/gnuradio-core/src/lib/runtime/gr_block.cc
@@ -300,7 +300,7 @@ gr_block::is_set_max_noutput_items()
}
void
-gr_block::set_processor_affinity(const std::vector<unsigned int> &mask)
+gr_block::set_processor_affinity(const std::vector<int> &mask)
{
d_affinity = mask;
if(d_detail) {
diff --git a/gnuradio-core/src/lib/runtime/gr_block.h b/gnuradio-core/src/lib/runtime/gr_block.h
index e4b30267e6..402c8ee7f1 100644
--- a/gnuradio-core/src/lib/runtime/gr_block.h
+++ b/gnuradio-core/src/lib/runtime/gr_block.h
@@ -459,9 +459,9 @@ class GR_CORE_API gr_block : public gr_basic_block {
/*!
* \brief Set the thread's affinity to processor core \p n.
*
- * \param mask a vector of unsigned ints of the core numbers available to this block.
+ * \param mask a vector of ints of the core numbers available to this block.
*/
- void set_processor_affinity(const std::vector<unsigned int> &mask);
+ void set_processor_affinity(const std::vector<int> &mask);
/*!
* \brief Remove processor affinity to a specific core.
@@ -471,7 +471,7 @@ class GR_CORE_API gr_block : public gr_basic_block {
/*!
* \brief Get the current processor affinity.
*/
- std::vector<unsigned int> processor_affinity() { return d_affinity; }
+ std::vector<int> processor_affinity() { return d_affinity; }
// ----------------------------------------------------------------------------
@@ -489,7 +489,7 @@ class GR_CORE_API gr_block : public gr_basic_block {
int d_max_noutput_items; // value of max_noutput_items for this block
int d_min_noutput_items;
tag_propagation_policy_t d_tag_propagation_policy; // policy for moving tags downstream
- std::vector<unsigned int> d_affinity; // thread affinity proc. mask
+ std::vector<int> d_affinity; // thread affinity proc. mask
protected:
gr_block (void){} //allows pure virtual interface sub-classes
diff --git a/gnuradio-core/src/lib/runtime/gr_block.i b/gnuradio-core/src/lib/runtime/gr_block.i
index a80f64d027..a53489f9a2 100644
--- a/gnuradio-core/src/lib/runtime/gr_block.i
+++ b/gnuradio-core/src/lib/runtime/gr_block.i
@@ -83,9 +83,9 @@ class gr_block : public gr_basic_block {
float pc_work_time_var();
// Methods to manage processor affinity.
- void set_processor_affinity(const gr_vector_uint &mask);
+ void set_processor_affinity(const std::vector<int> &mask);
void unset_processor_affinity();
- gr_vector_uint processor_affinity();
+ std::vector<int> processor_affinity();
// internal use
gr_block_detail_sptr detail () const { return d_detail; }
diff --git a/gnuradio-core/src/lib/runtime/gr_block_detail.cc b/gnuradio-core/src/lib/runtime/gr_block_detail.cc
index 82081039ac..af80e61cff 100644
--- a/gnuradio-core/src/lib/runtime/gr_block_detail.cc
+++ b/gnuradio-core/src/lib/runtime/gr_block_detail.cc
@@ -215,7 +215,7 @@ gr_block_detail::get_tags_in_range(std::vector<gr_tag_t> &v,
}
void
-gr_block_detail::set_processor_affinity(const std::vector<unsigned int> &mask)
+gr_block_detail::set_processor_affinity(const std::vector<int> &mask)
{
if(threaded) {
try {
diff --git a/gnuradio-core/src/lib/runtime/gr_block_detail.h b/gnuradio-core/src/lib/runtime/gr_block_detail.h
index 32a01e763a..15d85135ae 100644
--- a/gnuradio-core/src/lib/runtime/gr_block_detail.h
+++ b/gnuradio-core/src/lib/runtime/gr_block_detail.h
@@ -159,9 +159,9 @@ class GR_CORE_API gr_block_detail {
/*!
* \brief Set core affinity of block to the cores in the vector mask.
*
- * \param mask a vector of unsigned ints of the core numbers available to this block.
+ * \param mask a vector of ints of the core numbers available to this block.
*/
- void set_processor_affinity(const std::vector<unsigned int> &mask);
+ void set_processor_affinity(const std::vector<int> &mask);
/*!
* \brief Unset core affinity.
diff --git a/gnuradio-core/src/lib/runtime/qa_gr_top_block.cc b/gnuradio-core/src/lib/runtime/qa_gr_top_block.cc
index 1d3dafadf8..6bbc9ceb89 100644
--- a/gnuradio-core/src/lib/runtime/qa_gr_top_block.cc
+++ b/gnuradio-core/src/lib/runtime/qa_gr_top_block.cc
@@ -269,7 +269,7 @@ void qa_gr_top_block::t11_set_block_affinity()
gr_block_sptr src (gr_make_null_source(sizeof(float)));
gr_block_sptr snk (gr_make_null_sink(sizeof(float)));
- std::vector<unsigned int> set(1, 0), ret;
+ std::vector<int> set(1, 0), ret;
src->set_processor_affinity(set);
tb->connect(src, 0, snk, 0);
diff --git a/gnuradio-core/src/python/gnuradio/gr/qa_affinity.py b/gnuradio-core/src/python/gnuradio/gr/qa_affinity.py
new file mode 100644
index 0000000000..7b3ca6ed63
--- /dev/null
+++ b/gnuradio-core/src/python/gnuradio/gr/qa_affinity.py
@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+#
+# Copyright 2013 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 GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
+
+from gnuradio import gr, gr_unittest
+
+class test_affinity(gr_unittest.TestCase):
+
+ def setUp(self):
+ self.tb = gr.top_block()
+
+ def tearDown(self):
+ self.tb = None
+
+ def test_000(self):
+ # Just run some data through and make sure it doesn't puke.
+ src_data = (1, 2, 3, 4, 5, 6, 7, 8, 9, 10)
+
+ src = gr.vector_source_f(src_data)
+ snk = gr.vector_sink_f()
+
+ src.set_processor_affinity([0,])
+ self.tb.connect(src, snk)
+ self.tb.run()
+
+ a = src.processor_affinity()
+
+ self.assertEqual((0,), a)
+
+if __name__ == '__main__':
+ gr_unittest.run(test_affinity, "test_affinity.xml")
--
cgit v1.2.3