1 files changed, 109 insertions, 61 deletions
diff --git a/gr-blocks/lib/qa_gr_flowgraph.cc b/gr-blocks/lib/qa_gr_flowgraph.cc
index a6d1516162..1933c8252d 100644
--- a/gr-blocks/lib/qa_gr_flowgraph.cc
+++ b/gr-blocks/lib/qa_gr_flowgraph.cc
@@ -25,75 +25,123 @@
 #endif
 
 #include <qa_gr_flowgraph.h>
-#include <gr_flowgraph.h>
+#include <gnuradio/flowgraph.h>
 #include <gnuradio/blocks/nop.h>
 #include <gnuradio/blocks/null_source.h>
 #include <gnuradio/blocks/null_sink.h>
 
+namespace gr {
+  namespace blocks {
+    class null_qa_source : virtual public sync_block {
+      public:
+      typedef boost::shared_ptr<null_qa_source> sptr;
+      static sptr make(size_t sizeof_stream_item);
+    };
+    class null_source_qa_impl : public null_qa_source
+    {
+      public:
+      null_source_qa_impl(size_t sizeof_stream_item)
+              : sync_block("null_source", io_signature::make(0, 0, 0), io_signature::make(1, 1, sizeof_stream_item)) {}
+      ~null_source_qa_impl(){}
+
+      int work(int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) {
+        void *optr;
+        for(size_t n = 0; n < input_items.size(); n++) {
+          optr = (void*)output_items[n];
+          memset(optr, 0, noutput_items * output_signature()->sizeof_stream_item(n));
+        }
+        return noutput_items;
+      }
+    };
+    null_qa_source::sptr null_qa_source::make(size_t sizeof_stream_item)
+    {
+      return gnuradio::get_initial_sptr(new null_source_qa_impl(sizeof_stream_item));
+    }
+    class null_qa_sink : virtual public sync_block
+    {
+      public:
+      typedef boost::shared_ptr<null_qa_sink> sptr;
+      static sptr make(size_t sizeof_stream_item);
+    };
+    class null_sink_qa_impl : public null_qa_sink {
+      public:
+      null_sink_qa_impl(size_t sizeof_stream_item)
+              : sync_block("null_qa_sink", io_signature::make(1, 1, sizeof_stream_item), io_signature::make(0, 0, 0)) {}
+      ~null_sink_qa_impl() {}
+      int work(int noutput_items, gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) {
+        return noutput_items;
+      }
+    };
+    null_qa_sink::sptr null_qa_sink::make(size_t sizeof_stream_item) {
+      return gnuradio::get_initial_sptr(new null_sink_qa_impl(sizeof_stream_item));
+    }
+  } /* namespace blocks */
+} /* namespace gr */
+
 void qa_gr_flowgraph::t0()
 {
-  gr_flowgraph_sptr fg = gr_make_flowgraph();
+  gr::flowgraph_sptr fg = gr::make_flowgraph();
 
   CPPUNIT_ASSERT(fg);
 }
 
 void qa_gr_flowgraph::t1_connect()
 {
-  gr_flowgraph_sptr fg = gr_make_flowgraph();
+  gr::flowgraph_sptr fg = gr::make_flowgraph();
 
-  block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
-  block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
 
   fg->connect(nop1, 0, nop2, 0);
 }
 
 void qa_gr_flowgraph::t2_connect_invalid_src_port_neg()
 {
-  gr_flowgraph_sptr fg = gr_make_flowgraph();
+  gr::flowgraph_sptr fg = gr::make_flowgraph();
 
-  block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
-  block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
 
   CPPUNIT_ASSERT_THROW(fg->connect(nop1, -1, nop2, 0), std::invalid_argument);
 }
 
 void qa_gr_flowgraph::t3_connect_src_port_exceeds()
 {
-  gr_flowgraph_sptr fg = gr_make_flowgraph();
+  gr::flowgraph_sptr fg = gr::make_flowgraph();
 
-  block_sptr src = gr::blocks::null_source::make(sizeof(int));
-  block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
+  gr::block_sptr src = gr::blocks::null_qa_source::make(sizeof(int));
+  gr::block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
 
   CPPUNIT_ASSERT_THROW(fg->connect(src, 1, dst, 0), std::invalid_argument);
 }
 
 void qa_gr_flowgraph::t4_connect_invalid_dst_port_neg()
 {
-  gr_flowgraph_sptr fg = gr_make_flowgraph();
+  gr::flowgraph_sptr fg = gr::make_flowgraph();
 
-  block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
-  block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
 
   CPPUNIT_ASSERT_THROW(fg->connect(nop1, 0, nop2, -1), std::invalid_argument);
 }
 
 void qa_gr_flowgraph::t5_connect_dst_port_exceeds()
 {
-  gr_flowgraph_sptr fg = gr_make_flowgraph();
+  gr::flowgraph_sptr fg = gr::make_flowgraph();
 
-  block_sptr src = gr::blocks::null_source::make(sizeof(int));
-  block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
+  gr::block_sptr src = gr::blocks::null_source::make(sizeof(int));
+  gr::block_sptr dst = gr::blocks::null_qa_sink::make(sizeof(int));
 
   CPPUNIT_ASSERT_THROW(fg->connect(src, 0, dst, 1), std::invalid_argument);
 }
 
 void qa_gr_flowgraph::t6_connect_dst_in_use()
 {
-  gr_flowgraph_sptr fg = gr_make_flowgraph();
+  gr::flowgraph_sptr fg = gr::make_flowgraph();
 
-  block_sptr src1 = gr::blocks::null_source::make(sizeof(int));
-  block_sptr src2 = gr::blocks::null_source::make(sizeof(int));
-  block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
+  gr::block_sptr src1 = gr::blocks::null_source::make(sizeof(int));
+  gr::block_sptr src2 = gr::blocks::null_source::make(sizeof(int));
+  gr::block_sptr dst = gr::blocks::null_sink::make(sizeof(int));
 
   fg->connect(src1, 0, dst, 0);
   CPPUNIT_ASSERT_THROW(fg->connect(src2, 0, dst, 0), std::invalid_argument);
@@ -101,11 +149,11 @@ void qa_gr_flowgraph::t6_connect_dst_in_use()
 
 void qa_gr_flowgraph::t7_connect_one_src_two_dst()
 {
-  gr_flowgraph_sptr fg = gr_make_flowgraph();
+  gr::flowgraph_sptr fg = gr::make_flowgraph();
 
-  block_sptr src = gr::blocks::null_source::make(sizeof(int));
-  block_sptr dst1 = gr::blocks::null_sink::make(sizeof(int));
-  block_sptr dst2 = gr::blocks::null_sink::make(sizeof(int));
+  gr::block_sptr src = gr::blocks::null_source::make(sizeof(int));
+  gr::block_sptr dst1 = gr::blocks::null_sink::make(sizeof(int));
+  gr::block_sptr dst2 = gr::blocks::null_sink::make(sizeof(int));
 
   fg->connect(src, 0, dst1, 0);
   fg->connect(src, 0, dst2, 0);
@@ -113,20 +161,20 @@ void qa_gr_flowgraph::t7_connect_one_src_two_dst()
 
 void qa_gr_flowgraph::t8_connect_type_mismatch()
 {
-  gr_flowgraph_sptr fg = gr_make_flowgraph();
+  gr::flowgraph_sptr fg = gr::make_flowgraph();
 
-  block_sptr nop1 = gr::blocks::nop::make(sizeof(char));
-  block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop1 = gr::blocks::nop::make(sizeof(char));
+  gr::block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
 
   CPPUNIT_ASSERT_THROW(fg->connect(nop1, 0, nop2, 0), std::invalid_argument);
 }
 
 void qa_gr_flowgraph::t9_disconnect()
 {
-  gr_flowgraph_sptr fg = gr_make_flowgraph();
+  gr::flowgraph_sptr fg = gr::make_flowgraph();
 
-  block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
-  block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
 
   fg->connect(nop1, 0, nop2, 0);
   fg->disconnect(nop1, 0, nop2, 0);
@@ -134,11 +182,11 @@ void qa_gr_flowgraph::t9_disconnect()
 
 void qa_gr_flowgraph::t10_disconnect_unconnected_block()
 {
-  gr_flowgraph_sptr fg = gr_make_flowgraph();
+  gr::flowgraph_sptr fg = gr::make_flowgraph();
 
-  block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
-  block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
-  block_sptr nop3 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop3 = gr::blocks::nop::make(sizeof(int));
 
   fg->connect(nop1, 0, nop2, 0);
   CPPUNIT_ASSERT_THROW(fg->disconnect(nop1, 0, nop3, 0), std::invalid_argument);
@@ -146,10 +194,10 @@ void qa_gr_flowgraph::t10_disconnect_unconnected_block()
 
 void qa_gr_flowgraph::t11_disconnect_unconnected_port()
 {
-  gr_flowgraph_sptr fg = gr_make_flowgraph();
+  gr::flowgraph_sptr fg = gr::make_flowgraph();
 
-  block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
-  block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
 
   fg->connect(nop1, 0, nop2, 0);
   CPPUNIT_ASSERT_THROW(fg->disconnect(nop1, 0, nop2, 1), std::invalid_argument);
@@ -157,10 +205,10 @@ void qa_gr_flowgraph::t11_disconnect_unconnected_port()
 
 void qa_gr_flowgraph::t12_validate()
 {
-  gr_flowgraph_sptr fg = gr_make_flowgraph();
+  gr::flowgraph_sptr fg = gr::make_flowgraph();
 
-  block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
-  block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
 
   fg->connect(nop1, 0, nop2, 0);
   fg->validate();
@@ -168,10 +216,10 @@ void qa_gr_flowgraph::t12_validate()
 
 void qa_gr_flowgraph::t13_validate_missing_input_assignment()
 {
-  gr_flowgraph_sptr fg = gr_make_flowgraph();
+  gr::flowgraph_sptr fg = gr::make_flowgraph();
 
-  block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
-  block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
 
   fg->connect(nop1, 0, nop2, 0);
   fg->connect(nop1, 0, nop2, 2);
@@ -180,10 +228,10 @@ void qa_gr_flowgraph::t13_validate_missing_input_assignment()
 
 void qa_gr_flowgraph::t14_validate_missing_output_assignment()
 {
-  gr_flowgraph_sptr fg = gr_make_flowgraph();
+  gr::flowgraph_sptr fg = gr::make_flowgraph();
 
-  block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
-  block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
 
   fg->connect(nop1, 0, nop2, 0);
   fg->connect(nop1, 2, nop2, 1);
@@ -192,10 +240,10 @@ void qa_gr_flowgraph::t14_validate_missing_output_assignment()
 
 void qa_gr_flowgraph::t15_clear()
 {
-  gr_flowgraph_sptr fg = gr_make_flowgraph();
+  gr::flowgraph_sptr fg = gr::make_flowgraph();
 
-  block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
-  block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop1 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop2 = gr::blocks::nop::make(sizeof(int));
 
   fg->connect(nop1, 0, nop2, 0);
 
@@ -210,19 +258,19 @@ void qa_gr_flowgraph::t15_clear()
 
 void qa_gr_flowgraph::t16_partition()
 {
-  gr_flowgraph_sptr fg = gr_make_flowgraph();
+  gr::flowgraph_sptr fg = gr::make_flowgraph();
 
-  block_sptr nop11 = gr::blocks::nop::make(sizeof(int));
-  block_sptr nop12 = gr::blocks::nop::make(sizeof(int));
-  block_sptr nop13 = gr::blocks::nop::make(sizeof(int));
-  block_sptr nop14 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop11 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop12 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop13 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop14 = gr::blocks::nop::make(sizeof(int));
 
-  block_sptr nop21 = gr::blocks::nop::make(sizeof(int));
-  block_sptr nop22 = gr::blocks::nop::make(sizeof(int));
-  block_sptr nop23 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop21 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop22 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop23 = gr::blocks::nop::make(sizeof(int));
 
-  block_sptr nop31 = gr::blocks::nop::make(sizeof(int));
-  block_sptr nop32 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop31 = gr::blocks::nop::make(sizeof(int));
+  gr::block_sptr nop32 = gr::blocks::nop::make(sizeof(int));
 
   // Build disjoint graph #1
   fg->connect(nop11, 0, nop12, 0);
@@ -236,7 +284,7 @@ void qa_gr_flowgraph::t16_partition()
   // Build disjoint graph #3
   fg->connect(nop31, 0, nop32, 0);
 
-  std::vector<basic_block_vector_t> graphs = fg->partition();
+  std::vector<gr::basic_block_vector_t> graphs = fg->partition();
 
   CPPUNIT_ASSERT(graphs.size() == 3);
   CPPUNIT_ASSERT(graphs[0].size() == 4);