core: Added QA for max_noutput_items per block and max_output_buffer.

2 files changed, 103 insertions, 1 deletions

diff --git a/gnuradio-core/src/lib/runtime/qa_gr_top_block.cc b/gnuradio-core/src/lib/runtime/qa_gr_top_block.cc
index fe0883eba..a0b4755a8 100644
--- a/gnuradio-core/src/lib/runtime/qa_gr_top_block.cc
+++ b/gnuradio-core/src/lib/runtime/qa_gr_top_block.cc
@@ -27,6 +27,7 @@
 #include <qa_gr_top_block.h>
 #include <gr_top_block.h>
 #include <gr_head.h>
+#include <gr_nop.h>
 #include <gr_null_source.h>
 #include <gr_null_sink.h>
 #include <iostream>
@@ -140,7 +141,7 @@ void qa_gr_top_block::t5_max_noutputs()
 
 void qa_gr_top_block::t6_reconfig_max_noutputs()
 {
-  if (VERBOSE) std::cout << "qa_gr_top_block::t5()\n";
+  if (VERBOSE) std::cout << "qa_gr_top_block::t6()\n";
 
   gr_top_block_sptr tb = gr_make_top_block("top");
 
@@ -164,3 +165,100 @@ void qa_gr_top_block::t6_reconfig_max_noutputs()
   // Wait for flowgraph to end on its own
   tb->wait();
 }
+
+void qa_gr_top_block::t7_max_noutputs_per_block()
+{
+  if (VERBOSE) std::cout << "qa_gr_top_block::t7()\n";
+
+  gr_top_block_sptr tb = gr_make_top_block("top");
+
+  gr_block_sptr src = gr_make_null_source(sizeof(int));
+  gr_block_sptr head = gr_make_head(sizeof(int), 100000);
+  gr_block_sptr dst = gr_make_null_sink(sizeof(int));
+
+  head->set_max_noutput_items(100);
+
+  // Start infinite flowgraph
+  tb->connect(src, 0, head, 0);
+  tb->connect(head, 0, dst, 0);
+  tb->start();
+  tb->wait();
+}
+
+void qa_gr_top_block::t8_reconfig_max_noutputs_per_block()
+{
+  if (VERBOSE) std::cout << "qa_gr_top_block::t8()\n";
+
+  gr_top_block_sptr tb = gr_make_top_block("top");
+
+  gr_block_sptr src = gr_make_null_source(sizeof(int));
+  gr_block_sptr head = gr_make_head(sizeof(int), 100000);
+  gr_block_sptr dst = gr_make_null_sink(sizeof(int));
+
+  head->set_max_noutput_items(99);
+
+  // Start infinite flowgraph
+  tb->connect(src, 0, dst, 0);
+  tb->start(201);
+
+  // Reconfigure with gr_head in the middle
+  tb->lock();
+  tb->disconnect(src, 0, dst, 0);
+  tb->connect(src, 0, head, 0);
+  tb->connect(head, 0, dst, 0);
+  tb->set_max_noutput_items(1023);
+  head->set_max_noutput_items(513);
+  tb->unlock();
+
+  // Wait for flowgraph to end on its own
+  tb->wait();
+}
+
+void qa_gr_top_block::t9_max_output_buffer()
+{
+  if (VERBOSE) std::cout << "qa_gr_top_block::t9()\n";
+
+  gr_top_block_sptr tb = gr_make_top_block("top");
+
+  gr_block_sptr src = gr_make_null_source(sizeof(int));
+  gr_block_sptr head = gr_make_head(sizeof(int), 100000);
+  gr_block_sptr dst = gr_make_null_sink(sizeof(int));
+
+  head->set_max_output_buffer(1024);
+
+  // Start infinite flowgraph
+  tb->connect(src, 0, head, 0);
+  tb->connect(head, 0, dst, 0);
+  tb->start();
+  tb->wait();
+}
+
+void qa_gr_top_block::t10_reconfig_max_output_buffer()
+{
+  if (VERBOSE) std::cout << "qa_gr_top_block::t10()\n";
+
+  gr_top_block_sptr tb = gr_make_top_block("top");
+
+  gr_block_sptr src = gr_make_null_source(sizeof(int));
+  gr_block_sptr head = gr_make_head(sizeof(int), 100000);
+  gr_block_sptr dst = gr_make_null_sink(sizeof(int));
+
+  head->set_max_output_buffer(1000);
+
+  // Start infinite flowgraph
+  tb->connect(src, 0, dst, 0);
+  tb->start(201);
+
+  // Reconfigure with gr_head in the middle
+  tb->lock();
+  gr_block_sptr nop = gr_make_nop(sizeof(int));
+  nop->set_max_output_buffer(4000);
+  tb->disconnect(src, 0, dst, 0);
+  tb->connect(src, 0, head, 0);
+  tb->connect(head, 0, nop, 0);
+  tb->connect(nop, 0, dst, 0);
+  tb->unlock();
+
+  // Wait for flowgraph to end on its own
+  tb->wait();
+}
diff --git a/gnuradio-core/src/lib/runtime/qa_gr_top_block.h b/gnuradio-core/src/lib/runtime/qa_gr_top_block.h
index 7299ca330..bb891abca 100644
--- a/gnuradio-core/src/lib/runtime/qa_gr_top_block.h
+++ b/gnuradio-core/src/lib/runtime/qa_gr_top_block.h
@@ -50,6 +50,10 @@ private:
   void t4_reconfigure();
   void t5_max_noutputs();
   void t6_reconfig_max_noutputs();
+  void t7_max_noutputs_per_block();
+  void t8_reconfig_max_noutputs_per_block();
+  void t9_max_output_buffer();
+  void t10_reconfig_max_output_buffer();
 };
 
 #endif /* INCLUDED_QA_GR_TOP_BLOCK_H */