Changeset 8271

Timestamp:

04/24/08 14:32:58

Author:

jcorgan

Message:

Merged changeset r8231:8270 from jcorgan/merge-fix into trunk. Fixes flowgraph reconfiguration bug reported by Tim O'Shea and Mark Schneider.

Files:

• gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_flat_flowgraph.cc (modified) (6 diffs)
• gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_flat_flowgraph.h (modified) (1 diff)
• gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc (modified) (1 diff)

gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_flat_flowgraph.cc

@@ -63 +63 @@
-
-gr_block_detail_sptr
-, gr_block_detail_sptr old_detail
+
-{
-  int ninputs = calc_used_ports(block, true).size();
@@ -72 +72 @@
-    std::cout << "Creating block detail for " << block << std::endl;
-
-  // Re-use or allocate output buffers
-  for (int i = 0; i < noutputs; i++) {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-    detail->set_output(i, buffer);
-  }
@@ -157 +146 @@
-gr_flat_flowgraph::merge_connections(gr_flat_flowgraph_sptr old_ffg)
-{
-std::map<gr_block_sptr, gr_block_detail_sptr> old_details;
-
-Allocate or reuse output buffers
+// Allocate block details if needed.  Only new blocks that aren't pruned out
+
+already have one.
-  for (gr_basic_block_viter_t p = d_blocks.begin(); p != d_blocks.end(); p++) {
-    gr_block_sptr block = make_gr_block_sptr(*p);
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  for (gr_basic_block_viter_t p = d_blocks.begin(); p != d_blocks.end(); p++) {
-    gr_block_sptr block = make_gr_block_sptr(*p);
-
-    if (GR_FLAT_FLOWGRAPH_DEBUG)
-test
+merg
-    
-    if (old_ffg->has_block_p(*p)) {
@@ -181 +200 @@
-        std::cout << "used in old flow graph" << std::endl;
-      gr_block_detail_sptr detail = block->detail();
-
+
-      // Iterate through the inputs and see what needs to be done
-
+
+
-        if (GR_FLAT_FLOWGRAPH_DEBUG)
-
+block << ":" << 
-        gr_edge edge = calc_upstream_edge(*p, i);
-
@@ -193 +213 @@
-        gr_buffer_sptr src_buffer = src_detail->output(edge.src().port());
-        gr_buffer_reader_sptr old_reader;
-
-
-
+
+
-        
-        // If there's a match, use it
-        if (old_reader && (src_buffer == old_reader->buffer())) {
-          if (GR_FLAT_FLOWGRAPH_DEBUG)
-
-
-
+
-        }
-        else {
@@ -219 +236 @@
-      connect_block_inputs(block);
-    }
+
+    // Now deal with the fact that the block details might have changed numbers of 
+    // inputs and outputs vs. in the old flowgraph.
-  }  
-}
-
+void gr_flat_flowgraph::dump()
+{
+  for (gr_edge_viter_t e = d_edges.begin(); e != d_edges.end(); e++)
+     std::cout << " edge: " << (*e) << std::endl;
+
+  for (gr_basic_block_viter_t p = d_blocks.begin(); p != d_blocks.end(); p++) {
+    std::cout << " block: " << (*p) << std::endl;
+    gr_block_detail_sptr detail = make_gr_block_sptr(*p)->detail();
+    std::cout << "  detail @" << detail << ":" << std::endl;
+     
+    int ni = detail->ninputs();
+    int no = detail->noutputs();
+    for (int i = 0; i < no; i++) {
+      gr_buffer_sptr buffer = detail->output(i);
+      std::cout << "   output " << i << ": " << buffer 
+                << " space=" << buffer->space_available() << std::endl;
+    }
+
+    for (int i = 0; i < ni; i++) {
+      gr_buffer_reader_sptr reader = detail->input(i);
+      std::cout << "   reader " <<  i << ": " << reader
+                << " reading from buffer=" << reader->buffer()
+                << " avail=" << reader->items_available() << " items"
+                << std::endl;
+    }
+  }
+
+}

gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_flat_flowgraph.h

@@ -54 +54 @@
-  void merge_connections(gr_flat_flowgraph_sptr sfg);
-
+  void dump();
+
-private:
-  gr_flat_flowgraph();
-
-  static const unsigned int s_fixed_buffer_size = GR_FIXED_BUFFER_SIZE;
-
-
+
-  gr_buffer_sptr allocate_buffer(gr_basic_block_sptr block, int port);
-  void connect_block_inputs(gr_basic_block_sptr block);

gnuradio/trunk/gnuradio-core/src/lib/runtime/gr_top_block_impl.cc

@@ -216 +216 @@
-  gr_flat_flowgraph_sptr new_ffg = d_owner->flatten();        
-  new_ffg->validate();                 // check consistency, sanity, etc
+
+  if (GR_TOP_BLOCK_IMPL_DEBUG) {
+      std::cout << std::endl << "*** Existing flat flowgraph @" << d_ffg << ":" << std::endl;
+      d_ffg->dump();
+  }
-  new_ffg->merge_connections(d_ffg);   // reuse buffers, etc
-
-
-
+
+
+
+
+
-  d_ffg = new_ffg;
-