diff options
| author | jcorgan | 2007-08-27 18:49:11 +0000 |
|---|---|---|
| committer | jcorgan | 2007-08-27 18:49:11 +0000 |
| commit | c088a546ac7ae55748e5421201f3387f3e1286f9 (patch) | |
| tree | b655773370d082062c2842181bff1638354c57c8 /gnuradio-examples/python/hier/digital | |
| parent | 06945c04b4af8af035aeee2e28d5e5626888f5ee (diff) | |
| download | gnuradio-c088a546ac7ae55748e5421201f3387f3e1286f9.tar.gz gnuradio-c088a546ac7ae55748e5421201f3387f3e1286f9.tar.bz2 gnuradio-c088a546ac7ae55748e5421201f3387f3e1286f9.zip | |
Merged r6171:6186 from jcorgan/fg into trunk.
Changes hierarchical flow graph API to use gr.top_block instead
of gr.runtime.
See discuss-gnuradio mailing list for explanation of changes.
GRC has not been updated to use the changed API.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6187 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-examples/python/hier/digital')
3 files changed, 5 insertions, 16 deletions
diff --git a/gnuradio-examples/python/hier/digital/benchmark_loopback.py b/gnuradio-examples/python/hier/digital/benchmark_loopback.py index a98d1cdfb..31dfb991b 100755 --- a/gnuradio-examples/python/hier/digital/benchmark_loopback.py +++ b/gnuradio-examples/python/hier/digital/benchmark_loopback.py @@ -155,10 +155,7 @@ def main(): # Create an instance of a hierarchical block top_block = my_graph(mods[options.modulation], demods[options.modulation], rx_callback, options) - - # Create an instance of a runtime, passing it the top block - runtime = gr.runtime(top_block) - runtime.start() + top_block.start() # generate and send packets nbytes = int(1e6 * options.megabytes) @@ -175,7 +172,7 @@ def main(): send_pkt(eof=True) - runtime.wait() + top_block.wait() if __name__ == '__main__': try: diff --git a/gnuradio-examples/python/hier/digital/benchmark_rx.py b/gnuradio-examples/python/hier/digital/benchmark_rx.py index 669d5618e..c92d487bd 100755 --- a/gnuradio-examples/python/hier/digital/benchmark_rx.py +++ b/gnuradio-examples/python/hier/digital/benchmark_rx.py @@ -95,12 +95,7 @@ def main(): # Create an instance of a hierarchical block top_block = receive_path(demods[options.modulation], rx_callback, options) - - # Create an instance of a runtime, passing it the top block - runtime = gr.runtime(top_block) - runtime.start() - - runtime.wait() # wait for it to finish + top_block.run() if __name__ == '__main__': try: diff --git a/gnuradio-examples/python/hier/digital/benchmark_tx.py b/gnuradio-examples/python/hier/digital/benchmark_tx.py index 0059a4555..752cdff55 100755 --- a/gnuradio-examples/python/hier/digital/benchmark_tx.py +++ b/gnuradio-examples/python/hier/digital/benchmark_tx.py @@ -88,10 +88,7 @@ def main(): # Create an instance of a hierarchical block top_block = transmit_path(mods[options.modulation], options) - - # Create an instance of a runtime, passing it the top block - runtime = gr.runtime(top_block) - runtime.start() + top_block.start() # generate and send packets nbytes = int(1e6 * options.megabytes) @@ -108,7 +105,7 @@ def main(): pktno += 1 send_pkt(eof=True) - runtime.wait() + top_block.wait() if __name__ == '__main__': try: |