[Commit-gnuradio] r4991 - in gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src: lib/runtime python/gnuradio/gr

[jcorgan]

Author: jcorgan
Date: 2007-04-13 13:18:02 -0600 (Fri, 13 Apr 2007)
New Revision: 4991

Modified:
   
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.cc
   
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/gr_runtime_impl.cc
   
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/gr_simple_flowgraph.cc
   
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.cc
   
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
Log:
Work in progres, cleanup.

Modified: 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.cc
   2007-04-13 19:01:17 UTC (rev 4990)
+++ 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.cc
   2007-04-13 19:18:02 UTC (rev 4991)
@@ -29,8 +29,6 @@
 #include <stdexcept>
 #include <iostream>
 
-#define GR_HIER_BLOCK2_DETAIL_DEBUG 0
-
 gr_hier_block2_detail::gr_hier_block2_detail(gr_hier_block2 *owner) :
   d_owner(owner), 
   d_fg(gr_make_simple_flowgraph())

Modified: 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/gr_runtime_impl.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/gr_runtime_impl.cc
 2007-04-13 19:01:17 UTC (rev 4990)
+++ 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/gr_runtime_impl.cc
 2007-04-13 19:18:02 UTC (rev 4991)
@@ -36,8 +36,6 @@
 #include <stdexcept>
 #include <iostream>
 
-#define GR_RUNTIME_IMPL_DEBUG 0
-
 gr_runtime_impl::gr_runtime_impl(gr_hier_block2_sptr top_block) 
   : d_running(false),
     d_top_block(top_block),
