diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-04-06 21:25:51 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-04-06 21:25:51 -0700 |
| commit | ca38efec194f7d4e437a294838268a2ccdf609e9 (patch) | |
| tree | 74237271f5ff456f69dcbf608b4d65543d16064e | |
| parent | 83526c6c7c16c483f42bee4d4602c2b9f88258cc (diff) | |
| parent | 42fa660d84398b0b06908948e2064b711d72da3f (diff) | |
Merge branch 'next' into python3
| -rw-r--r-- | gr-zeromq/python/zeromq/probe_manager.py | 2 | ||||
| -rw-r--r-- | gr-zeromq/python/zeromq/qa_zeromq_pub.py | 6 | ||||
| -rw-r--r-- | gr-zeromq/python/zeromq/qa_zeromq_pubsub.py | 20 | ||||
| -rw-r--r-- | gr-zeromq/python/zeromq/qa_zeromq_pushpull.py | 20 | ||||
| -rw-r--r-- | gr-zeromq/python/zeromq/qa_zeromq_reqrep.py | 20 |
5 files changed, 45 insertions, 23 deletions
diff --git a/gr-zeromq/python/zeromq/probe_manager.py b/gr-zeromq/python/zeromq/probe_manager.py index b59650cd7b..c224ca7870 100644 --- a/gr-zeromq/python/zeromq/probe_manager.py +++ b/gr-zeromq/python/zeromq/probe_manager.py @@ -38,7 +38,7 @@ class probe_manager(object): self.poller.register(socket, zmq.POLLIN) def watcher(self): - poll = dict(self.poller.poll(0)) + poll = dict(self.poller.poll(None)) for i in self.interfaces: # i = (socket, data_type, callback_func) if poll.get(i[0]) == zmq.POLLIN: diff --git a/gr-zeromq/python/zeromq/qa_zeromq_pub.py b/gr-zeromq/python/zeromq/qa_zeromq_pub.py index 1bf3263747..2cee710d2a 100644 --- a/gr-zeromq/python/zeromq/qa_zeromq_pub.py +++ b/gr-zeromq/python/zeromq/qa_zeromq_pub.py @@ -25,6 +25,7 @@ from gnuradio import gr, gr_unittest from gnuradio import blocks, zeromq from gnuradio import eng_notation +import threading class qa_zeromq_pub (gr_unittest.TestCase): @@ -43,8 +44,11 @@ class qa_zeromq_pub (gr_unittest.TestCase): self.tb.connect(src, zeromq_pub_sink) self.probe_manager = zeromq.probe_manager() self.probe_manager.add_socket("tcp://127.0.0.1:5555", 'float32', self.recv_data) + zmq_pull_t = threading.Thread(target=self.probe_manager.watcher) + zmq_pull_t.daemon = True + zmq_pull_t.start() self.tb.run() - self.probe_manager.watcher() + zmq_pull_t.join() self.assertFloatTuplesAlmostEqual(self.rx_data, src_data) def recv_data (self, data): diff --git a/gr-zeromq/python/zeromq/qa_zeromq_pubsub.py b/gr-zeromq/python/zeromq/qa_zeromq_pubsub.py index fe28b11caf..21c96a3713 100644 --- a/gr-zeromq/python/zeromq/qa_zeromq_pubsub.py +++ b/gr-zeromq/python/zeromq/qa_zeromq_pubsub.py @@ -29,10 +29,12 @@ import time class qa_zeromq_pubsub (gr_unittest.TestCase): def setUp (self): - self.tb = gr.top_block () + self.send_tb = gr.top_block() + self.recv_tb = gr.top_block() def tearDown (self): - self.tb = None + self.send_tb = None + self.recv_tb = None def test_001 (self): vlen = 10 @@ -41,12 +43,16 @@ class qa_zeromq_pubsub (gr_unittest.TestCase): zeromq_pub_sink = zeromq.pub_sink(gr.sizeof_float, vlen, "tcp://127.0.0.1:5556", 0) zeromq_sub_source = zeromq.sub_source(gr.sizeof_float, vlen, "tcp://127.0.0.1:5556", 0) sink = blocks.vector_sink_f(vlen) - self.tb.connect(src, zeromq_pub_sink) - self.tb.connect(zeromq_sub_source, sink) - self.tb.start() + self.send_tb.connect(src, zeromq_pub_sink) + self.recv_tb.connect(zeromq_sub_source, sink) + self.recv_tb.start() time.sleep(0.25) - self.tb.stop() - self.tb.wait() + self.send_tb.start() + time.sleep(0.25) + self.recv_tb.stop() + self.send_tb.stop() + self.recv_tb.wait() + self.send_tb.wait() self.assertFloatTuplesAlmostEqual(sink.data(), src_data) if __name__ == '__main__': diff --git a/gr-zeromq/python/zeromq/qa_zeromq_pushpull.py b/gr-zeromq/python/zeromq/qa_zeromq_pushpull.py index 8ecd531988..b4dde8b2b2 100644 --- a/gr-zeromq/python/zeromq/qa_zeromq_pushpull.py +++ b/gr-zeromq/python/zeromq/qa_zeromq_pushpull.py @@ -27,10 +27,12 @@ import time class qa_zeromq_pushpull (gr_unittest.TestCase): def setUp (self): - self.tb = gr.top_block () + self.send_tb = gr.top_block() + self.recv_tb = gr.top_block() def tearDown (self): - self.tb = None + self.send_tb = None + self.recv_tb = None def test_001 (self): vlen = 10 @@ -39,12 +41,16 @@ class qa_zeromq_pushpull (gr_unittest.TestCase): zeromq_push_sink = zeromq.push_sink(gr.sizeof_float, vlen, "tcp://127.0.0.1:5557") zeromq_pull_source = zeromq.pull_source(gr.sizeof_float, vlen, "tcp://127.0.0.1:5557", 0) sink = blocks.vector_sink_f(vlen) - self.tb.connect(src, zeromq_push_sink) - self.tb.connect(zeromq_pull_source, sink) - self.tb.start() + self.send_tb.connect(src, zeromq_push_sink) + self.recv_tb.connect(zeromq_pull_source, sink) + self.recv_tb.start() time.sleep(0.25) - self.tb.stop() - self.tb.wait() + self.send_tb.start() + time.sleep(0.25) + self.recv_tb.stop() + self.send_tb.stop() + self.recv_tb.wait() + self.send_tb.wait() self.assertFloatTuplesAlmostEqual(sink.data(), src_data) if __name__ == '__main__': diff --git a/gr-zeromq/python/zeromq/qa_zeromq_reqrep.py b/gr-zeromq/python/zeromq/qa_zeromq_reqrep.py index 664e156528..9fccbf300d 100644 --- a/gr-zeromq/python/zeromq/qa_zeromq_reqrep.py +++ b/gr-zeromq/python/zeromq/qa_zeromq_reqrep.py @@ -30,10 +30,12 @@ import time class qa_zeromq_reqrep (gr_unittest.TestCase): def setUp (self): - self.tb = gr.top_block () + self.send_tb = gr.top_block() + self.recv_tb = gr.top_block() def tearDown (self): - self.tb = None + self.send_tb = None + self.recv_tb = None def test_001 (self): vlen = 10 @@ -42,12 +44,16 @@ class qa_zeromq_reqrep (gr_unittest.TestCase): zeromq_rep_sink = zeromq.rep_sink(gr.sizeof_float, vlen, "tcp://127.0.0.1:5558", 0) zeromq_req_source = zeromq.req_source(gr.sizeof_float, vlen, "tcp://127.0.0.1:5558", 0) sink = blocks.vector_sink_f(vlen) - self.tb.connect(src, zeromq_rep_sink) - self.tb.connect(zeromq_req_source, sink) - self.tb.start() + self.send_tb.connect(src, zeromq_rep_sink) + self.recv_tb.connect(zeromq_req_source, sink) + self.recv_tb.start() time.sleep(0.25) - self.tb.stop() - self.tb.wait() + self.send_tb.start() + time.sleep(0.25) + self.recv_tb.stop() + self.send_tb.stop() + self.recv_tb.wait() + self.send_tb.wait() self.assertFloatTuplesAlmostEqual(sink.data(), src_data) if __name__ == '__main__': |