diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-26 13:28:35 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-26 13:28:35 -0400 |
| commit | 2bb64d807e446d6e2fe21b29e0b69aad90b1180f (patch) | |
| tree | a0c5c88dc227cfa2078c39b6160faaf543db1f2e /gnuradio-core | |
| parent | 3476b6f37c28a1b22c8e4af0724f2c94199bcd82 (diff) | |
| parent | 9a7c9b1ef88da5bbed515282c44fa60971e0a790 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gnuradio-core')
| -rwxr-xr-x | gnuradio-core/src/examples/mp-sched/affinity_set.py | 9 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/swig/gnuradio.i | 1 |
2 files changed, 4 insertions, 6 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..7c53c51d89 100755 --- a/gnuradio-core/src/examples/mp-sched/affinity_set.py +++ b/gnuradio-core/src/examples/mp-sched/affinity_set.py @@ -44,9 +44,6 @@ class affinity_set(gr.top_block): self.connect((self.filter_filt_0, 0), (self.gr_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> |