4 files changed, 130 insertions, 3 deletions
diff --git a/gr-blocks/lib/socket_pdu_impl.cc b/gr-blocks/lib/socket_pdu_impl.cc
index 756e2dfd0f..7f7abd50be 100644
--- a/gr-blocks/lib/socket_pdu_impl.cc
+++ b/gr-blocks/lib/socket_pdu_impl.cc
@@ -128,6 +128,23 @@ namespace gr {
       d_started = true;
     }
 
+    socket_pdu_impl::~socket_pdu_impl()
+    {
+      stop();
+    }
+
+    bool
+    socket_pdu_impl::stop()
+    {
+      if (d_started) {
+        d_io_service.stop();
+        d_thread.interrupt();
+        d_thread.join();
+      }
+      d_started = false;
+      return true;
+    }
+
     void
     socket_pdu_impl::handle_tcp_read(const boost::system::error_code& error, size_t bytes_transferred)
     {
diff --git a/gr-blocks/lib/socket_pdu_impl.h b/gr-blocks/lib/socket_pdu_impl.h
index c0262ce59a..e45f6d4463 100644
--- a/gr-blocks/lib/socket_pdu_impl.h
+++ b/gr-blocks/lib/socket_pdu_impl.h
@@ -30,12 +30,15 @@
 namespace gr {
   namespace blocks {
 
-    class socket_pdu_impl : public socket_pdu, public stream_pdu_base
+    class socket_pdu_impl : public socket_pdu
     {
     private:
       boost::asio::io_service d_io_service;
       std::vector<char> d_rxbuf;
       void run_io_service() { d_io_service.run(); }
+      gr::thread::thread d_thread;
+      bool d_started;
+      bool d_finished;
 
       // TCP specific
       boost::asio::ip::tcp::endpoint d_tcp_endpoint;
@@ -62,6 +65,8 @@ namespace gr {
 
     public:
       socket_pdu_impl(std::string type, std::string addr, std::string port, int MTU = 10000, bool tcp_no_delay = false);
+      ~socket_pdu_impl();
+      bool stop();
     };
 
   } /* namespace blocks */
diff --git a/gr-blocks/python/blocks/qa_socket_pdu.py b/gr-blocks/python/blocks/qa_socket_pdu.py
new file mode 100755
index 0000000000..db9f53c71e
--- /dev/null
+++ b/gr-blocks/python/blocks/qa_socket_pdu.py
@@ -0,0 +1,105 @@
+#!/usr/bin/env python
+#
+# Copyright 2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
+
+from gnuradio import gr, gr_unittest, blocks
+import random
+import pmt
+import time
+
+class qa_socket_pdu (gr_unittest.TestCase):
+
+    def setUp (self):
+        self.tb = gr.top_block ()
+
+    def tearDown (self):
+        self.tb = None
+
+    def test_001 (self):
+        # Test that blocks can be created and destroyed without hanging
+        port = str(random.Random().randint(0, 30000) + 10000)
+        self.pdu_send = blocks.socket_pdu("UDP_CLIENT", "localhost", port)
+        self.pdu_recv = blocks.socket_pdu("UDP_SERVER", "localhost", port)
+        self.pdu_send = None
+        self.pdu_recv = None
+
+    def test_002 (self):
+        # Send a PDU through a pair of UDP sockets
+        port = str(random.Random().randint(0, 30000) + 10000)
+        srcdata = (0x64, 0x6f, 0x67, 0x65)
+        data = pmt.init_u8vector(srcdata.__len__(), srcdata)
+        pdu_msg = pmt.cons(pmt.PMT_NIL, data)
+
+        self.pdu_source = blocks.message_strobe(pdu_msg, 500)
+        self.pdu_recv = blocks.socket_pdu("UDP_SERVER", "localhost", port)
+        self.pdu_send = blocks.socket_pdu("UDP_CLIENT", "localhost", port)
+
+        self.dbg = blocks.message_debug()
+
+        self.tb.msg_connect(self.pdu_source, "strobe", self.pdu_send, "pdus")
+        self.tb.msg_connect(self.pdu_recv, "pdus", self.dbg, "store")
+
+        self.tb.start ()
+        time.sleep(1)
+        self.tb.stop()
+        self.tb.wait()
+        self.pdu_send = None
+        self.pdu_recv = None
+
+        received = self.dbg.get_message(0)
+        received_data = pmt.cdr(received)
+        msg_data = []
+        for i in xrange(4):
+            msg_data.append(pmt.u8vector_ref(received_data, i))
+        self.assertEqual(srcdata, tuple(msg_data))
+
+    def test_003 (self):
+        # Test that block stops when interacting with streaming interface
+        port = str(random.Random().randint(0, 30000) + 10000)
+        srcdata = (0x73, 0x75, 0x63, 0x68, 0x74, 0x65, 0x73, 0x74, 0x76, 0x65, 0x72, 0x79, 0x70, 0x61, 0x73, 0x73)
+        tag_dict = {"offset": 0}
+        tag_dict["key"] = pmt.intern("len")
+        tag_dict["value"] = pmt.from_long(8)
+        tag1 = gr.python_to_tag(tag_dict)
+        tag_dict["offset"] = 8
+        tag2 = gr.python_to_tag(tag_dict)
+        tags = [tag1, tag2]
+
+        src = blocks.vector_source_b(srcdata, False, 1, tags)
+        ts_to_pdu = blocks.tagged_stream_to_pdu(blocks.byte_t, "len")
+        pdu_send = blocks.socket_pdu("UDP_CLIENT", "localhost", "4141")
+        #pdu_recv = blocks.socket_pdu("UDP_SERVER", "localhost", port)
+        pdu_to_ts = blocks.pdu_to_tagged_stream(blocks.byte_t, "len")
+        head = blocks.head(gr.sizeof_char, 10)
+        sink = blocks.vector_sink_b(1)
+
+        self.tb.connect(src, ts_to_pdu)
+        self.tb.msg_connect(ts_to_pdu, "pdus", pdu_send, "pdus")
+        # a UDP socket connects pdu_send to pdu_recv
+        # TODO: test that the recv socket can be destroyed from downstream
+        # that signals DONE. Also that we get the PDUs we sent
+        #self.tb.msg_connect(pdu_recv, "pdus", pdu_to_ts, "pdus")
+        #self.tb.connect(pdu_to_ts, head, sink)
+        self.tb.run()
+
+if __name__ == '__main__':
+    gr_unittest.run(qa_socket_pdu, "qa_socket_pdu.xml")
+
diff --git a/grc/gui/Block.py b/grc/gui/Block.py
index 4157a0882d..6a2e496e20 100644
--- a/grc/gui/Block.py
+++ b/grc/gui/Block.py
@@ -304,7 +304,7 @@ class Block(Element):
     def draw_comment(self, gc, window):
         if not self._comment_pixmap:
             return
-
         x, y = self.get_coordinate()
+        y += self.H if self.is_horizontal() else self.W
         window.draw_drawable(gc, self._comment_pixmap, 0, 0, x,
-                             y + self.H + BLOCK_LABEL_PADDING, -1, -1)
+                             y + BLOCK_LABEL_PADDING, -1, -1)