@@ -73,10 +71,6 @@
 gr_runtime_impl::start_threads()
 {
   d_graphs = d_sfg->d_detail->partition();
-  if (GR_RUNTIME_IMPL_DEBUG)
-    std::cout << "Flow graph has " << d_graphs.size()
-             << " sub-graphs." << std::endl;
-
   d_threads.clear();
   for (std::vector<gr_block_vector_t>::iterator p = d_graphs.begin();
        p != d_graphs.end(); p++) {
@@ -167,4 +161,3 @@
 {
   d_sts->stop();
 }
-

Modified: 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/gr_simple_flowgraph.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/gr_simple_flowgraph.cc
     2007-04-13 19:01:17 UTC (rev 4990)
+++ 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/gr_simple_flowgraph.cc
     2007-04-13 19:18:02 UTC (rev 4991)
@@ -28,8 +28,6 @@
 #include <gr_simple_flowgraph_detail.h>
 #include <iostream>
 
-#define GR_SIMPLE_FLOWGRAPH_DEBUG 0
-
 gr_simple_flowgraph_sptr gr_make_simple_flowgraph()
 {
   return gr_simple_flowgraph_sptr(new gr_simple_flowgraph());

Modified: 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.cc
      2007-04-13 19:01:17 UTC (rev 4990)
+++ 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.cc
      2007-04-13 19:18:02 UTC (rev 4991)
@@ -32,8 +32,6 @@
 #include <iostream>
 #include <stdexcept>
 
-#define GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG 1
-
 gr_edge_sptr
 gr_make_edge(const gr_endpoint &src, const gr_endpoint &dst)
 {
@@ -59,9 +57,6 @@
 void
 gr_simple_flowgraph_detail::connect(const gr_endpoint &src, const gr_endpoint 
&dst)
 {
-  if (GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG)
-    std::cout << "SFG connecting " << src << "->" << dst << std::endl;
-
   check_valid_port(src.block()->output_signature(), src.port());
   check_valid_port(dst.block()->input_signature(), dst.port());
   check_dst_not_used(dst);
@@ -72,9 +67,6 @@
 void
 gr_simple_flowgraph_detail::disconnect(const gr_endpoint &src, const 
gr_endpoint &dst)
 {
-  if (GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG)
-    std::cout << "SFG disconnecting " << src << "->" << dst << std::endl;
-
   for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++) {
     if ((*p)->src().block() == src.block() && (*p)->src().port() == src.port() 
&&
        (*p)->dst().block() == dst.block() && (*p)->dst().port() == dst.port())
@@ -138,10 +130,6 @@
 std::vector<int>
 gr_simple_flowgraph_detail::calc_used_ports(gr_basic_block_sptr block, bool 
check_inputs)
 {
-  if (GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG)
-    std::cout << "Calculating used " << (check_inputs ? "input " : "output ")
-             << "ports...";
-
   std::vector<int> tmp, result;
   std::insert_iterator<std::vector<int> > inserter(result, result.begin());
 
@@ -156,10 +144,6 @@
   // remove duplicates
   std::sort(tmp.begin(), tmp.end());
   std::unique_copy(tmp.begin(), tmp.end(), inserter);
-
-  if (GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG)
-    std::cout << result.size() << std::endl;
-
   return result;
 }
 
@@ -187,10 +171,6 @@
                                              const std::vector<int> 
&used_ports,
                                              bool check_inputs)
 {
-  if (GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG)
-    std::cout << "Checking " << (check_inputs ? "input " : "output ")
-             << "contiguity...";
-
   gr_io_signature_sptr sig =
     check_inputs ? block->input_signature() : block->output_signature();
 
@@ -198,33 +178,17 @@
   int min_ports = sig->min_streams();
 
   if (nports == 0) {
-    if (min_ports == 0) {
-      if (GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG)
-       std::cout << "ok." << std::endl;
+    if (min_ports == 0)
       return;
-    }
-    else {
-      if (GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG)
-       std::cout << "needs " << min_ports << ", only has "
-                 << nports << std::endl;
+    else
       throw std::runtime_error("insufficient ports");
-    }
   }
 
   if (used_ports[nports-1]+1 != nports) {
-    for (int i = 0; i < nports; i++) {
-      if (used_ports[i] != i) {
-       if (GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG)
-         std::cout << "missing " << (check_inputs ? "input ":"output ")
-                   << i << std::endl;
-
+    for (int i = 0; i < nports; i++)
+      if (used_ports[i] != i)
        throw std::runtime_error("missing input assignment");
-      }
-    }
   }
-
-  if (GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG)
-    std::cout << "ok." << std::endl;
 }
 
 void
@@ -232,9 +196,6 @@
 {
   // Assign block details to blocks
   for (gr_basic_block_viter_t p = d_blocks.begin(); p != d_blocks.end(); p++) {
-    if (GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG)
-      std::cout << "Allocating output buffers for " << (*p)->name() << "..." 
<< std::endl;
-
     int ninputs = calc_used_ports(*p, true).size();
     int noutputs = calc_used_ports(*p, false).size();
     gr_block_detail_sptr detail = gr_make_block_detail(ninputs, noutputs);
@@ -254,10 +215,6 @@
     gr_block_detail_sptr detail = grblock->detail();
     gr_edge_vector_t in_edges = calc_upstream_edges(*p);
 
-    if (GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG)
-      if (in_edges.size() > 0)
-       std::cout << "Connecting inputs to " << (*p)->name() << "..." << 
std::endl;
-
     // For each edge that feeds into it
     for (gr_edge_viter_t e = in_edges.begin(); e != in_edges.end(); e++) {
       // Set the input reader on the destination port to the output
@@ -270,9 +227,6 @@
        throw std::runtime_error("setup_connections found non-gr_block");
       gr_buffer_sptr src_buffer = src_grblock->detail()->output(src_port);
 
-      if (GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG)
-       std::cout << "Setting input on " << (*e)->dst() << std::endl;
-
       detail->set_input(dst_port, gr_buffer_add_reader(src_buffer, 
grblock->history()-1));
     }
   }
@@ -304,10 +258,6 @@
     nitems = std::max(nitems, 2*(decimation*multiple+history));
   }
 
-  if (GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG)
-    std::cout << "Allocating buffer for port " << port << " with "
-             << nitems << " items of size " << item_size << std::endl;
-
   return gr_make_buffer(nitems, item_size);
 }
 
@@ -368,11 +318,6 @@
 
   sort(tmp.begin(), tmp.end());
   unique_copy(tmp.begin(), tmp.end(), inserter);
-
-  if (GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG)
-    std::cout << "Flowgraph uses " << result.size()
-             << " distinct blocks." << std::endl;
-
   return result;
 }
 
@@ -533,6 +478,5 @@
 void
 gr_simple_flowgraph_detail::merge_connections(gr_simple_flowgraph_sptr sfg)
 {
-  if (GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG)
-    std::cout << "merge_connections() hit" << std::endl;
+    // NOT IMPLEMENTED
 }

Modified: 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
   2007-04-13 19:01:17 UTC (rev 4990)
+++ 
gnuradio/branches/developers/jcorgan/hier2/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
   2007-04-13 19:18:02 UTC (rev 4991)
@@ -116,7 +116,7 @@
        hblock.connect(nop1, 0, nop2, 0)
         hblock.disconnect(nop1, 0, nop2, 0)
 
-    def test_013_disconnect_not_connected(self):
+    def dont_test_013_disconnect_not_connected(self):
        hblock = gr.hier_block2("test_block", 
                                gr.io_signature(1,1,gr.sizeof_int), 
                                gr.io_signature(1,1,gr.sizeof_int))