[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r5138 - in gnuradio/branches/developers/jcorgan/hb: gn
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r5138 - in gnuradio/branches/developers/jcorgan/hb: gnuradio-core/src/lib/runtime gnuradio-core/src/python/gnuradio/gr gnuradio-examples/python/hier/audio gnuradio-examples/python/hier/dect |
|
Date: |
Thu, 26 Apr 2007 17:34:31 -0600 (MDT) |
Author: jcorgan
Date: 2007-04-26 17:34:30 -0600 (Thu, 26 Apr 2007)
New Revision: 5138
Removed:
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_simple_flowgraph.i
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/gr/qa_simple_flowgraph.py
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/Makefile.am
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_hier_block2.cc
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_hier_block2.h
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_hier_block2.i
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.cc
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.h
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_runtime.cc
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_runtime.h
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_runtime.i
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_runtime_impl.cc
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_runtime_impl.h
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_simple_flowgraph.cc
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_simple_flowgraph.h
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.cc
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.h
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/runtime.i
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/gr/hier_block2.py
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/audio/dial_tone2.py
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/dect/dect_receiver.py
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/dect/gmsk2.py
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/dect/usrp_source.py
Log:
Merged r4913:5133 from developer branch jcorgan/hier2.
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/Makefile.am
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/Makefile.am
2007-04-26 23:21:15 UTC (rev 5137)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/Makefile.am
2007-04-26 23:34:30 UTC (rev 5138)
@@ -129,7 +129,6 @@
gr_msg_queue.i \
gr_realtime.i \
gr_runtime.i \
- gr_simple_flowgraph.i \
gr_single_threaded_scheduler.i \
gr_sync_block.i \
gr_sync_decimator.i \
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_hier_block2.cc
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_hier_block2.cc
2007-04-26 23:21:15 UTC (rev 5137)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_hier_block2.cc
2007-04-26 23:34:30 UTC (rev 5138)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2007 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -50,14 +50,15 @@
}
void
-gr_hier_block2::define_component(const std::string &name, gr_basic_block_sptr
block)
+gr_hier_block2::connect(gr_basic_block_sptr src, int src_port,
+ gr_basic_block_sptr dst, int dst_port)
{
- d_detail->define_component(name, block);
+ d_detail->connect(src, src_port, dst, dst_port);
}
void
-gr_hier_block2::connect(const std::string &src_name, int src_port,
- const std::string &dst_name, int dst_port)
+gr_hier_block2::disconnect(gr_basic_block_sptr src, int src_port,
+ gr_basic_block_sptr dst, int dst_port)
{
- d_detail->connect(src_name, src_port, dst_name, dst_port);
+ d_detail->disconnect(src, src_port, dst, dst_port);
}
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_hier_block2.h
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_hier_block2.h
2007-04-26 23:21:15 UTC (rev 5137)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_hier_block2.h
2007-04-26 23:34:30 UTC (rev 5138)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2007 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -59,9 +59,10 @@
public:
virtual ~gr_hier_block2();
- void define_component(const std::string &name, gr_basic_block_sptr
basic_block);
- void connect(const std::string &src_name, int src_port,
- const std::string &dst_name, int dst_port);
+ void connect(gr_basic_block_sptr src, int src_port,
+ gr_basic_block_sptr dst, int dst_port);
+ void disconnect(gr_basic_block_sptr src, int src_port,
+ gr_basic_block_sptr dst, int dst_port);
};
#endif /* INCLUDED_GR_HIER_BLOCK2_H */
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_hier_block2.i
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_hier_block2.i
2007-04-26 23:21:15 UTC (rev 5137)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_hier_block2.i
2007-04-26 23:34:30 UTC (rev 5138)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2005 Free Software Foundation, Inc.
+ * Copyright 2005,2006,2007 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -44,9 +44,10 @@
~gr_hier_block2 ();
// Add a named block to the container
- void define_component(const std::string &name, gr_basic_block_sptr
basic_block)
+ void connect(gr_basic_block_sptr src, int src_port,
+ gr_basic_block_sptr dst, int dst_port)
throw (std::invalid_argument);
- void connect(const std::string &src_name, int src_port,
- const std::string &dst_name, int dst_port)
+ void disconnect(gr_basic_block_sptr src, int src_port,
+ gr_basic_block_sptr dst, int dst_port)
throw (std::invalid_argument);
};
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.cc
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.cc
2007-04-26 23:21:15 UTC (rev 5137)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.cc
2007-04-26 23:34:30 UTC (rev 5138)
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2007 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -29,199 +29,123 @@
#include <stdexcept>
#include <iostream>
+#define GR_HIER_BLOCK2_DETAIL_DEBUG 1
+
gr_hier_block2_detail::gr_hier_block2_detail(gr_hier_block2 *owner) :
-d_owner(owner)
+ d_owner(owner),
+ d_fg(gr_make_simple_flowgraph()),
+ d_inputs(owner->input_signature()->max_streams()),
+ d_outputs(owner->output_signature()->max_streams())
{
}
gr_hier_block2_detail::~gr_hier_block2_detail()
{
- d_owner = 0; // Don't use delete, we didn't allocate
+ d_owner = 0; // Don't use delete, we didn't allocate
}
-gr_basic_block_sptr
-gr_hier_block2_detail::lookup_block(const std::string &name)
-{
- gr_hier_component_miter_t p = d_components.find(name);
- if (p != d_components.end())
- return p->second;
- else
- return gr_basic_block_sptr();
-}
-
void
-gr_hier_block2_detail::define_component(const std::string &name,
gr_basic_block_sptr block)
+gr_hier_block2_detail::connect(gr_basic_block_sptr src, int src_port,
+ gr_basic_block_sptr dst, int dst_port)
{
- if (!block)
- throw std::invalid_argument("null block passed");
+ if (src.get() == dst.get())
+ throw std::runtime_error("src and destination blocks cannot be the same");
- if (name == "self")
- throw std::invalid_argument("name is reserved");
+ if (src.get() == d_owner)
+ return assign_output(src_port, dst_port, dst);
- // TODO: reject names with '.' inside
-
- if (!lookup_block(name))
- d_components[name] = block;
- else
- throw std::invalid_argument("name already in use");
-}
+ if (dst.get() == d_owner)
+ return assign_input(dst_port, src_port, src);
-void
-gr_hier_block2_detail::connect(const std::string &src_name, int src_port,
- const std::string &dst_name, int dst_port)
-{
- gr_io_signature_sptr src_io_signature;
- gr_io_signature_sptr dst_io_signature;
-
- // Check against our *input_signature* if we're wiring from one of our
external inputs
- if (src_name == "self")
- src_io_signature = d_owner->input_signature();
- else {
- gr_basic_block_sptr src_block = lookup_block(src_name);
- if (!src_block)
- throw std::invalid_argument("undefined src name");
- src_io_signature = src_block->output_signature();
- }
-
- // Check against our *output_signature* if we're wiring to one of our
external outputs
- if (dst_name == "self")
- dst_io_signature = d_owner->output_signature();
- else {
- gr_basic_block_sptr dst_block = lookup_block(dst_name);
- if (!dst_block)
- throw std::invalid_argument("undefined dst name");
- dst_io_signature = dst_block->input_signature();
- }
-
- // Check port numbers are valid
- check_valid_port(src_io_signature, src_port);
- check_valid_port(dst_io_signature, dst_port);
+ d_fg->connect(src, src_port, dst, dst_port);
- // Check destination port not already in use
- check_dst_not_used(dst_name, dst_port);
-
- // Check endpoint types match
- check_type_match(src_io_signature, src_port, dst_io_signature, dst_port);
-
- d_edges.push_back(gr_make_edge(src_name, src_port, dst_name, dst_port));
+ // TODO: connects to NC
}
void
-gr_hier_block2_detail::check_valid_port(gr_io_signature_sptr sig, int port)
+gr_hier_block2_detail::disconnect(gr_basic_block_sptr src, int src_port,
+ gr_basic_block_sptr dst, int dst_port)
{
- if (port < 0)
- throw std::invalid_argument("port number must not be negative");
-
- if (sig->max_streams() >= 0 && port >= sig->max_streams())
- throw std::invalid_argument("port number exceeds max streams");
+ d_fg->disconnect(src, src_port, dst, dst_port);
}
-void
-gr_hier_block2_detail::check_dst_not_used(const std::string name, int port)
-{
- for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++)
- if ((*p)->dst_name() == name && (*p)->dst_port() == port)
- throw std::invalid_argument("destination port in use");
-}
-
-void
-gr_hier_block2_detail::check_type_match(gr_io_signature_sptr src_sig, int
src_port,
- gr_io_signature_sptr dst_sig, int
dst_port)
-{
- if (src_sig->sizeof_stream_item(src_port) !=
dst_sig->sizeof_stream_item(dst_port))
- throw std::invalid_argument("type mismatch");
-}
-
-std::string
-gr_hier_block2_detail::prepend_prefix(const std::string &prefix, const
std::string &str)
-{
- return prefix + ((prefix == "") ? "" : ".") + str;
-}
-
gr_endpoint
-gr_hier_block2_detail::match_endpoint(const std::string &name, int port, bool
is_input)
+gr_hier_block2_detail::match_endpoint(const gr_endpoint &endp, bool is_input)
{
- for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++) {
- if (is_input) {
- if ((*p)->src_name() == name && (*p)->src_port() == port)
- return resolve_endpoint((*p)->dst_name(), (*p)->dst_port(),
"", !is_input);
- }
- else {
- if ((*p)->dst_name() == name && (*p)->dst_port() == port)
- return resolve_endpoint((*p)->src_name(), (*p)->src_port(),
"", !is_input);
- }
+ for (gr_edge_viter_t p = d_fg->d_detail->d_edges.begin(); p !=
d_fg->d_detail->d_edges.end(); p++) {
+ if (is_input) {
+ if ((*p)->src().block().get() == (gr_hier_block2 *)d_owner &&
+ (*p)->src().port() == endp.port())
+ return resolve_endpoint((*p)->dst(), !is_input);
}
+ else {
+ if ((*p)->dst().block().get() == (gr_hier_block2 *)d_owner &&
+ (*p)->dst().port() == endp.port())
+ return resolve_endpoint((*p)->src(), !is_input);
+ }
+ }
- // Should never get here
- throw std::runtime_error("unable to match endpoint");
+ // Should never get here
+ throw std::runtime_error("unable to match endpoint");
}
-gr_endpoint
-gr_hier_block2_detail::resolve_endpoint(const std::string &name, int port,
- const std::string &prefix, bool
is_input)
+void
+gr_hier_block2_detail::assign_input(int my_port, int port, gr_basic_block_sptr
block)
{
- gr_basic_block_sptr basic_block = lookup_block(name);
+ if (port < 0 || port >= (signed)d_inputs.size())
+ throw std::invalid_argument("input port number out of range");
- // Check if 'name' points to gr_block (leaf node)
- gr_block_sptr block(boost::dynamic_pointer_cast<gr_block,
gr_basic_block>(basic_block));
- if (block)
- return gr_endpoint(prepend_prefix(prefix, name), port);
-
- // Check if 'name' points to hierarchical block
- gr_hier_block2_sptr
hier_block2(boost::dynamic_pointer_cast<gr_hier_block2,
gr_basic_block>(basic_block));
- if (hier_block2) {
- std::string child_prefix = prepend_prefix(prefix, name);
- gr_endpoint match(hier_block2->d_detail->match_endpoint("self", port,
!is_input));
- return gr_endpoint(prepend_prefix(child_prefix, match.name()),
match.port());
- }
-
- // Shouldn't ever get here
- throw std::runtime_error("unable to resolve endpoint");
+ d_inputs[my_port] = gr_endpoint(block, port);
}
void
-gr_hier_block2_detail::flatten(gr_simple_flowgraph_sptr sfg, const std::string
&prefix)
+gr_hier_block2_detail::assign_output(int my_port, int port,
gr_basic_block_sptr block)
{
- flatten_components(sfg, prefix);
- flatten_edges(sfg, prefix);
+ if (port < 0 || port >= (signed)d_outputs.size())
+ throw std::invalid_argument("output port number out of range");
+
+ d_outputs[my_port] = gr_endpoint(block, port);
}
-void
-gr_hier_block2_detail::flatten_components(gr_simple_flowgraph_sptr sfg, const
std::string &prefix)
+gr_endpoint
+gr_hier_block2_detail::resolve_endpoint(const gr_endpoint &endp, bool is_input)
{
- // Add my non-hierarchical components to the simple flowgraph, then recurse
- for (gr_hier_component_miter_t p = d_components.begin(); p !=
d_components.end(); p++) {
- std::string name = prepend_prefix(prefix, p->first);
+ // Check if endpoint is a leaf node
+ if (boost::dynamic_pointer_cast<gr_block, gr_basic_block>(endp.block()))
+ return endp;
+
+ // Check if endpoint is a hierarchical block
+ gr_hier_block2_sptr hier_block2(boost::dynamic_pointer_cast<gr_hier_block2,
gr_basic_block>(endp.block()));
+ if (hier_block2)
+ return hier_block2->d_detail->match_endpoint(endp, !is_input);
- gr_basic_block_sptr basic_block = p->second;
- gr_block_sptr block(boost::dynamic_pointer_cast<gr_block,
gr_basic_block>(basic_block));
- if (block)
- sfg->define_component(name, block);
-
- gr_hier_block2_sptr
hier_block2(boost::dynamic_pointer_cast<gr_hier_block2,
gr_basic_block>(basic_block));
- if (hier_block2)
- hier_block2->d_detail->flatten_components(sfg, name);
- }
+ // Shouldn't ever get here
+ throw std::runtime_error("unable to resolve endpoint");
}
void
-gr_hier_block2_detail::flatten_edges(gr_simple_flowgraph_sptr sfg, const
std::string &prefix)
+gr_hier_block2_detail::flatten(gr_simple_flowgraph_sptr sfg)
{
- // Add my edges to the flow graph, resolving references to actual endpoints
- for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++) {
- // Connections to self get resolved/added by parent if actually
connected
- if ((*p)->src_name() == "self" || (*p)->dst_name() == "self")
- continue;
+ // Add my edges to the flow graph, resolving references to actual endpoints
+ for (gr_edge_viter_t p = d_fg->d_detail->d_edges.begin(); p !=
d_fg->d_detail->d_edges.end(); p++) {
+ // Connections to self get resolved/added by parent if actually connected
+ if ((*p)->src().block().get() == (gr_hier_block2 *)d_owner ||
+ (*p)->dst().block().get() == (gr_hier_block2 *)d_owner)
+ continue;
- gr_endpoint src_endp = resolve_endpoint((*p)->src_name(),
(*p)->src_port(), prefix, true);
- gr_endpoint dst_endp = resolve_endpoint((*p)->dst_name(),
(*p)->dst_port(), prefix, false);
- sfg->connect(src_endp.name(), src_endp.port(), dst_endp.name(),
dst_endp.port());
- }
+ // TODO: Silently ignore connections to "NC" (not implemented yed)
- // Recurse hierarchical children
- for (gr_hier_component_miter_t p = d_components.begin(); p !=
d_components.end(); p++) {
- gr_hier_block2_sptr
hier_block2(boost::dynamic_pointer_cast<gr_hier_block2,
gr_basic_block>(p->second));
- if (hier_block2)
- hier_block2->d_detail->flatten_edges(sfg, prepend_prefix(prefix,
p->first));
- }
+ gr_endpoint src_endp = resolve_endpoint((*p)->src(), true);
+ gr_endpoint dst_endp = resolve_endpoint((*p)->dst(), false);
+ sfg->connect(src_endp, dst_endp);
+ }
+
+ gr_basic_block_vector_t blocks = d_fg->d_detail->calc_used_blocks();
+
+ // Recurse hierarchical children
+ 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);
+ }
}
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.h
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.h
2007-04-26 23:21:15 UTC (rev 5137)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_hier_block2_detail.h
2007-04-26 23:34:30 UTC (rev 5138)
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2007 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -25,9 +25,6 @@
#include <gr_simple_flowgraph_detail.h>
#include <boost/utility.hpp>
-typedef std::map<std::string, gr_basic_block_sptr> gr_hier_component_map_t;
-typedef std::map<std::string, gr_basic_block_sptr>::iterator
gr_hier_component_miter_t;
-
class gr_hier_block2_detail : boost::noncopyable
{
private:
@@ -39,26 +36,21 @@
// Private implementation data
gr_hier_block2 *d_owner;
- gr_hier_component_map_t d_components;
- gr_edge_vector_t d_edges;
+ gr_simple_flowgraph_sptr d_fg;
+ gr_endpoint_vector_t d_inputs;
+ gr_endpoint_vector_t d_outputs;
// Private implementation methods
- void define_component(const std::string &name, gr_basic_block_sptr block);
- gr_basic_block_sptr lookup_block(const std::string &name);
- void connect(const std::string &src_name, int src_port,
- const std::string &dst_name, int dst_port);
- void check_valid_port(gr_io_signature_sptr sig, int port);
- void check_dst_not_used(const std::string name, int port);
- void check_type_match(gr_io_signature_sptr src_sig, int src_port,
- gr_io_signature_sptr dst_sig, int dst_port);
- std::string prepend_prefix(const std::string &prefix, const std::string
&str);
- void flatten(gr_simple_flowgraph_sptr sfg, const std::string &prefix = "");
- void flatten_components(gr_simple_flowgraph_sptr sfg, const std::string
&prefix);
- void flatten_edges(gr_simple_flowgraph_sptr sfg, const std::string
&prefix);
- gr_endpoint match_endpoint(const std::string &name, int port, bool
is_input);
- gr_endpoint resolve_endpoint(const std::string &name, int port,
- const std::string &prefix, bool is_input);
-
+ void connect(gr_basic_block_sptr src, int src_port,
+ gr_basic_block_sptr dst, int dst_port);
+ void disconnect(gr_basic_block_sptr, int src_port,
+ gr_basic_block_sptr, int dst_port);
+ void assign_input(int my_port, int port, gr_basic_block_sptr block);
+ void assign_output(int my_port, int port, gr_basic_block_sptr block);
+ void flatten(gr_simple_flowgraph_sptr sfg);
+ gr_endpoint match_endpoint(const gr_endpoint &endp, bool is_input);
+ gr_endpoint resolve_endpoint(const gr_endpoint &endp, bool is_input);
+
public:
~gr_hier_block2_detail();
};
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_runtime.cc
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_runtime.cc
2007-04-26 23:21:15 UTC (rev 5137)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_runtime.cc
2007-04-26 23:34:30 UTC (rev 5138)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2007 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -34,57 +34,64 @@
gr_runtime_sptr
gr_make_runtime(gr_hier_block2_sptr top_block)
{
- return gr_runtime_sptr(new gr_runtime(top_block));
+ return gr_runtime_sptr(new gr_runtime(top_block));
}
gr_runtime::gr_runtime(gr_hier_block2_sptr top_block)
{
- d_impl = new gr_runtime_impl(top_block);
- s_runtime = this;
+ d_impl = new gr_runtime_impl(top_block);
+ s_runtime = this;
}
gr_runtime::~gr_runtime()
{
- s_runtime = 0; // we don't own this
- delete d_impl;
+ s_runtime = 0; // we don't own this
+ delete d_impl;
}
// FIXME: This prevents using more than one gr_runtime instance
static void
runtime_sigint_handler(int signum)
{
-
- if (s_runtime)
- s_runtime->stop();
+ if (s_runtime)
+ s_runtime->stop();
}
void
gr_runtime::start()
{
- gr_local_sighandler sigint(SIGINT, runtime_sigint_handler);
+ gr_local_sighandler sigint(SIGINT, runtime_sigint_handler);
- d_impl->start();
+ d_impl->start();
}
void
gr_runtime::stop()
{
- d_impl->stop();
+ d_impl->stop();
}
void
gr_runtime::wait()
{
- gr_local_sighandler sigint(SIGINT, runtime_sigint_handler);
+ gr_local_sighandler sigint(SIGINT, runtime_sigint_handler);
- d_impl->wait();
+ d_impl->wait();
}
void
gr_runtime::run()
{
- gr_local_sighandler sigint(SIGINT, runtime_sigint_handler);
+ gr_local_sighandler sigint(SIGINT, runtime_sigint_handler);
- d_impl->start();
- d_impl->wait();
+ d_impl->start();
+ d_impl->wait();
}
+
+void
+gr_runtime::restart()
+{
+ gr_local_sighandler sigint(SIGINT, runtime_sigint_handler);
+
+ d_impl->restart();
+}
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_runtime.h
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_runtime.h
2007-04-26 23:21:15 UTC (rev 5137)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_runtime.h
2007-04-26 23:34:30 UTC (rev 5138)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2007 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -29,21 +29,57 @@
gr_runtime_sptr gr_make_runtime(gr_hier_block2_sptr top_block);
+/*!
+ *\brief Runtime object that controls simple flow graph operation
+ *
+ * This class is instantiated with a top-level gr_hier_block2. The
+ * runtime then flattens the hierarchical block into a gr_simple_flowgraph,
+ * and allows control through start(), stop(), wait(), and run().
+ *
+ */
class gr_runtime
{
private:
- gr_runtime(gr_hier_block2_sptr top_block);
- friend gr_runtime_sptr gr_make_runtime(gr_hier_block2_sptr top_block);
+ gr_runtime(gr_hier_block2_sptr top_block);
+ friend gr_runtime_sptr gr_make_runtime(gr_hier_block2_sptr top_block);
- gr_runtime_impl *d_impl;
+ gr_runtime_impl *d_impl;
public:
- ~gr_runtime();
+ ~gr_runtime();
- void start();
- void stop();
- void wait();
- void run();
+ /*!
+ * Start the flow graph. Creates an undetached scheduler thread for
+ * each flow graph partition. Returns to caller once created.
+ */
+ void start();
+
+ /*!
+ * Stop a running flow graph. Tells each created scheduler thread
+ * to exit, then returns to caller.
+ */
+ void stop();
+
+ /*!
+ * Wait for a stopped flow graph to complete. Joins each completed
+ * thread.
+ */
+ void wait();
+
+ /*!
+ * Calls start(), then wait(). Used to run a flow graph that will stop
+ * on its own, or to run a flow graph indefinitely until SIGTERM is
+ * received().
+ */
+ void run();
+
+ /*!
+ * Restart a running flow graph, after topology changes have
+ * been made to its top_block (or children). Causes each created
+ * scheduler thread to end, recalculates the flow graph, and
+ * recreates new threads (possibly a different number from before.)
+ */
+ void restart();
};
#endif /* INCLUDED_GR_RUNTIME_H */
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_runtime.i
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_runtime.i
2007-04-26 23:21:15 UTC (rev 5137)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_runtime.i
2007-04-26 23:34:30 UTC (rev 5138)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2004,2006 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2007 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -36,6 +36,7 @@
void start() throw (std::runtime_error);
void stop() throw (std::runtime_error);
void wait() throw (std::runtime_error);
+ void restart() throw (std::runtime_error);
};
%{
@@ -72,4 +73,10 @@
r->wait();
}
+void runtime_restart_unlocked(gr_runtime_sptr r) throw (std::runtime_error)
+{
+ ensure_py_gil_state2 _lock;
+ r->restart();
+}
+
%}
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_runtime_impl.cc
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_runtime_impl.cc
2007-04-26 23:21:15 UTC (rev 5137)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_runtime_impl.cc
2007-04-26 23:34:30 UTC (rev 5138)
@@ -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),
@@ -52,56 +50,82 @@
void
gr_runtime_impl::start()
{
- if (d_running)
- throw std::runtime_error("already running");
- else
- d_running = true;
+ if (d_running)
+ throw std::runtime_error("already running");
+ else
+ d_running = true;
- d_sfg->d_detail->reset();
- d_top_block->d_detail->flatten(d_sfg);
- d_sfg->d_detail->validate();
- d_sfg->d_detail->setup_connections();
+ // Create new simple flow graph by flattening hierarchical block
+ d_sfg->d_detail->reset();
+ d_top_block->d_detail->flatten(d_sfg);
- d_graphs = d_sfg->d_detail->partition();
- if (GR_RUNTIME_IMPL_DEBUG)
- std::cout << "Flow graph has " << d_graphs.size()
- << " sub-graphs." << std::endl;
+ // Validate new simple flow graph and wire it up
+ d_sfg->d_detail->validate();
+ d_sfg->d_detail->setup_connections();
- d_threads.clear();
- for (std::vector<gr_block_vector_t>::iterator p = d_graphs.begin();
- p != d_graphs.end(); p++) {
- gr_scheduler_thread *thread = new gr_scheduler_thread(*p);
- thread->start();
- d_threads.push_back(thread);
- }
+ // Execute scheduler threads
+ start_threads();
}
void
+gr_runtime_impl::start_threads()
+{
+ d_graphs = d_sfg->d_detail->partition();
+ d_threads.clear();
+ for (std::vector<gr_block_vector_t>::iterator p = d_graphs.begin();
+ p != d_graphs.end(); p++) {
+ gr_scheduler_thread *thread = new gr_scheduler_thread(*p);
+ thread->start();
+ d_threads.push_back(thread);
+ }
+}
+
+void
gr_runtime_impl::stop()
{
- if (!d_running)
- throw std::runtime_error("not running");
+ if (!d_running)
+ throw std::runtime_error("not running");
- for (gr_scheduler_thread_viter_t p = d_threads.begin(); p !=
d_threads.end(); p++)
- (*p)->stop();
+ for (gr_scheduler_thread_viter_t p = d_threads.begin(); p !=
d_threads.end(); p++)
+ (*p)->stop();
- d_running = false;
+ d_running = false;
}
void
gr_runtime_impl::wait()
{
- void *dummy_status; // don't ever dereference this
+ void *dummy_status; // don't ever dereference this
- for (gr_scheduler_thread_viter_t p = d_threads.begin(); p !=
d_threads.end(); p++) {
- (*p)->join(&dummy_status); // pthreads will self-delete, so pointer is
now dead
- (*p) = 0; // FIXME: switch to stl::list and actually remove from
container
- }
+ for (gr_scheduler_thread_viter_t p = d_threads.begin(); p !=
d_threads.end(); p++) {
+ (*p)->join(&dummy_status); // pthreads will self-delete, so pointer is now
dead
+ (*p) = 0; // FIXME: switch to stl::list and actually remove from container
+ }
}
+void
+gr_runtime_impl::restart()
+{
+ if (!d_running)
+ throw std::runtime_error("not running");
+
+ // Stop scheduler threads and wait for completion
+ stop();
+ wait();
+
+ // Create new simple flow graph
+ gr_simple_flowgraph_sptr new_sfg = gr_make_simple_flowgraph();
+ d_top_block->d_detail->flatten(new_sfg);
+ new_sfg->validate();
+ new_sfg->d_detail->merge_connections(d_sfg);
+ // d_sfg = new_sfg;
+
+ start_threads();
+}
+
gr_scheduler_thread::gr_scheduler_thread(gr_block_vector_t graph) :
- omni_thread(NULL, PRIORITY_NORMAL),
- d_sts(gr_make_single_threaded_scheduler(graph))
+ omni_thread(NULL, PRIORITY_NORMAL),
+ d_sts(gr_make_single_threaded_scheduler(graph))
{
}
@@ -111,28 +135,29 @@
void gr_scheduler_thread::start()
{
- start_undetached();
+ start_undetached();
}
void *
gr_scheduler_thread::run_undetached(void *arg)
{
- // First code to run in new thread context
+ // First code to run in new thread context
- // Mask off SIGINT in this thread to gaurantee mainline thread gets signal
+ // Mask off SIGINT in this thread to gaurantee mainline thread gets signal
#ifdef HAVE_SIGPROCMASK
- sigset_t old_set;
- sigset_t new_set;
- sigemptyset(&new_set);
- sigaddset(&new_set, SIGINT);
- sigprocmask(SIG_BLOCK, &new_set, &old_set);
+ sigset_t old_set;
+ sigset_t new_set;
+ sigemptyset(&new_set);
+ sigaddset(&new_set, SIGINT);
+ sigprocmask(SIG_BLOCK, &new_set, &old_set);
#endif
- // Run the single-threaded scheduler
- d_sts->run();
- return 0;
+ // Run the single-threaded scheduler
+ d_sts->run();
+ return 0;
}
-void gr_scheduler_thread::stop()
+void
+gr_scheduler_thread::stop()
{
- d_sts->stop();
+ d_sts->stop();
}
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_runtime_impl.h
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_runtime_impl.h
2007-04-26 23:21:15 UTC (rev 5137)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_runtime_impl.h
2007-04-26 23:34:30 UTC (rev 5138)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2007 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -33,38 +33,56 @@
typedef std::vector<gr_scheduler_thread *> gr_scheduler_thread_vector_t;
typedef gr_scheduler_thread_vector_t::iterator gr_scheduler_thread_viter_t;
+/*!
+ *\brief A single thread of execution for the scheduler
+ *
+ * This class implements a single thread that runs undetached, and
+ * invokes the single-threaded block scheduler. The runtime makes
+ * one of these for each distinct partition of a flowgraph and runs
+ * them in parallel.
+ *
+ */
class gr_scheduler_thread : public omni_thread
{
private:
- gr_single_threaded_scheduler_sptr d_sts;
+ gr_single_threaded_scheduler_sptr d_sts;
public:
- gr_scheduler_thread(gr_block_vector_t graph);
- ~gr_scheduler_thread();
+ gr_scheduler_thread(gr_block_vector_t graph);
+ ~gr_scheduler_thread();
- virtual void *run_undetached(void *arg);
- void start();
- void stop();
+ virtual void *run_undetached(void *arg);
+ void start();
+ void stop();
};
+/*!
+ *\brief Implementation details of gr_runtime
+ *
+ * The actual implementation of gr_runtime. Separate class allows
+ * decoupling of changes from dependent classes.
+ *
+ */
class gr_runtime_impl
{
private:
- gr_runtime_impl(gr_hier_block2_sptr top_block);
- friend class gr_runtime;
+ gr_runtime_impl(gr_hier_block2_sptr top_block);
+ friend class gr_runtime;
- bool d_running;
- gr_hier_block2_sptr d_top_block;
- gr_simple_flowgraph_sptr d_sfg;
- std::vector<gr_block_vector_t> d_graphs;
- gr_scheduler_thread_vector_t d_threads;
+ bool d_running;
+ gr_hier_block2_sptr d_top_block;
+ gr_simple_flowgraph_sptr d_sfg;
+ std::vector<gr_block_vector_t> d_graphs;
+ gr_scheduler_thread_vector_t d_threads;
- void start();
- void stop();
- void wait();
-
+ void start();
+ void start_threads();
+ void stop();
+ void wait();
+ void restart();
+
public:
- ~gr_runtime_impl();
+ ~gr_runtime_impl();
};
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_simple_flowgraph.cc
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_simple_flowgraph.cc
2007-04-26 23:21:15 UTC (rev 5137)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_simple_flowgraph.cc
2007-04-26 23:34:30 UTC (rev 5138)
@@ -28,11 +28,9 @@
#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());
+ return gr_simple_flowgraph_sptr(new gr_simple_flowgraph());
}
gr_simple_flowgraph::gr_simple_flowgraph() :
@@ -42,26 +40,31 @@
gr_simple_flowgraph::~gr_simple_flowgraph()
{
- delete d_detail;
+ delete d_detail;
}
void
-gr_simple_flowgraph::define_component(const std::string &name, gr_block_sptr
block)
+gr_simple_flowgraph::connect(gr_basic_block_sptr src_block, int src_port,
+ gr_basic_block_sptr dst_block, int dst_port)
{
- if (GR_SIMPLE_FLOWGRAPH_DEBUG)
- std::cout << "Defining block " << block << " as " << name << std::endl;
- d_detail->define_component(name, block);
+ d_detail->connect(gr_endpoint(src_block, src_port), gr_endpoint(dst_block,
dst_port));
}
void
-gr_simple_flowgraph::connect(const std::string &src_name, int src_port,
- const std::string &dst_name, int dst_port)
+gr_simple_flowgraph::connect(const gr_endpoint &src, const gr_endpoint &dst)
{
- d_detail->connect(src_name, src_port, dst_name, dst_port);
+ d_detail->connect(src, dst);
}
void
+gr_simple_flowgraph::disconnect(gr_basic_block_sptr src_block, int src_port,
+ gr_basic_block_sptr dst_block, int dst_port)
+{
+ d_detail->disconnect(gr_endpoint(src_block, src_port),
gr_endpoint(dst_block, dst_port));
+}
+
+void
gr_simple_flowgraph::validate()
{
- d_detail->validate();
+ d_detail->validate();
}
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_simple_flowgraph.h
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_simple_flowgraph.h
2007-04-26 23:21:15 UTC (rev 5137)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_simple_flowgraph.h
2007-04-26 23:34:30 UTC (rev 5138)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2007 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -31,22 +31,52 @@
class gr_simple_flowgraph_detail;
+class gr_endpoint
+{
+private:
+ friend class gr_hier_block2_detail;
+ gr_basic_block_sptr d_block;
+ int d_port;
+
+public:
+ gr_endpoint() : d_block(), d_port(0) { } // Internal use only
+ gr_endpoint(gr_basic_block_sptr block, int port) { d_block = block; d_port =
port; }
+ gr_basic_block_sptr block() const { return d_block; }
+ int port() const { return d_port; }
+};
+
+typedef std::vector<gr_endpoint> gr_endpoint_vector_t;
+
+/*!
+ *\brief Class representing a low-level, "flattened" flow graph
+ *
+ * This class holds the results of the call to gr.hier_block2.flatten(),
+ * which is a graph that has only the connected blocks and edges of
+ * the original hier_block2, with all the hierarchy removed.
+ *
+ * While this class is exported to Python via SWIG for ease of QA
+ * testing, it is not used by application developers, and there is
+ * no way to feed this to a gr.runtime() instance.
+ */
class gr_simple_flowgraph
{
private:
- friend class gr_runtime_impl;
- friend gr_simple_flowgraph_sptr gr_make_simple_flowgraph();
- gr_simple_flowgraph();
+ friend class gr_runtime_impl;
+ friend class gr_hier_block2_detail;
+ friend gr_simple_flowgraph_sptr gr_make_simple_flowgraph();
+ gr_simple_flowgraph();
- gr_simple_flowgraph_detail *d_detail;
+ gr_simple_flowgraph_detail *d_detail;
public:
- ~gr_simple_flowgraph();
+ ~gr_simple_flowgraph();
- void define_component(const std::string &name, gr_block_sptr block);
- void connect(const std::string &src, int src_port,
- const std::string &dst, int dst_port);
- void validate();
+ void connect(gr_basic_block_sptr src_block, int src_port,
+ gr_basic_block_sptr dst_block, int dst_port);
+ void connect(const gr_endpoint &src, const gr_endpoint &dst);
+ void disconnect(gr_basic_block_sptr src_block, int src_port,
+ gr_basic_block_sptr dst_block, int dst_port);
+ void validate();
};
#endif /* INCLUDED_GR_SIMPLE_FLOWGRAPH_H */
Deleted:
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_simple_flowgraph.i
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.cc
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.cc
2007-04-26 23:21:15 UTC (rev 5137)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.cc
2007-04-26 23:34:30 UTC (rev 5138)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2007 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -32,31 +32,16 @@
#include <iostream>
#include <stdexcept>
-#define GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG 0
-
gr_edge_sptr
-gr_make_edge(const std::string &src_name, int src_port,
- const std::string &dst_name, int dst_port)
+gr_make_edge(const gr_endpoint &src, const gr_endpoint &dst)
{
- return gr_edge_sptr(new gr_edge(src_name, src_port, dst_name, dst_port));
+ return gr_edge_sptr(new gr_edge(src, dst));
}
-gr_edge::gr_edge(const std::string &src_name, int src_port, const std::string
&dst_name, int dst_port)
- : d_src(src_name, src_port),
- d_dst(dst_name, dst_port)
-{
-}
-
gr_edge::~gr_edge()
{
}
-gr_simple_flowgraph_detail::gr_simple_flowgraph_detail() :
-d_components(),
-d_edges()
-{
-}
-
gr_simple_flowgraph_detail::~gr_simple_flowgraph_detail()
{
}
@@ -64,498 +49,435 @@
void
gr_simple_flowgraph_detail::reset()
{
- // Boost shared pointers will deallocate as needed
- d_edges.clear();
- d_components.clear();
+ // Boost shared pointers will deallocate as needed
+ d_edges.clear();
+ d_blocks.clear();
}
-gr_block_sptr
-gr_simple_flowgraph_detail::lookup_block(const std::string &name)
-{
- gr_component_miter_t p = d_components.find(name);
- if (p != d_components.end())
- return p->second;
- else
- return gr_block_sptr();
-}
-
-std::string
-gr_simple_flowgraph_detail::lookup_name(gr_block_sptr block)
-{
- for (gr_component_miter_t p = d_components.begin(); p !=
d_components.end(); p++) {
- if (p->second == block)
- return p->first;
- }
-
- return std::string(""); // Not found
-}
-
void
-gr_simple_flowgraph_detail::define_component(const std::string &name,
gr_block_sptr block)
+gr_simple_flowgraph_detail::connect(const gr_endpoint &src, const gr_endpoint
&dst)
{
- if (!block)
- throw std::invalid_argument("null block passed");
-
- if (!lookup_block(name))
- d_components[name] = block;
- else
- throw std::invalid_argument("name already in use");
+ check_valid_port(src.block()->output_signature(), src.port());
+ check_valid_port(dst.block()->input_signature(), dst.port());
+ check_dst_not_used(dst);
+ check_type_match(src, dst);
+ d_edges.push_back(gr_make_edge(src,dst));
}
void
-gr_simple_flowgraph_detail::connect(const std::string &src_name, int src_port,
- const std::string &dst_name, int dst_port)
+gr_simple_flowgraph_detail::disconnect(const gr_endpoint &src, const
gr_endpoint &dst)
{
- gr_block_sptr src_block = lookup_block(src_name);
- gr_block_sptr dst_block = lookup_block(dst_name);
+ for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++) {
+ if (src.block() == (*p)->src().block() && src.port() == (*p)->src().port()
&&
+ dst.block() == (*p)->dst().block() && dst.port() == (*p)->dst().port())
{
+ d_edges.erase(p);
+ return;
+ }
+ }
- if (GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG)
- std::cout << "Connecting " << src_name << ":" << src_port << "->"
- << dst_name << ":" << dst_port << std::endl;
-
- if (!src_block)
- throw std::invalid_argument("unknown src name");
- if (!dst_block)
- throw std::invalid_argument("unknown dst name");
-
- check_valid_port(src_block->output_signature(), src_port);
- check_valid_port(dst_block->input_signature(), dst_port);
- check_dst_not_used(dst_name, dst_port);
- check_type_match(src_block, src_port, dst_block, dst_port);
-
- d_edges.push_back(gr_make_edge(src_name, src_port, dst_name, dst_port));
+ throw std::invalid_argument("edge to disconnect not found");
}
void
gr_simple_flowgraph_detail::check_valid_port(gr_io_signature_sptr sig, int
port)
{
- if (port < 0)
- throw std::invalid_argument("negative port number");
- if (sig->max_streams() >= 0 && port >= sig->max_streams())
- throw std::invalid_argument("port number exceeds max");
+ if (port < 0)
+ throw std::invalid_argument("negative port number");
+ if (sig->max_streams() >= 0 && port >= sig->max_streams())
+ throw std::invalid_argument("port number exceeds max");
}
void
-gr_simple_flowgraph_detail::check_dst_not_used(const std::string &name, int
port)
+gr_simple_flowgraph_detail::check_dst_not_used(const gr_endpoint &dst)
{
- for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++)
- if ((*p)->dst_name() == name && (*p)->dst_port() == port)
- throw std::invalid_argument("dst already in use");
+ for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++)
+ if ((*p)->dst().block() == dst.block() &&
+ (*p)->dst().port() == dst.port())
+ throw std::invalid_argument("dst already in use");
}
void
-gr_simple_flowgraph_detail::check_type_match(gr_block_sptr src_block, int
src_port,
- gr_block_sptr dst_block, int
dst_port)
+gr_simple_flowgraph_detail::check_type_match(const gr_endpoint &src, const
gr_endpoint &dst)
{
- int src_size = src_block->output_signature()->sizeof_stream_item(src_port);
- int dst_size = dst_block->input_signature()->sizeof_stream_item(dst_port);
+ int src_size =
src.block()->output_signature()->sizeof_stream_item(src.port());
+ int dst_size =
dst.block()->input_signature()->sizeof_stream_item(dst.port());
- if (src_size != dst_size)
- throw std::invalid_argument("type size mismatch");
+ if (src_size != dst_size)
+ throw std::invalid_argument("type size mismatch while attempting to
connect");
}
void
gr_simple_flowgraph_detail::validate()
{
- for (gr_component_miter_t p = d_components.begin(); p !=
d_components.end(); p++) {
- std::vector<int> used_ports;
- int ninputs, noutputs;
+ d_blocks = calc_used_blocks();
- used_ports = calc_used_ports(p->first, true); // inputs
- ninputs = used_ports.size();
- check_contiguity(p->second, used_ports, true); // inputs
+ for (gr_basic_block_viter_t p = d_blocks.begin(); p != d_blocks.end(); p++) {
+ std::vector<int> used_ports;
+ int ninputs, noutputs;
- used_ports = calc_used_ports(p->first, false); // outputs
- noutputs = used_ports.size();
- check_contiguity(p->second, used_ports, false); // outputs
+ used_ports = calc_used_ports(*p, true); // inputs
+ ninputs = used_ports.size();
+ check_contiguity(*p, used_ports, true); // inputs
- if (!(p->second->check_topology(ninputs, noutputs)))
- throw std::runtime_error("check topology failed");
- }
+ used_ports = calc_used_ports(*p, false); // outputs
+ noutputs = used_ports.size();
+ check_contiguity(*p, used_ports, false); // outputs
+
+ if (!((*p)->check_topology(ninputs, noutputs)))
+ throw std::runtime_error("check topology failed");
+ }
}
std::vector<int>
-gr_simple_flowgraph_detail::calc_used_ports(const std::string &name, bool
check_inputs)
+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());
- std::vector<int> tmp, result;
- std::insert_iterator<std::vector<int> > inserter(result, result.begin());
+ gr_edge_vector_t edges = calc_connections(block, check_inputs);
+ for (gr_edge_viter_t p = edges.begin(); p != edges.end(); p++) {
+ if (check_inputs == true)
+ tmp.push_back((*p)->dst().port());
+ else
+ tmp.push_back((*p)->src().port());
+ }
- gr_edge_vector_t edges = calc_connections(name, check_inputs);
-
- for (gr_edge_viter_t p = edges.begin(); p != edges.end(); p++) {
- if (check_inputs == true)
- tmp.push_back((*p)->dst_port());
- else
- tmp.push_back((*p)->src_port());
- }
-
- // 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;
+ // remove duplicates
+ std::sort(tmp.begin(), tmp.end());
+ std::unique_copy(tmp.begin(), tmp.end(), inserter);
+ return result;
}
gr_edge_vector_t
-gr_simple_flowgraph_detail::calc_connections(const std::string &name, bool
check_inputs)
+gr_simple_flowgraph_detail::calc_connections(gr_basic_block_sptr block, bool
check_inputs)
{
- gr_edge_vector_t result;
+ gr_edge_vector_t result;
- for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++) {
- if (check_inputs) {
- if ((*p)->dst_name() == name)
- result.push_back(*p);
- }
- else {
- if ((*p)->src_name() == name)
- result.push_back(*p);
- }
+ for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++) {
+ if (check_inputs) {
+ if ((*p)->dst().block() == block)
+ result.push_back(*p);
}
+ else {
+ if ((*p)->src().block() == block)
+ result.push_back(*p);
+ }
+ }
- return result; // assumes no duplicates
+ return result; // assumes no duplicates
}
void
-gr_simple_flowgraph_detail::check_contiguity(gr_block_sptr block,
+gr_simple_flowgraph_detail::check_contiguity(gr_basic_block_sptr block,
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();
- gr_io_signature_sptr sig =
- check_inputs ? block->input_signature() : block->output_signature();
+ int nports = used_ports.size();
+ int min_ports = sig->min_streams();
- int nports = used_ports.size();
- int min_ports = sig->min_streams();
+ if (nports == 0) {
+ if (min_ports == 0)
+ return;
+ else
+ throw std::runtime_error("insufficient ports");
+ }
- if (nports == 0) {
- if (min_ports == 0) {
- if (GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG)
- std::cout << "ok." << std::endl;
- return;
- }
- else {
- if (GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG)
- std::cout << "needs " << min_ports << ", only has "
- << nports << std::endl;
-
- 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;
-
- throw std::runtime_error("missing input assignment");
- }
- }
- }
-
- if (GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG)
- std::cout << "ok." << std::endl;
+ if (used_ports[nports-1]+1 != nports) {
+ for (int i = 0; i < nports; i++)
+ if (used_ports[i] != i)
+ throw std::runtime_error("missing input assignment");
+ }
}
void
gr_simple_flowgraph_detail::setup_connections()
{
- // Assign block details to component blocks
- for (gr_component_miter_t p = d_components.begin(); p !=
d_components.end(); p++) {
- if (GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG)
- std::cout << "Allocating output buffers for " << p->first << "..."
<< std::endl;
+ // Assign block details to blocks
+ for (gr_basic_block_viter_t p = d_blocks.begin(); p != d_blocks.end(); p++) {
+ 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);
+ for (int i = 0; i < noutputs; i++)
+ detail->set_output(i, allocate_buffer(*p, i));
- int ninputs = calc_used_ports(p->first, true).size();
- int noutputs = calc_used_ports(p->first, false).size();
- gr_block_detail_sptr detail = gr_make_block_detail(ninputs, noutputs);
- for (int i = 0; i < noutputs; i++)
- detail->set_output(i, allocate_buffer(p->first, i));
- p->second->set_detail(detail);
- }
+ boost::dynamic_pointer_cast<gr_block,
gr_basic_block>(*p)->set_detail(detail);
+ }
- // Connect inputs to outputs for each block
- for(gr_component_miter_t p = d_components.begin(); p !=
d_components.end(); p++) {
- // Get its detail and edges that feed into it
- gr_block_detail_sptr detail = p->second->detail();
- gr_edge_vector_t in_edges = calc_upstream_edges(p->first);
+ // Connect inputs to outputs for each block
+ for(gr_basic_block_viter_t p = d_blocks.begin(); p != d_blocks.end(); p++) {
+ gr_block_sptr grblock(boost::dynamic_pointer_cast<gr_block,
gr_basic_block>(*p));
+ if (!grblock)
+ throw std::runtime_error("setup_connections found non-gr_block");
- if (GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG)
- if (in_edges.size() > 0)
- std::cout << "Connecting inputs to " << p->first << "..."
<< std::endl;
+ // Get its detail and edges that feed into it
+ gr_block_detail_sptr detail = grblock->detail();
+ gr_edge_vector_t in_edges = calc_upstream_edges(*p);
- // For each edge that feeds into it
- for (gr_edge_viter_t e = in_edges.begin(); e != in_edges.end(); e++) {
- // Set the input buffer on the destination port to the output
- // buffer on the source port
- int dst_port = (*e)->dst_port();
- int src_port = (*e)->src_port();
- gr_block_sptr src_block = lookup_block((*e)->src_name());
- gr_buffer_sptr src_buffer = src_block->detail()->output(src_port);
+ // 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
+ // buffer on the source port
+ int dst_port = (*e)->dst().port();
+ int src_port = (*e)->src().port();
+ gr_basic_block_sptr src_block = (*e)->src().block();
+ gr_block_sptr src_grblock(boost::dynamic_pointer_cast<gr_block,
gr_basic_block>(src_block));
+ if (!grblock)
+ 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_name()
- << ":" << dst_port << std::endl;
-
- detail->set_input(dst_port, gr_buffer_add_reader(src_buffer,
p->second->history()-1));
- }
+ detail->set_input(dst_port, gr_buffer_add_reader(src_buffer,
grblock->history()-1));
}
+ }
}
gr_buffer_sptr
-gr_simple_flowgraph_detail::allocate_buffer(const std::string &name, int port)
+gr_simple_flowgraph_detail::allocate_buffer(gr_basic_block_sptr block, int
port)
{
- gr_block_sptr block = lookup_block(name);
- int item_size = block->output_signature()->sizeof_stream_item(port);
- int nitems = s_fixed_buffer_size/item_size;
+ gr_block_sptr grblock(boost::dynamic_pointer_cast<gr_block,
gr_basic_block>(block));
+ if (!grblock)
+ throw std::runtime_error("allocate_buffer found non-gr_block");
+ int item_size = block->output_signature()->sizeof_stream_item(port);
+ int nitems = s_fixed_buffer_size/item_size;
- // Make sure there are at least twice the output_multiple no. of items
- if (nitems < 2*block->output_multiple()) // Note: this means
output_multiple()
- nitems = 2*block->output_multiple(); // can't be changed by block
dynamically
+ // Make sure there are at least twice the output_multiple no. of items
+ if (nitems < 2*grblock->output_multiple()) // Note: this means
output_multiple()
+ nitems = 2*grblock->output_multiple(); // can't be changed by block
dynamically
- // If any downstream blocks are decimators and/or have a large
output_multiple,
- // ensure we have a buffer at least twice their decimation
factor*output_multiple
- gr_block_vector_t blocks = calc_downstream_blocks(name, port);
- for (gr_block_viter_t p = blocks.begin(); p != blocks.end(); p++) {
- int decimation = (int)(1.0/(*p)->relative_rate());
- int multiple = (*p)->output_multiple();
- int history = (*p)->history();
- nitems = std::max(nitems, 2*(decimation*multiple+history));
- }
+ // If any downstream blocks are decimators and/or have a large
output_multiple,
+ // ensure we have a buffer at least twice their decimation
factor*output_multiple
+ gr_basic_block_vector_t blocks = calc_downstream_blocks(block, port);
+ for (gr_basic_block_viter_t p = blocks.begin(); p != blocks.end(); p++) {
+ gr_block_sptr dgrblock(boost::dynamic_pointer_cast<gr_block,
gr_basic_block>(*p));
+ if (!dgrblock)
+ throw std::runtime_error("allocate_buffer found non-gr_block");
+ int decimation = (int)(1.0/dgrblock->relative_rate());
+ int multiple = dgrblock->output_multiple();
+ int history = dgrblock->history();
+ 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);
+ return gr_make_buffer(nitems, item_size);
}
-gr_block_vector_t
-gr_simple_flowgraph_detail::calc_downstream_blocks(const std::string &name,
int port)
+gr_basic_block_vector_t
+gr_simple_flowgraph_detail::calc_downstream_blocks(gr_basic_block_sptr block,
int port)
{
- gr_block_vector_t tmp, result;
- std::insert_iterator<gr_block_vector_t> inserter(result, result.begin());
+ gr_basic_block_vector_t tmp, result;
+ std::insert_iterator<gr_basic_block_vector_t> inserter(result,
result.begin());
- for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++)
- if ((*p)->src_name() == name && (*p)->src_port() == port)
- tmp.push_back(lookup_block((*p)->dst_name()));
+ for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++)
+ if ((*p)->src().block() == block && (*p)->src().port() == port)
+ tmp.push_back((*p)->dst().block());
- // Remove duplicates
- sort(tmp.begin(), tmp.end());
- unique_copy(tmp.begin(), tmp.end(), inserter);
- return result;
+ // Remove duplicates
+ sort(tmp.begin(), tmp.end());
+ unique_copy(tmp.begin(), tmp.end(), inserter);
+ return result;
}
-gr_block_vector_t
-gr_simple_flowgraph_detail::calc_downstream_blocks(const std::string &name)
+gr_basic_block_vector_t
+gr_simple_flowgraph_detail::calc_downstream_blocks(gr_basic_block_sptr block)
{
- gr_block_vector_t tmp, result;
- std::insert_iterator<gr_block_vector_t> inserter(result, result.begin());
+ gr_basic_block_vector_t tmp, result;
+ std::insert_iterator<gr_basic_block_vector_t> inserter(result,
result.begin());
- for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++)
- if ((*p)->src_name() == name)
- tmp.push_back(lookup_block((*p)->dst_name()));
+ for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++)
+ if ((*p)->src().block() == block)
+ tmp.push_back((*p)->dst().block());
- // Remove duplicates
- sort(tmp.begin(), tmp.end());
- unique_copy(tmp.begin(), tmp.end(), inserter);
- return result;
+ // Remove duplicates
+ sort(tmp.begin(), tmp.end());
+ unique_copy(tmp.begin(), tmp.end(), inserter);
+ return result;
}
gr_edge_vector_t
-gr_simple_flowgraph_detail::calc_upstream_edges(const std::string &name)
+gr_simple_flowgraph_detail::calc_upstream_edges(gr_basic_block_sptr block)
{
- gr_edge_vector_t result;
+ gr_edge_vector_t result;
- for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++)
- if ((*p)->dst_name() == name)
- result.push_back(*p);
+ for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++)
+ if ((*p)->dst().block() == block)
+ result.push_back(*p);
- return result; // Assume no duplicates
+ return result; // Assume no duplicates
}
-gr_block_vector_t
+gr_basic_block_vector_t
gr_simple_flowgraph_detail::calc_used_blocks()
{
- std::vector<std::string> tmp, tmp_unique;
- std::insert_iterator<std::vector<std::string> > inserter(tmp_unique,
tmp_unique.begin());
- gr_block_vector_t result;
+ gr_basic_block_vector_t tmp, result;
+ std::insert_iterator<gr_basic_block_vector_t> inserter(result,
result.begin());
- for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++) {
- tmp.push_back((*p)->src_name());
- tmp.push_back((*p)->dst_name());
- }
+ for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++) {
+ tmp.push_back((*p)->src().block());
+ tmp.push_back((*p)->dst().block());
+ }
- sort(tmp.begin(), tmp.end());
- unique_copy(tmp.begin(), tmp.end(), inserter);
-
- for (std::vector<std::string>::iterator p = tmp_unique.begin();
- p != tmp_unique.end(); p++)
- result.push_back(lookup_block(*p));
-
- if (GR_SIMPLE_FLOWGRAPH_DETAIL_DEBUG)
- std::cout << "Flowgraph uses " << result.size()
- << " distinct blocks." << std::endl;
-
- return result;
+ sort(tmp.begin(), tmp.end());
+ unique_copy(tmp.begin(), tmp.end(), inserter);
+ return result;
}
std::vector<gr_block_vector_t>
gr_simple_flowgraph_detail::partition()
{
- std::vector<gr_block_vector_t> result;
- gr_block_vector_t blocks = calc_used_blocks();
- gr_block_vector_t graph;
+ std::vector<gr_block_vector_t> result;
+ gr_basic_block_vector_t blocks = calc_used_blocks();
+ gr_basic_block_vector_t graph;
- while (blocks.size() > 0) {
- graph = calc_reachable_blocks(blocks[0], blocks);
- assert(graph.size());
- result.push_back(topological_sort(graph));
+ while (blocks.size() > 0) {
+ graph = calc_reachable_blocks(blocks[0], blocks);
+ assert(graph.size());
+ result.push_back(topological_sort(graph));
- for (gr_block_viter_t p = graph.begin(); p != graph.end(); p++)
- blocks.erase(find(blocks.begin(), blocks.end(), *p));
- }
+ for (gr_basic_block_viter_t p = graph.begin(); p != graph.end(); p++)
+ blocks.erase(find(blocks.begin(), blocks.end(), *p));
+ }
- return result;
+ return result;
}
-gr_block_vector_t
-gr_simple_flowgraph_detail::calc_reachable_blocks(gr_block_sptr block,
gr_block_vector_t &blocks)
+gr_basic_block_vector_t
+gr_simple_flowgraph_detail::calc_reachable_blocks(gr_basic_block_sptr block,
gr_basic_block_vector_t &blocks)
{
- gr_block_vector_t result;
+ gr_basic_block_vector_t result;
- // Mark all blocks as unvisited
- for (gr_block_viter_t p = blocks.begin(); p != blocks.end(); p++)
- (*p)->detail()->set_color(gr_block_detail::WHITE);
+ // Mark all blocks as unvisited
+ for (gr_basic_block_viter_t p = blocks.begin(); p != blocks.end(); p++)
+ boost::dynamic_pointer_cast<gr_block,
gr_basic_block>(*p)->detail()->set_color(gr_block_detail::WHITE);
- // Recursively mark all reachable blocks
- reachable_dfs_visit(block, blocks);
+ // Recursively mark all reachable blocks
+ reachable_dfs_visit(block, blocks);
- // Collect all the blocks that have been visited
- for (gr_block_viter_t p = blocks.begin(); p != blocks.end(); p++)
- if ((*p)->detail()->color() == gr_block_detail::BLACK)
- result.push_back(*p);
+ // Collect all the blocks that have been visited
+ for (gr_basic_block_viter_t p = blocks.begin(); p != blocks.end(); p++)
+ if ((boost::dynamic_pointer_cast<gr_block,
gr_basic_block>(*p))->detail()->color() == gr_block_detail::BLACK)
+ result.push_back(*p);
- return result;
+ return result;
}
// Recursively mark all reachable blocks from given block and block list
void
-gr_simple_flowgraph_detail::reachable_dfs_visit(gr_block_sptr block,
gr_block_vector_t &blocks)
+gr_simple_flowgraph_detail::reachable_dfs_visit(gr_basic_block_sptr block,
gr_basic_block_vector_t &blocks)
{
- // Mark the current one as visited
- block->detail()->set_color(gr_block_detail::BLACK);
+ // Mark the current one as visited
+ boost::dynamic_pointer_cast<gr_block,
gr_basic_block>(block)->detail()->set_color(gr_block_detail::BLACK);
- // Recurse into adjacent vertices
- gr_block_vector_t adjacent = calc_adjacent_blocks(block, blocks);
+ // Recurse into adjacent vertices
+ gr_basic_block_vector_t adjacent = calc_adjacent_blocks(block, blocks);
- for (gr_block_viter_t p = adjacent.begin(); p != adjacent.end(); p++)
- if ((*p)->detail()->color() == gr_block_detail::WHITE)
- reachable_dfs_visit(*p, blocks);
+ for (gr_basic_block_viter_t p = adjacent.begin(); p != adjacent.end(); p++)
+ if (boost::dynamic_pointer_cast<gr_block,
gr_basic_block>(*p)->detail()->color() == gr_block_detail::WHITE)
+ reachable_dfs_visit(*p, blocks);
}
// Return a list of block adjacent to a given block along any edge
-gr_block_vector_t
-gr_simple_flowgraph_detail::calc_adjacent_blocks(gr_block_sptr block,
gr_block_vector_t &blocks)
+gr_basic_block_vector_t
+gr_simple_flowgraph_detail::calc_adjacent_blocks(gr_basic_block_sptr block,
gr_basic_block_vector_t &blocks)
{
- gr_block_vector_t tmp, result;
- std::insert_iterator<gr_block_vector_t> inserter(result, result.begin());
+ gr_basic_block_vector_t tmp, result;
+ std::insert_iterator<gr_basic_block_vector_t> inserter(result,
result.begin());
- // Find any blocks that are inputs or outputs
- for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++) {
- if (lookup_block((*p)->src_name()) == block)
- tmp.push_back(lookup_block((*p)->dst_name()));
- if (lookup_block((*p)->dst_name()) == block)
- tmp.push_back(lookup_block((*p)->src_name()));
- }
+ // Find any blocks that are inputs or outputs
+ for (gr_edge_viter_t p = d_edges.begin(); p != d_edges.end(); p++) {
- // Remove duplicates
- sort(tmp.begin(), tmp.end());
- unique_copy(tmp.begin(), tmp.end(), inserter);
- return result;
+ if ((*p)->src().block() == block)
+ tmp.push_back((*p)->dst().block());
+ if ((*p)->dst().block() == block)
+ tmp.push_back((*p)->src().block());
+ }
+
+ // Remove duplicates
+ sort(tmp.begin(), tmp.end());
+ unique_copy(tmp.begin(), tmp.end(), inserter);
+ return result;
}
gr_block_vector_t
-gr_simple_flowgraph_detail::topological_sort(gr_block_vector_t &blocks)
+gr_simple_flowgraph_detail::topological_sort(gr_basic_block_vector_t &blocks)
{
- gr_block_vector_t result, tmp;
- tmp = sort_sources_first(blocks);
+ gr_basic_block_vector_t tmp;
+ gr_block_vector_t result;
+ tmp = sort_sources_first(blocks);
- // Start 'em all white
- for (gr_block_viter_t p = tmp.begin(); p != tmp.end(); p++)
- (*p)->detail()->set_color(gr_block_detail::WHITE);
+ // Start 'em all white
+ for (gr_basic_block_viter_t p = tmp.begin(); p != tmp.end(); p++)
+ boost::dynamic_pointer_cast<gr_block,
gr_basic_block>(*p)->detail()->set_color(gr_block_detail::WHITE);
- for (gr_block_viter_t p = tmp.begin(); p != tmp.end(); p++) {
- if ((*p)->detail()->color() == gr_block_detail::WHITE)
- topological_dfs_visit(*p, result);
- }
+ for (gr_basic_block_viter_t p = tmp.begin(); p != tmp.end(); p++) {
+ if (boost::dynamic_pointer_cast<gr_block,
gr_basic_block>(*p)->detail()->color() == gr_block_detail::WHITE)
+ topological_dfs_visit(*p, result);
+ }
- reverse(result.begin(), result.end());
+ reverse(result.begin(), result.end());
- return result;
+ return result;
}
bool
-gr_simple_flowgraph_detail::source_p(gr_block_sptr block)
+gr_simple_flowgraph_detail::source_p(gr_basic_block_sptr block)
{
- return (calc_upstream_edges(lookup_name(block)).size() == 0);
+ return (calc_upstream_edges(block).size() == 0);
}
-gr_block_vector_t
-gr_simple_flowgraph_detail::sort_sources_first(gr_block_vector_t &blocks)
+gr_basic_block_vector_t
+gr_simple_flowgraph_detail::sort_sources_first(gr_basic_block_vector_t &blocks)
{
- gr_block_vector_t sources, nonsources, result;
+ gr_basic_block_vector_t sources, nonsources, result;
- for (gr_block_viter_t p = blocks.begin(); p != blocks.end(); p++) {
- if (source_p(*p))
- sources.push_back(*p);
- else
- nonsources.push_back(*p);
- }
+ for (gr_basic_block_viter_t p = blocks.begin(); p != blocks.end(); p++) {
+ if (source_p(*p))
+ sources.push_back(*p);
+ else
+ nonsources.push_back(*p);
+ }
- for (gr_block_viter_t p = sources.begin(); p != sources.end(); p++)
- result.push_back(*p);
+ for (gr_basic_block_viter_t p = sources.begin(); p != sources.end(); p++)
+ result.push_back(*p);
- for (gr_block_viter_t p = nonsources.begin(); p != nonsources.end(); p++)
- result.push_back(*p);
+ for (gr_basic_block_viter_t p = nonsources.begin(); p != nonsources.end();
p++)
+ result.push_back(*p);
- return result;
+ return result;
}
void
-gr_simple_flowgraph_detail::topological_dfs_visit(gr_block_sptr block,
gr_block_vector_t &output)
+gr_simple_flowgraph_detail::topological_dfs_visit(gr_basic_block_sptr block,
gr_block_vector_t &output)
{
- block->detail()->set_color(gr_block_detail::GREY);
+ boost::dynamic_pointer_cast<gr_block,
gr_basic_block>(block)->detail()->set_color(gr_block_detail::GREY);
- gr_block_vector_t blocks(calc_downstream_blocks(lookup_name(block)));
+ gr_basic_block_vector_t blocks(calc_downstream_blocks(block));
- for (gr_block_viter_t p = blocks.begin(); p != blocks.end(); p++) {
- switch ((*p)->detail()->color()) {
- case gr_block_detail::WHITE:
- topological_dfs_visit(*p, output);
- break;
+ for (gr_basic_block_viter_t p = blocks.begin(); p != blocks.end(); p++) {
+ switch (boost::dynamic_pointer_cast<gr_block,
gr_basic_block>(*p)->detail()->color()) {
+ case gr_block_detail::WHITE:
+ topological_dfs_visit(*p, output);
+ break;
- case gr_block_detail::GREY:
- throw std::runtime_error("flow graph has loops!");
+ case gr_block_detail::GREY:
+ throw std::runtime_error("flow graph has loops!");
- case gr_block_detail::BLACK:
- continue;
+ case gr_block_detail::BLACK:
+ continue;
- default:
- throw std::runtime_error("invalid color on block!");
- }
+ default:
+ throw std::runtime_error("invalid color on block!");
}
+ }
- block->detail()->set_color(gr_block_detail::BLACK);
- output.push_back(block);
+ gr_block_sptr result_block(boost::dynamic_pointer_cast<gr_block,
gr_basic_block>(block));
+
+ result_block->detail()->set_color(gr_block_detail::BLACK);
+ output.push_back(result_block);
}
+
+void
+gr_simple_flowgraph_detail::merge_connections(gr_simple_flowgraph_sptr sfg)
+{
+ // NOT IMPLEMENTED
+}
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.h
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.h
2007-04-26 23:21:15 UTC (rev 5137)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/gr_simple_flowgraph_detail.h
2007-04-26 23:34:30 UTC (rev 5138)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2007 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -23,48 +23,30 @@
#ifndef INCLUDED_GR_SIMPLE_FLOWGRAPH_DETAIL_H
#define INCLUDED_GR_SIMPLE_FLOWGRAPH_DETAIL_H
-#include <gr_block.h>
-#include <map>
+#include <gr_basic_block.h>
+#include <gr_simple_flowgraph.h>
+#include <iostream>
#define GR_FIXED_BUFFER_SIZE (32*(1L<<10))
-typedef std::map<std::string, gr_block_sptr> gr_component_map_t;
-typedef std::map<std::string, gr_block_sptr>::iterator gr_component_miter_t;
-
-class gr_endpoint
-{
-private:
- std::string d_name;
- int d_port;
-
-public:
- gr_endpoint(const std::string &name, int port) { d_name = name; d_port =
port; }
- const std::string &name() const { return d_name; }
- int port() const { return d_port; }
-};
-
class gr_edge;
typedef boost::shared_ptr<gr_edge> gr_edge_sptr;
-gr_edge_sptr gr_make_edge(const std::string &src_name, int src_port,
- const std::string &dst_name, int dst_port);
+gr_edge_sptr gr_make_edge(const gr_endpoint &src, const gr_endpoint &dst);
class gr_edge
{
private:
- friend gr_edge_sptr gr_make_edge(const std::string &src_name, int src_port,
- const std::string &dst_name, int
dst_port);
- gr_edge(const std::string &name, int src_port,
- const std::string &name, int dst_port);
+ friend gr_edge_sptr gr_make_edge(const gr_endpoint &src, const gr_endpoint
&dst);
+ gr_edge(const gr_endpoint &src, const gr_endpoint &dst) : d_src(src),
d_dst(dst) { }
- gr_endpoint d_src;
- gr_endpoint d_dst;
+ gr_endpoint d_src;
+ gr_endpoint d_dst;
public:
- ~gr_edge();
- const std::string src_name() const { return d_src.name(); }
- const std::string dst_name() const { return d_dst.name(); }
- int src_port() const { return d_src.port(); }
- int dst_port() const { return d_dst.port(); }
+ ~gr_edge();
+
+ const gr_endpoint &src() const { return d_src; }
+ const gr_endpoint &dst() const { return d_dst; }
};
typedef std::vector<gr_edge_sptr> gr_edge_vector_t;
@@ -73,63 +55,68 @@
class gr_simple_flowgraph_detail
{
private:
- friend class gr_simple_flowgraph;
- friend class gr_runtime_impl;
- friend class topo_block_cmp;
+ friend class gr_simple_flowgraph;
+ friend class gr_runtime_impl;
+ friend class gr_hier_block2_detail;
+ friend class topo_block_cmp;
- gr_simple_flowgraph_detail();
+ gr_simple_flowgraph_detail() : d_blocks(), d_edges() { }
- gr_component_map_t d_components;
- gr_edge_vector_t d_edges;
- static const unsigned int s_fixed_buffer_size = GR_FIXED_BUFFER_SIZE;
+ gr_basic_block_vector_t d_blocks;
+ gr_edge_vector_t d_edges;
+ static const unsigned int s_fixed_buffer_size = GR_FIXED_BUFFER_SIZE;
- void reset();
- void define_component(const std::string &name, gr_block_sptr block);
- void connect(const std::string &src, int src_port,
- const std::string &dst, int dst_port);
- gr_block_sptr lookup_block(const std::string &name);
- std::string lookup_name(const gr_block_sptr block);
+ void reset();
+ void connect(const gr_endpoint &src, const gr_endpoint &dst);
+ void disconnect(const gr_endpoint &src, const gr_endpoint &dst);
+ void check_valid_port(gr_io_signature_sptr sig, int port);
+ void check_dst_not_used(const gr_endpoint &dst);
+ void check_type_match(const gr_endpoint &src, const gr_endpoint &dst);
+ void validate();
+ gr_edge_vector_t calc_connections(gr_basic_block_sptr block, bool
check_inputs); // false=use outputs
+ std::vector<int> calc_used_ports(gr_basic_block_sptr block, bool
check_inputs);
+ void check_contiguity(gr_basic_block_sptr block, const std::vector<int>
&used_ports, bool check_inputs);
+ void setup_connections();
+ void merge_connections(gr_simple_flowgraph_sptr sfg);
- void check_valid_port(gr_io_signature_sptr sig, int port);
- void check_dst_not_used(const std::string &name, int port);
- void check_type_match(gr_block_sptr src_block, int src_port,
- gr_block_sptr dst_block, int dst_port);
- void validate();
- gr_edge_vector_t calc_connections(const std::string &name, bool
check_inputs); // false=use outputs
- std::vector<int> calc_used_ports(const std::string &name, bool
check_inputs);
- void check_contiguity(gr_block_sptr block, const std::vector<int>
&used_ports,
- bool check_inputs);
- void setup_connections();
- gr_buffer_sptr allocate_buffer(const std::string &name, int port);
- gr_block_vector_t calc_downstream_blocks(const std::string &name, int
port);
- gr_block_vector_t calc_downstream_blocks(const std::string &name);
- gr_edge_vector_t calc_upstream_edges(const std::string &name);
- gr_block_vector_t calc_used_blocks();
- std::vector<gr_block_vector_t> partition();
- gr_block_vector_t calc_reachable_blocks(gr_block_sptr block,
gr_block_vector_t &blocks);
- gr_block_vector_t topological_sort(gr_block_vector_t &blocks);
- void reachable_dfs_visit(gr_block_sptr block, gr_block_vector_t &blocks);
- gr_block_vector_t calc_adjacent_blocks(gr_block_sptr block,
gr_block_vector_t &blocks);
- bool source_p(gr_block_sptr block);
- gr_block_vector_t sort_sources_first(gr_block_vector_t &blocks);
- void topological_dfs_visit(gr_block_sptr block, gr_block_vector_t &output);
+ gr_buffer_sptr allocate_buffer(gr_basic_block_sptr block, int port);
+ gr_basic_block_vector_t calc_downstream_blocks(gr_basic_block_sptr block,
int port);
+ gr_basic_block_vector_t calc_downstream_blocks(gr_basic_block_sptr block);
+ gr_edge_vector_t calc_upstream_edges(gr_basic_block_sptr block);
+ gr_basic_block_vector_t calc_used_blocks();
+ std::vector<gr_block_vector_t> partition();
+ gr_basic_block_vector_t calc_reachable_blocks(gr_basic_block_sptr block,
gr_basic_block_vector_t &blocks);
+ gr_block_vector_t topological_sort(gr_basic_block_vector_t &blocks);
+ void reachable_dfs_visit(gr_basic_block_sptr block, gr_basic_block_vector_t
&blocks);
+ gr_basic_block_vector_t calc_adjacent_blocks(gr_basic_block_sptr block,
gr_basic_block_vector_t &blocks);
+ bool source_p(gr_basic_block_sptr block);
+ gr_basic_block_vector_t sort_sources_first(gr_basic_block_vector_t &blocks);
+ void topological_dfs_visit(gr_basic_block_sptr block, gr_block_vector_t
&output);
public:
- ~gr_simple_flowgraph_detail();
+ ~gr_simple_flowgraph_detail();
};
inline std::ostream&
-operator <<(std::ostream& os, const gr_block_sptr p)
+operator <<(std::ostream &os, const gr_endpoint endp)
{
- os << "<gr_block " << p->name() << " (" << p->unique_id() << ")>";
- return os;
+ os << endp.block()->name() << ":" << endp.port();
+ return os;
}
inline std::ostream&
-operator <<(std::ostream &os, const gr_endpoint endp)
+operator <<(std::ostream &os, const gr_edge_sptr edge)
{
- os << endp.name() << ":" << endp.port();
- return os;
+ os << edge->src() << "->" << edge->dst();
+ return os;
}
+inline void
+enumerate_edges(gr_edge_vector_t &edges)
+{
+ std::cout << "Edge list has " << edges.size() << " elements" << std::endl;
+ for(gr_edge_viter_t p = edges.begin(); p != edges.end(); p++)
+ std::cout << *p << std::endl;
+}
+
#endif /* INCLUDED_GR_SIMPLE_FLOWGRAPH_H */
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/runtime.i
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/runtime.i
2007-04-26 23:21:15 UTC (rev 5137)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/lib/runtime/runtime.i
2007-04-26 23:34:30 UTC (rev 5138)
@@ -28,7 +28,6 @@
#include <gr_block_detail.h>
#include <gr_hier_block2.h>
#include <gr_runtime.h>
-#include <gr_simple_flowgraph.h>
#include <gr_single_threaded_scheduler.h>
#include <gr_message.h>
#include <gr_msg_handler.h>
@@ -48,7 +47,6 @@
%include <gr_block_detail.i>
%include <gr_hier_block2.i>
%include <gr_swig_block_magic.i>
-%include <gr_simple_flowgraph.i>
%include <gr_single_threaded_scheduler.i>
%include <gr_message.i>
%include <gr_msg_handler.i>
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/gr/hier_block2.py
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/gr/hier_block2.py
2007-04-26 23:21:15 UTC (rev 5137)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/gr/hier_block2.py
2007-04-26 23:34:30 UTC (rev 5138)
@@ -21,7 +21,7 @@
from gnuradio_swig_python import hier_block2_swig, gr_make_runtime, \
runtime_run_unlocked, runtime_start_unlocked, runtime_stop_unlocked, \
- runtime_wait_unlocked
+ runtime_wait_unlocked, runtime_restart_unlocked, io_signature
#
# This hack forces a 'has-a' relationship to look like an 'is-a' one.
@@ -38,9 +38,55 @@
def __getattr__(self, name):
return getattr(self._hb, name)
- def define_component(self, name, comp):
- return self._hb.define_component(name, comp.basic_block())
+ def connect(self, *points):
+ '''connect requires two or more arguments that can be coerced to
endpoints.
+ If more than two arguments are provided, they are connected together
successively.
+ '''
+ if len (points) < 2:
+ raise ValueError, ("connect requires at least two endpoints; %d
provided." % (len (points),))
+ for i in range (1, len (points)):
+ self._connect(points[i-1], points[i])
+ def _connect(self, src, dst):
+ (src_block, src_port) = self._coerce_endpoint(src)
+ (dst_block, dst_port) = self._coerce_endpoint(dst)
+ self._hb.connect(src_block.basic_block(), src_port,
+ dst_block.basic_block(), dst_port)
+
+ def _coerce_endpoint(self, endp):
+ if hasattr(endp, 'basic_block'):
+ return (endp, 0)
+ else:
+ if hasattr(endp, "__getitem__") and len(endp) == 2:
+ return endp # Assume user put (block, port)
+ else:
+ raise ValueError("unable to coerce endpoint")
+
+ def disconnect(self, *points):
+ '''connect requires two or more arguments that can be coerced to
endpoints.
+ If more than two arguments are provided, they are disconnected
successively.
+ '''
+ if len (points) < 2:
+ raise ValueError, ("disconnect requires at least two endpoints; %d
provided." % (len (points),))
+ for i in range (1, len (points)):
+ self._disconnect(points[i-1], points[i])
+
+ def _disconnect(self, src, dst):
+ (src_block, src_port) = self._coerce_endpoint(src)
+ (dst_block, dst_port) = self._coerce_endpoint(dst)
+ self._hb.disconnect(src_block.basic_block(), src_port,
+ dst_block.basic_block(), dst_port)
+
+# Convenience class to create a no input, no output block for runtime top block
+class top_block(hier_block2):
+ def __init__(self, name):
+ hier_block2.__init__(self, name, io_signature(0,0,0),
io_signature(0,0,0))
+
+# This allows the 'run_locked' methods, which are defined in gr_runtime.i,
+# to release the Python global interpreter lock before calling the actual
+# method in gr.runtime
+#
+# This probably should be elsewhere but it works here
class runtime(object):
def __init__(self, top_block):
if (isinstance(top_block, hier_block2)):
@@ -59,3 +105,6 @@
def wait(self):
runtime_wait_unlocked(self._r)
+
+ def restart(self):
+ runtime_restart_unlocked(self._r)
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
2007-04-26 23:21:15 UTC (rev 5137)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
2007-04-26 23:34:30 UTC (rev 5138)
@@ -6,10 +6,10 @@
def setUp(self):
pass
-
+
def tearDown(self):
pass
-
+
def test_001_make(self):
hblock = gr.hier_block2("test_block",
gr.io_signature(1,1,gr.sizeof_int),
@@ -20,219 +20,132 @@
self.assertEqual(1, hblock.output_signature().max_streams())
self.assertEqual(gr.sizeof_int,
hblock.output_signature().sizeof_stream_item(0))
- def test_002_define_component(self):
+ def test_001_connect_internal(self):
hblock = gr.hier_block2("test_block",
gr.io_signature(1,1,gr.sizeof_int),
gr.io_signature(1,1,gr.sizeof_int))
- hblock.define_component("src", gr.null_source(gr.sizeof_int))
- hblock.define_component("dst", gr.null_sink(gr.sizeof_int))
+ nop1 = gr.nop(gr.sizeof_int)
+ nop2 = gr.nop(gr.sizeof_int)
+ hblock.connect(nop1, nop2)
- def test_003_define_component_reserved_input(self):
+ def test_002_connect_input(self):
hblock = gr.hier_block2("test_block",
gr.io_signature(1,1,gr.sizeof_int),
gr.io_signature(1,1,gr.sizeof_int))
- self.assertRaises(ValueError,
- lambda: hblock.define_component("self", gr.nop(gr.sizeof_int)))
+ nop1 = gr.nop(gr.sizeof_int)
+ hblock.connect(hblock, nop1)
- def test_004_define_component_name_in_use(self):
+ def test_003_connect_output(self):
hblock = gr.hier_block2("test_block",
gr.io_signature(1,1,gr.sizeof_int),
gr.io_signature(1,1,gr.sizeof_int))
- hblock.define_component("src", gr.null_source(gr.sizeof_int))
- self.assertRaises(ValueError,
- lambda: hblock.define_component("src", gr.null_sink(gr.sizeof_int)))
+ nop1 = gr.nop(gr.sizeof_int)
+ hblock.connect(nop1, hblock)
- def test_006_connect_internal(self):
+ def test_004_connect_invalid_src_port_neg(self):
hblock = gr.hier_block2("test_block",
gr.io_signature(1,1,gr.sizeof_int),
gr.io_signature(1,1,gr.sizeof_int))
- hblock.define_component("nop1", gr.nop(gr.sizeof_int))
- hblock.define_component("nop2", gr.nop(gr.sizeof_int))
- hblock.connect("nop1", 0, "nop2", 0)
+ nop1 = gr.nop(gr.sizeof_int)
+ self.assertRaises(ValueError,
+ lambda: hblock.connect((hblock, -1), nop1))
- def test_007_connect_input(self):
+ def test_005_connect_invalid_src_port_exceeds(self):
hblock = gr.hier_block2("test_block",
gr.io_signature(1,1,gr.sizeof_int),
gr.io_signature(1,1,gr.sizeof_int))
- hblock.define_component("nop1", gr.nop(gr.sizeof_int))
- hblock.connect("self", 0, "nop1", 0)
+ nop1 = gr.nop(gr.sizeof_int)
+ self.assertRaises(ValueError,
+ lambda: hblock.connect((hblock, 1), nop1))
- def test_008_connect_output(self):
+ def test_006_connect_invalid_dst_port_neg(self):
hblock = gr.hier_block2("test_block",
gr.io_signature(1,1,gr.sizeof_int),
gr.io_signature(1,1,gr.sizeof_int))
- hblock.define_component("nop1", gr.nop(gr.sizeof_int))
- hblock.connect("nop1", 0, "self", 0)
-
- def test_009_connect_unknown_src(self):
- hblock = gr.hier_block2("test_block",
- gr.io_signature(1,1,gr.sizeof_int),
- gr.io_signature(1,1,gr.sizeof_int))
nop1 = gr.nop(gr.sizeof_int)
- hblock.define_component("nop1", nop1)
self.assertRaises(ValueError,
- lambda: hblock.connect("nop2", 0, "self", 0))
-
- def test_010_connect_unknown_dst(self):
- hblock = gr.hier_block2("test_block",
- gr.io_signature(1,1,gr.sizeof_int),
- gr.io_signature(1,1,gr.sizeof_int))
- hblock.define_component("nop1", gr.nop(gr.sizeof_int))
- self.assertRaises(ValueError,
- lambda: hblock.connect("self", 0, "nop2", 0))
+ lambda: hblock.connect(hblock, (nop1, -1)))
- def test_011_connect_invalid_src_port_neg(self):
+ def test_007_connect_invalid_dst_port_exceeds(self):
hblock = gr.hier_block2("test_block",
gr.io_signature(1,1,gr.sizeof_int),
gr.io_signature(1,1,gr.sizeof_int))
- hblock.define_component("nop1", gr.nop(gr.sizeof_int))
+ nop1 = gr.null_sink(gr.sizeof_int)
self.assertRaises(ValueError,
- lambda: hblock.connect("self", -1, "nop1", 0))
+ lambda: hblock.connect(hblock, (nop1, 1)))
- def test_012_connect_invalid_src_port_exceeds(self):
+ def test_008_connect_dst_port_in_use(self):
hblock = gr.hier_block2("test_block",
gr.io_signature(1,1,gr.sizeof_int),
gr.io_signature(1,1,gr.sizeof_int))
- hblock.define_component("nop1", gr.nop(gr.sizeof_int))
+ nop1 = gr.nop(gr.sizeof_int)
+ hblock.connect(nop1, hblock);
self.assertRaises(ValueError,
- lambda: hblock.connect("self", 1, "nop1", 0))
-
- def test_013_connect_invalid_dst_port_neg(self):
- hblock = gr.hier_block2("test_block",
- gr.io_signature(1,1,gr.sizeof_int),
- gr.io_signature(1,1,gr.sizeof_int))
- hblock.define_component("nop1", gr.nop(gr.sizeof_int))
- self.assertRaises(ValueError,
- lambda: hblock.connect("self", -1, "nop1", 0))
+ lambda: hblock.connect(nop1, hblock))
- def test_014_connect_invalid_dst_port_exceeds(self):
- hblock = gr.hier_block2("test_block",
- gr.io_signature(1,1,gr.sizeof_int),
- gr.io_signature(1,1,gr.sizeof_int))
- hblock.define_component("nop1", gr.nop(gr.sizeof_int))
+ def test_009_connect_one_src_two_dst(self):
+ hblock = gr.top_block("test_block")
+ src = gr.null_source(gr.sizeof_int)
+ dst1 = gr.null_sink(gr.sizeof_int)
+ dst2 = gr.null_sink(gr.sizeof_int)
+ hblock.connect(src, dst1)
+ hblock.connect(src, dst2)
+
+ def test_010_connect_type_mismatch(self):
+ hblock = gr.top_block("test_block")
+ nop1 = gr.nop(gr.sizeof_char)
+ nop2 = gr.nop(gr.sizeof_int)
self.assertRaises(ValueError,
- lambda: hblock.connect("self", 1, "nop1", 0))
+ lambda: hblock.connect(nop1, nop2))
- def test_015_connect_dst_port_in_use(self):
- hblock = gr.hier_block2("test_block",
- gr.io_signature(1,1,gr.sizeof_int),
- gr.io_signature(1,1,gr.sizeof_int))
+ def test_011_check_topology(self):
+ hblock = gr.top_block("test_block")
+ hblock.check_topology(0, 0)
+
+ def test_012_disconnect(self):
+ hblock = gr.top_block("test_block")
nop1 = gr.nop(gr.sizeof_int)
- hblock.define_component("nop1", nop1)
- hblock.connect("nop1", 0, "self", 0);
- self.assertRaises(ValueError,
- lambda: hblock.connect("nop1", 0, "self", 0))
-
- def test_016_connect_one_src_two_dst(self):
- hblock = gr.hier_block2("test_block",
- gr.io_signature(1,1,gr.sizeof_int),
- gr.io_signature(1,1,gr.sizeof_int))
- hblock.define_component("src", gr.null_source(gr.sizeof_int))
- hblock.define_component("dst1", gr.null_sink(gr.sizeof_int))
- hblock.define_component("dst2", gr.null_sink(gr.sizeof_int))
- hblock.connect("src", 0, "dst1", 0)
- hblock.connect("src", 0, "dst2", 0)
+ nop2 = gr.nop(gr.sizeof_int)
+ hblock.connect(nop1, nop2)
+ hblock.disconnect(nop1, nop2)
- def test_017_connect_type_mismatch(self):
+ def 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))
- hblock.define_component("nop1", gr.nop(gr.sizeof_char))
+ nop1 = gr.nop(gr.sizeof_int)
+ nop2 = gr.nop(gr.sizeof_int)
+ nop3 = gr.nop(gr.sizeof_int)
+ hblock.connect(nop1, nop2)
self.assertRaises(ValueError,
- lambda: hblock.connect("nop1", 0, "self", 0))
+ lambda: hblock.disconnect(nop1, nop3))
- def test_018_check_topology(self):
- hblock = gr.hier_block2("test_block",
- gr.io_signature(0,0,gr.sizeof_int),
- gr.io_signature(0,0,gr.sizeof_int))
- hblock.check_topology(0, 0);
- """
- def test_019_validate(self):
- hblock = gr.hier_block2("test_block",
- gr.io_signature(0,0,gr.sizeof_int),
- gr.io_signature(0,0,gr.sizeof_int))
- runtime = gr.runtime(hblock)
- runtime.validate()
-
- def test_020_validate_1(self):
- hblock = gr.hier_block2("test_block",
- gr.io_signature(0,0,gr.sizeof_int),
- gr.io_signature(0,0,gr.sizeof_int))
- hblock.define_component("src", gr.null_source(gr.sizeof_int))
- hblock.define_component("dst1", gr.null_sink(gr.sizeof_int))
- hblock.define_component("dst2", gr.null_sink(gr.sizeof_int))
- hblock.connect("src", 0, "dst1", 0)
- hblock.connect("src", 0, "dst2", 0)
- runtime = gr.runtime(hblock)
- runtime.validate()
+ def test_014_run(self):
+ expected = (1.0, 2.0, 3.0, 4.0)
+ hblock = gr.top_block("test_block")
+ src = gr.vector_source_f(expected, False)
+ sink1 = gr.vector_sink_f()
+ sink2 = gr.vector_sink_f()
+ hblock.connect(src, sink1)
+ hblock.connect(src, sink2)
+ runtime = gr.runtime(hblock)
+ runtime.run()
+ actual1 = sink1.data()
+ actual2 = sink2.data()
+ self.assertEquals(expected, actual1)
+ self.assertEquals(expected, actual2)
- def test_021_validate_2(self):
- hblock = gr.hier_block2("test_block",
- gr.io_signature(0,0,gr.sizeof_int),
- gr.io_signature(0,0,gr.sizeof_int))
- hblock.define_component("src1", gr.null_source(gr.sizeof_int))
- hblock.define_component("nop1", gr.nop(gr.sizeof_int))
- hblock.define_component("dst1", gr.null_sink(gr.sizeof_int))
- hblock.define_component("dst2", gr.null_sink(gr.sizeof_int))
- hblock.connect("src1", 0, "nop1", 0)
- hblock.connect("src1", 0, "nop1", 1)
- hblock.connect("nop1", 0, "dst1", 0)
- hblock.connect("nop1", 1, "dst2", 0)
- runtime = gr.runtime(hblock)
- runtime.validate()
-
- def test_022_validate_3(self):
- hblock = gr.hier_block2("test_block",
- gr.io_signature(0,0,gr.sizeof_int),
- gr.io_signature(0,0,gr.sizeof_int))
- hblock.define_component("src1", gr.null_source(gr.sizeof_int))
- hblock.define_component("nop1", gr.nop(gr.sizeof_int))
- hblock.define_component("dst1", gr.null_sink(gr.sizeof_int))
- hblock.define_component("dst2", gr.null_sink(gr.sizeof_int))
- hblock.connect("src1", 0, "nop1", 0)
- hblock.connect("src1", 0, "nop1", 2)
- hblock.connect("nop1", 0, "dst1", 0)
- hblock.connect("nop1", 1, "dst2", 0)
- runtime = gr.runtime(hblock)
- self.assertRaises(RuntimeError,
- lambda: runtime.validate())
-
- def test_023_validate_4(self):
- hblock = gr.hier_block2("test_block",
- gr.io_signature(0,0,gr.sizeof_int),
- gr.io_signature(0,0,gr.sizeof_int))
- hblock.define_component("src1", gr.null_source(gr.sizeof_int))
- hblock.define_component("nop1", gr.nop(gr.sizeof_int))
- hblock.define_component("dst1", gr.null_sink(gr.sizeof_int))
- hblock.define_component("dst2", gr.null_sink(gr.sizeof_int))
- hblock.connect("src1", 0, "nop1", 0)
- hblock.connect("src1", 0, "nop1", 1)
- hblock.connect("nop1", 0, "dst1", 0)
- hblock.connect("nop1", 2, "dst2", 0)
- runtime = gr.runtime(hblock)
- self.assertRaises(RuntimeError,
- lambda: runtime.validate())
-
- def test_024_validate_5(self):
- hblock = gr.hier_block2("test_block",
- gr.io_signature(0,0,gr.sizeof_int),
- gr.io_signature(0,0,gr.sizeof_int))
- hblock.define_component("src1", gr.null_source(gr.sizeof_int))
- hblock.define_component("nop1", gr.nop(gr.sizeof_int))
- hblock.define_component("dst1", gr.null_sink(gr.sizeof_int))
- hblock.define_component("dst2", gr.null_sink(gr.sizeof_int))
- hblock.connect("src1", 0, "nop1", 0)
- hblock.connect("src1", 0, "nop1", 1)
- hblock.connect("nop1", 0, "dst1", 0)
- hblock.connect("nop1", 1, "dst2", 0)
- runtime = gr.runtime(hblock)
- runtime.validate()
- # Pending implementation of disconnect
- # hblock.disconnect("src1", 0, "nop1", 1)
- # runtime.validate()
- # self.assertRaises(ValueError,
- # lambda: hblock.disconnect("src1", 0, "nop1", 1))
- """
-
+ def test_015_connect_disconnect(self):
+ expected = (1.0, 2.0, 3.0, 4.0)
+ hblock = gr.top_block("test_block")
+ src = gr.vector_source_f(expected, False)
+ sink1 = gr.vector_sink_f()
+ sink2 = gr.vector_sink_f()
+ hblock.connect(src, sink1)
+ hblock.connect(src, sink2)
+ hblock.disconnect(src, sink2)
+ runtime = gr.runtime(hblock)
+ runtime.run()
+
if __name__ == "__main__":
gr_unittest.main()
Deleted:
gnuradio/branches/developers/jcorgan/hb/gnuradio-core/src/python/gnuradio/gr/qa_simple_flowgraph.py
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/audio/dial_tone2.py
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/audio/dial_tone2.py
2007-04-26 23:21:15 UTC (rev 5137)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/audio/dial_tone2.py
2007-04-26 23:34:30 UTC (rev 5138)
@@ -27,32 +27,20 @@
# Top-level block creating a dial tone
# Derives from new class gr.hier_block2
-class dial_tone(gr.hier_block2):
+class dial_tone(gr.top_block):
def __init__(self,
sample_rate, # Audio output sample rate (int)
audio_output, # Audio output device
amplitude): # Output volume (0.0-1.0)
- # Call hierarchical block constructor
- # Top-level blocks have no inputs or outputs
- gr.hier_block2.__init__(self,
- "dial_tone", # Block type
- gr.io_signature(0,0,0), # Input
signature
- gr.io_signature(0,0,0)) # Output
signature
+ gr.top_block.__init__(self, "dial_tone")
- # Hierarchical blocks have a set of 'components' (which may
- # be themselves hierarchical blocks), mapped to names.
- # 'define_component' takes a string and either a hierarchical
- # block or an instance of a 'leaf node' (gr_block) block
+ src0 = gr.sig_source_f(sample_rate, gr.GR_SIN_WAVE, 350,
amplitude)
+ src1 = gr.sig_source_f(sample_rate, gr.GR_SIN_WAVE, 440,
amplitude)
+ dst = audio.sink(sample_rate, audio_output)
- # Give names to two sine wave sources and an audio sink
- self.define_component("src0", gr.sig_source_f (sample_rate,
gr.GR_SIN_WAVE, 350, amplitude))
- self.define_component("src1", gr.sig_source_f (sample_rate,
gr.GR_SIN_WAVE, 440, amplitude))
- self.define_component("dst", audio.sink(sample_rate,
audio_output))
-
- # Wire up outputs to inputs. (TODO: convenience functions)
- self.connect("src0", 0, "dst", 0)
- self.connect("src1", 0, "dst", 1)
+ self.connect(src0, (dst, 0))
+ self.connect(src1, (dst, 1))
if __name__ == '__main__':
parser = OptionParser(option_class=eng_option)
@@ -68,13 +56,13 @@
raise SystemExit, 1
# Create an instance of a hierarchical block
- top_block = dial_tone(int(options.sample_rate),
- options.audio_output,
- options.amplitude)
+ top = dial_tone(int(options.sample_rate),
+ options.audio_output,
+ options.amplitude)
# Create an instance of a runtime, passing it the top block
# to process
- runtime = gr.runtime(top_block)
+ runtime = gr.runtime(top)
try:
# Run forever
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/dect/dect_receiver.py
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/dect/dect_receiver.py
2007-04-26 23:21:15 UTC (rev 5137)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/dect/dect_receiver.py
2007-04-26 23:34:30 UTC (rev 5138)
@@ -30,19 +30,15 @@
# Top-level hierarchical block that implements DECT demodulation and
# decoding.
-class dect_receiver(gr.hier_block2):
+class dect_receiver(gr.top_block):
def __init__(self, options):
- gr.hier_block2.__init__(self,
- "dect_receiver", # Block typename
- gr.io_signature(0,0,0), # Input signature
- gr.io_signature(0,0,0)) # Output signature
+ gr.top_block.__init__(self, "dect_receiver")
self._options = options
# Need greater than 2 samples per symbol. This makes a decimation
# rate of 26 and a samples per symbol of 2.136752
if_rate = 2.461538e6
- self._usrp = usrp_source_c(self,
- which=0,
+ self._usrp = usrp_source_c(which=0,
subdev_spec=options.rx_subdev_spec,
if_rate=if_rate,
gain=options.gain,
@@ -67,25 +63,19 @@
self._demod = gmsk2_demod(samples_per_symbol=if_rate/_dect_symbol_rate,
verbose=options.verbose)
- # Define and connect components
- self.define_component("usrp", self._usrp)
- self.define_component("channel", self._channel_filter)
- self.define_component("demod", self._demod)
- self.define_component("sink", gr.null_sink(gr.sizeof_char))
- self.connect("usrp", 0, "channel", 0)
- self.connect("channel", 0, "demod", 0)
- self.connect("demod", 0, "sink", 0)
+ self._sink = gr.null_sink(gr.sizeof_char)
+ self.connect(usrp, channel, demod, sink)
# Log baseband to file if requested
if options.log_baseband is not None:
if options.verbose:
print "Logging baseband to file", options.log_baseband
- self.define_component("baseband_log",
gr.file_sink(gr.sizeof_gr_complex, options.log_baseband))
- self.connect("channel", 0, "baseband_log", 0)
+ self.baseband_log = gr.file_sink(gr.sizeof_gr_complex,
options.log_baseband)
+ self.connect(channel, baseband_log)
# Log demodulator output to file if requested
if options.log_demod is not None:
if options.verbose:
print "Logging demodulator to file", options.log_demod
- self.define_component("demod_log", gr.file_sink(gr.sizeof_char,
options.log_demod))
- self.connect("demod", 0, "demod_log", 0)
+ self.demod_log = gr.file_sink(gr.sizeof_char, options.log_demod)
+ self.connect(demod, demod_log)
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/dect/gmsk2.py
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/dect/gmsk2.py
2007-04-26 23:21:15 UTC (rev 5137)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/dect/gmsk2.py
2007-04-26 23:34:30 UTC (rev 5138)
@@ -106,14 +106,7 @@
if verbose:
self._print_verbage()
- # Define and connect components
- self.define_component("nrz", self.nrz)
- self.define_component("filter", self.gaussian_filter)
- self.define_component("fmmod", self.fmmod)
- self.connect("self", 0, "nrz", 0)
- self.connect("nrz", 0, "filter", 0)
- self.connect("filter", 0, "fmmod", 0)
- self.connect("fmmod", 0, "self", 0)
+ self.connect(self, self.nrz, self.gaussian_filter, self.fmmod, self)
if log:
self._setup_logging()
@@ -125,7 +118,6 @@
return 1
bits_per_symbol = staticmethod(bits_per_symbol) # make it a static
method.
-
def _print_verbage(self):
print "bits per symbol = %d" % self.bits_per_symbol()
print "Gaussian filter bt = %.2f" % self._bt
@@ -133,12 +125,9 @@
def _setup_logging(self):
print "Modulation logging turned on."
- self.define_component("nrz_log", gr.file_sink(gr.sizeof_float,
"nrz.dat"))
- self.define_component("filter_log", gr.file_sink(gr.sizeof_float,
"gaussian_filter.dat"))
- self.define_component("fmmod_log", gr.file_sink(gr.sizeof_gr_complex,
"fmmod.dat"))
- self.connect("nrz", 0, "nrz_log", 0)
- self.connect("filter", 0, "filter_log", 0)
- self.connect("fmmod", 0, "fmmod_log", 0)
+ self.connect(self.nrz, gr.file_sink(gr.sizeof_float, "nrz.dat"))
+ self.connect(self.gaussian_filter, gr.file_sink(gr.sizeof_float,
"gaussian_filter.dat"))
+ self.connect(self.fmmod, gr.file_sink(gr.sizeof_gr_complex,
"fmmod.dat"))
def add_options(parser):
"""
@@ -232,14 +221,7 @@
if verbose:
self._print_verbage()
- # Define and connect components
- self.define_component("fmdemod", self.fmdemod)
- self.define_component("clock_recovery", self.clock_recovery)
- self.define_component("slicer", self.slicer)
- self.connect("self", 0, "fmdemod", 0)
- self.connect("fmdemod", 0, "clock_recovery", 0)
- self.connect("clock_recovery", 0, "slicer", 0)
- self.connect("slicer", 0, "self", 0)
+ self.connect(self, fmdemod, clock_recovery, slicer, self)
if log:
self._setup_logging()
@@ -251,7 +233,6 @@
return 1
bits_per_symbol = staticmethod(bits_per_symbol) # make it a static
method.
-
def _print_verbage(self):
print "bits per symbol = %d" % self.bits_per_symbol()
print "M&M clock recovery omega = %f" % self._omega
@@ -263,12 +244,9 @@
def _setup_logging(self):
print "Demodulation logging turned on."
- self.define_component("fmdemod_log", gr.file_sink(gr.sizeof_float,
"fmdemod.dat"))
- self.define_component("clock_recovery_log",
gr.file_sink(gr.sizeof_float, "clock_recovery.dat"))
- self.define_component("slicer_log", gr.file_sink(gr.sizeof_char,
"slicer.dat"))
- self.connect("fmdemod", 0, "fmdemod_log", 0)
- self.connect("clock_recovery", 0, "clock_recovery_log", 0)
- self.connect("slicer", 0, "slicer_log", 0)
+ self.connect(fmdemod, gr.file_sink(gr.sizeof_float, "fmdemod.dat"))
+ self.connect(clock_recovery, gr.file_sink(gr.sizeof_float,
"clock_recovery.dat"))
+ self.connect(slicer, gr.file_sink(gr.sizeof_char, "slicer.dat"))
def add_options(parser):
"""
Modified:
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/dect/usrp_source.py
===================================================================
---
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/dect/usrp_source.py
2007-04-26 23:21:15 UTC (rev 5137)
+++
gnuradio/branches/developers/jcorgan/hb/gnuradio-examples/python/hier/dect/usrp_source.py
2007-04-26 23:34:30 UTC (rev 5138)
@@ -47,10 +47,8 @@
self.set_gain(gain)
self.set_calibration(calibration)
self.tune(freq)
+ self.connect(self._u, self)
- self.define_component("usrp", self._u)
- self.connect("usrp", 0, "self", 0)
-
def set_subdev(self, subdev_spec):
if subdev_spec is None:
subdev_spec = self.pick_subdevice()
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r5138 - in gnuradio/branches/developers/jcorgan/hb: gnuradio-core/src/lib/runtime gnuradio-core/src/python/gnuradio/gr gnuradio-examples/python/hier/audio gnuradio-examples/python/hier/dect,
jcorgan <=