diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-29 13:26:22 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-29 13:26:22 -0400 |
| commit | 73367de69a1384295937945549d210d51a0a19ef (patch) | |
| tree | b19f5f71b87cac8497f3a2c90afbd1e62b7d8d00 /gnuradio-runtime | |
| parent | 2caaabf8e1dd771174fd42e51c8c8090864638e6 (diff) | |
| parent | 8088f125a9a432de321c62b82755a895d5184080 (diff) | |
Merge branch 'master' into next
Conflicts:
gnuradio-runtime/include/gr_block.h
Diffstat (limited to 'gnuradio-runtime')
| -rw-r--r-- | gnuradio-runtime/include/gr_block.h | 8 | ||||
| -rw-r--r-- | gnuradio-runtime/include/gr_block_detail.h | 4 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/gr_block.cc | 2 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/gr_block_detail.cc | 2 | ||||
| -rw-r--r-- | gnuradio-runtime/swig/gr_block.i | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/gnuradio-runtime/include/gr_block.h b/gnuradio-runtime/include/gr_block.h index 0b7bbf3eda..a25bb4a528 100644 --- a/gnuradio-runtime/include/gr_block.h +++ b/gnuradio-runtime/include/gr_block.h @@ -513,9 +513,9 @@ class GR_RUNTIME_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. @@ -525,7 +525,7 @@ class GR_RUNTIME_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; } // ---------------------------------------------------------------------------- @@ -543,7 +543,7 @@ class GR_RUNTIME_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 bool d_pc_rpc_set; protected: diff --git a/gnuradio-runtime/include/gr_block_detail.h b/gnuradio-runtime/include/gr_block_detail.h index c197266769..d24148f951 100644 --- a/gnuradio-runtime/include/gr_block_detail.h +++ b/gnuradio-runtime/include/gr_block_detail.h @@ -159,9 +159,9 @@ class GR_RUNTIME_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-runtime/lib/gr_block.cc b/gnuradio-runtime/lib/gr_block.cc index 8c8b85dc7e..2830a999ea 100644 --- a/gnuradio-runtime/lib/gr_block.cc +++ b/gnuradio-runtime/lib/gr_block.cc @@ -301,7 +301,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-runtime/lib/gr_block_detail.cc b/gnuradio-runtime/lib/gr_block_detail.cc index c85c0e9fba..af767da8ec 100644 --- a/gnuradio-runtime/lib/gr_block_detail.cc +++ b/gnuradio-runtime/lib/gr_block_detail.cc @@ -218,7 +218,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-runtime/swig/gr_block.i b/gnuradio-runtime/swig/gr_block.i index a80f64d027..a53489f9a2 100644 --- a/gnuradio-runtime/swig/gr_block.i +++ b/gnuradio-runtime/swig/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; } |