diff options
| author | Scott Torborg <storborg@gmail.com> | 2018-07-14 18:56:50 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2020-01-05 16:07:47 -0800 |
| commit | b0a26eeb4d8a4e0233f30e7137ec4c13391ca2b1 (patch) | |
| tree | 625ceabd8dbd7f5e5061309ce6e7a3fe543f1181 /gnuradio-runtime/python/gnuradio/gr/qa_uncaught_exception.py | |
| parent | 0c579fba83d55e2ee4acc8362a1be2beae86ad56 (diff) | |
Add a top_block parameter to control exception handling
This restores past behavior where the scheduler catches exceptions
raised in block threads, allowing flowgraphs to continue running after
the failure of an individual block. It also adds optional new behavior,
selected by setting catch_exceptions=False to the top block, which causes
exceptions to not be caught. In this mode of operation, a std::terminate
handler can be installed to print a stack trace before the flowgraph exits.
Diffstat (limited to 'gnuradio-runtime/python/gnuradio/gr/qa_uncaught_exception.py')
| -rw-r--r-- | gnuradio-runtime/python/gnuradio/gr/qa_uncaught_exception.py | 54 |
1 files changed, 33 insertions, 21 deletions
diff --git a/gnuradio-runtime/python/gnuradio/gr/qa_uncaught_exception.py b/gnuradio-runtime/python/gnuradio/gr/qa_uncaught_exception.py index 18799d152d..a098d78684 100644 --- a/gnuradio-runtime/python/gnuradio/gr/qa_uncaught_exception.py +++ b/gnuradio-runtime/python/gnuradio/gr/qa_uncaught_exception.py @@ -46,38 +46,50 @@ class except_block(gr.sync_block): return len(output_items[0]) -class test_uncaught_exception(gr_unittest.TestCase): +def process_func(catch_exceptions): + tb = gr.top_block(catch_exceptions=catch_exceptions) + # some test data + src_data = [complex(x, x + 1) for x in range(65536)] + src = blocks.vector_source_c(src_data) + src.set_repeat(True) - def test_exception_throw(self): - # Test to ensure that throwing an exception causes the - # process running top_block to exit + e_block_1 = except_block(False) + e_block_2 = except_block(True) - def process_func(): - tb = gr.top_block() - # some test data - src_data = [complex(x, x + 1) for x in range(65536)] - src = blocks.vector_source_c(src_data) - src.set_repeat(True) + sink_1 = blocks.null_sink(gr.sizeof_gr_complex) + sink_2 = blocks.null_sink(gr.sizeof_gr_complex) - e_block_1 = except_block(False) - e_block_2 = except_block(True) + tb.connect(src, e_block_1) + tb.connect(src, e_block_2) + tb.connect(e_block_1, sink_1) + tb.connect(e_block_2, sink_2) + tb.run() - sink_1 = blocks.null_sink(gr.sizeof_gr_complex) - sink_2 = blocks.null_sink(gr.sizeof_gr_complex) - tb.connect(src, e_block_1) - tb.connect(src, e_block_2) - tb.connect(e_block_1, sink_1) - tb.connect(e_block_2, sink_2) - tb.run() +class test_uncaught_exception(gr_unittest.TestCase): - p = Process(target=process_func) + def test_exception_throw_uncaught(self): + # Test to ensure that throwing an exception causes the + # process running top_block to exit + p = Process(target=process_func, args=(False,)) p.daemon = True p.start() - p.join(1) + p.join(0.5) exit_code = p.exitcode self.assertIsNotNone( exit_code, "exception did not cause flowgraph exit") + def test_exception_throw_caught(self): + # Test to ensure that throwing an exception does not cause the process + # running top_block to exit (in catch_exceptions mode) + p = Process(target=process_func, args=(True,)) + p.daemon = True + p.start() + p.join(0.5) + exit_code = p.exitcode + self.assertIsNone( + exit_code, "exception caused flowgraph exit") + + if __name__ == '__main__': gr_unittest.run(test_uncaught_exception, "test_uncaught_exception.xml") |