Changeset 8928

Timestamp:

07/17/08 15:11:38

Author:

eb

Message:

^{C now interrupts top_block.run() and top_block.wait(), even in python's main thread.}

Files:

• gnuradio/branches/features/mp-sched/gnuradio-core/src/python/gnuradio/gr/top_block.py (modified) (2 diffs)

gnuradio/branches/features/mp-sched/gnuradio-core/src/python/gnuradio/gr/top_block.py

@@ -22 +22 @@
-from gnuradio_swig_python import top_block_swig, \
-    top_block_wait_unlocked, top_block_run_unlocked
+
+#import gnuradio.gr.gr_threading as _threading
+import gr_threading as _threading
+
+
+#
+# There is no problem that can't be solved with an additional
+# level of indirection...
+#
+# This kludge allows ^C to interrupt top_block.run and top_block.wait
+#
+class _top_block_waiter(_threading.Thread):
+    def __init__(self, tb):
+        _threading.Thread.__init__(self)
+        self.setDaemon(1)
+        self.tb = tb
+        self.event = _threading.Event()
+        self.start()
+
+    def run(self):
+        top_block_wait_unlocked(self.tb)
+        self.event.set()
+
+    def wait(self):
+        while True:
+            self.event.wait(0.100)
+
-
-#
@@ -49 +76 @@
-
-    def run(self):
-
+
+
-
-    def wait(self):
-
+
+
-
-    # FIXME: these are duplicated from hier_block2.py; they should really be implemented