diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-26 21:46:34 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-26 21:46:34 -0400 |
| commit | 06949d7800f37b7a520e37105972b14f2b71025c (patch) | |
| tree | 154139636aa6cefca27326487ad1fce1dc2eea2f | |
| parent | 5edf267f3e8155ac7450bdb4a85810cab258fbd2 (diff) | |
| parent | 31472dae2eafe7ae62e4d87805f5493502b1f1cf (diff) | |
Merge branch 'next' of gnuradio.org:gnuradio into next
| -rwxr-xr-x | gnuradio-core/src/examples/mp-sched/affinity_set.py | 13 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/swig/gnuradio.i | 1 | ||||
| -rw-r--r-- | grc/python/Port.py | 1 |
3 files changed, 7 insertions, 8 deletions
diff --git a/gnuradio-core/src/examples/mp-sched/affinity_set.py b/gnuradio-core/src/examples/mp-sched/affinity_set.py index eee88cd34e..4d28a04174 100755 --- a/gnuradio-core/src/examples/mp-sched/affinity_set.py +++ b/gnuradio-core/src/examples/mp-sched/affinity_set.py @@ -40,13 +40,10 @@ class affinity_set(gr.top_block): # Connections ################################################## self.connect((self.blocks_null_source_0, 0), (self.blocks_throttle_0, 0)) - self.connect((self.blocks_throttle_0, 0), (self.gr_filt_0, 0)) - self.connect((self.filter_filt_0, 0), (self.gr_filt_1, 0)) + self.connect((self.blocks_throttle_0, 0), (self.filter_filt_0, 0)) + self.connect((self.filter_filt_0, 0), (self.filter_filt_1, 0)) self.connect((self.filter_filt_1, 0), (self.blocks_null_sink_0, 0)) - - # QT sink close method reimplementation - def get_samp_rate(self): return self.samp_rate @@ -60,16 +57,16 @@ if __name__ == '__main__': tb.start() while(1): - ret = raw_input('Press Enter to quit: ') + ret = raw_input('Enter a new Core # or Press Enter to quit: ') if(len(ret) == 0): tb.stop() sys.exit(0) elif(ret.lower() == "none"): - tb.gr_filt_0.unset_processor_affinity() + tb.filter_filt_0.unset_processor_affinity() else: try: n = int(ret) except ValueError: print "Invalid number" else: - tb.gr_filt_0.set_processor_affinity([n,]) + tb.filter_filt_0.set_processor_affinity([n,]) diff --git a/gnuradio-core/src/lib/swig/gnuradio.i b/gnuradio-core/src/lib/swig/gnuradio.i index 4378e6aad2..03b7817e22 100644 --- a/gnuradio-core/src/lib/swig/gnuradio.i +++ b/gnuradio-core/src/lib/swig/gnuradio.i @@ -45,6 +45,7 @@ // local file %include <gr_shared_ptr.i> +%include <gr_types.h> %include <std_complex.i> %include <std_vector.i> %include <stl.i> diff --git a/grc/python/Port.py b/grc/python/Port.py index 0703d67627..d4afa6cf77 100644 --- a/grc/python/Port.py +++ b/grc/python/Port.py @@ -92,6 +92,7 @@ class Port(_Port, _GUIPort): """ self._n = n if n['type'] == 'msg': n['key'] = 'msg' + if n['type'] == 'message': n['key'] = n['name'] if dir == 'source' and not n.find('key'): n['key'] = str(block._source_count) block._source_count += 1 |