d_detail->unlock();
}
-void
-gr_hier_block2::flatten(gr_flat_flowgraph_sptr ffg)
+gr_flat_flowgraph_sptr
+gr_hier_block2::flatten() const
{
- d_detail->flatten(ffg);
+ gr_flat_flowgraph_sptr new_ffg = gr_make_flat_flowgraph();
+ d_detail->flatten_aux(new_ffg);
+ return new_ffg;
}
virtual void lock();
virtual void unlock();
- void flatten(gr_flat_flowgraph_sptr ffg);
+ gr_flat_flowgraph_sptr flatten() const;
};
#endif /* INCLUDED_GR_HIER_BLOCK2_H */
}
gr_endpoint
-gr_hier_block2_detail::resolve_endpoint(const gr_endpoint &endp, bool is_input)
+gr_hier_block2_detail::resolve_endpoint(const gr_endpoint &endp, bool is_input) const
{
// Check if endpoint is a leaf node
if (boost::dynamic_pointer_cast<gr_block, gr_basic_block>(endp.block()))
}
void
-gr_hier_block2_detail::flatten(gr_flat_flowgraph_sptr sfg)
+gr_hier_block2_detail::flatten_aux(gr_flat_flowgraph_sptr sfg) const
{
if (GR_HIER_BLOCK2_DETAIL_DEBUG)
std::cout << "flattening " << d_owner->name() << std::endl;
for (gr_basic_block_viter_t p = blocks.begin(); p != blocks.end(); p++) {
gr_hier_block2_sptr hier_block2(boost::dynamic_pointer_cast<gr_hier_block2, gr_basic_block>(*p));
if (hier_block2)
- hier_block2->d_detail->flatten(sfg);
+ hier_block2->d_detail->flatten_aux(sfg);
}
}
void connect_output(int my_port, int port, gr_basic_block_sptr block);
void disconnect_input(int my_port, int port, gr_basic_block_sptr block);
void disconnect_output(int my_port, int port, gr_basic_block_sptr block);
- void flatten(gr_flat_flowgraph_sptr sfg);
+ void flatten_aux(gr_flat_flowgraph_sptr sfg) const;
gr_endpoint resolve_port(int port, bool is_input);
- gr_endpoint resolve_endpoint(const gr_endpoint &endp, bool is_input);
+ gr_endpoint resolve_endpoint(const gr_endpoint &endp, bool is_input) const;
void lock();
void unlock();
gr_top_block_impl::gr_top_block_impl(gr_top_block *owner)
: d_running(false),
- d_ffg(gr_make_flat_flowgraph()),
+ d_ffg(),
d_owner(owner),
d_lock_count(0)
{
throw std::runtime_error("already running");
// Create new flat flow graph by flattening hierarchy
- d_ffg->clear();
- d_owner->flatten(d_ffg);
+ d_ffg = d_owner->flatten();
// Validate new simple flow graph and wire it up
d_ffg->validate();
if (GR_TOP_BLOCK_IMPL_DEBUG)
std::cout << "restart: threads stopped" << std::endl;
- // Create new simple flow graph
- gr_flat_flowgraph_sptr new_ffg = gr_make_flat_flowgraph();
- d_owner->flatten(new_ffg);
- new_ffg->validate();
- new_ffg->merge_connections(d_ffg);
+ // Create new simple flow graph
+ gr_flat_flowgraph_sptr new_ffg = d_owner->flatten();
+ new_ffg->validate(); // check consistency, sanity, etc
+ new_ffg->merge_connections(d_ffg); // reuse buffers, etc
if (GR_TOP_BLOCK_IMPL_DEBUG)
std::cout << "restart: replacing old flow graph with new" << std::endl;