[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r3953 - in gnuradio/branches/developers/jcorgan/hier:
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r3953 - in gnuradio/branches/developers/jcorgan/hier: gnuradio-core/src/lib/runtime gnuradio-core/src/python/gnuradio/gr gnuradio-examples/c++/dialtone gnuradio-examples/c++/usrp_wfm_rcv gnuradio-examples/python/audio |
|
Date: |
Tue, 7 Nov 2006 20:11:35 -0700 (MST) |
Author: jcorgan
Date: 2006-11-07 20:11:35 -0700 (Tue, 07 Nov 2006)
New Revision: 3953
Modified:
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.cc
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.cc
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.h
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.i
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_impl.cc
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_impl.h
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime.cc
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime.h
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime_impl.cc
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime_impl.h
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/qa_gr_hier_block2.cc
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/qa_gr_hier_block2.h
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/dialtone/dialtone.cc
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/dialtone/dialtone.h
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/usrp_wfm_rcv/usrp_wfm_rcv.cc
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/usrp_wfm_rcv/usrp_wfm_rcv.h
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/python/audio/dial_tone2.py
Log:
Work in progress. Clean-up and stylistic changes, elimination of
'update_connections' technique.
Modified:
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.cc
===================================================================
---
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.cc
2006-11-08 01:57:18 UTC (rev 3952)
+++
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.cc
2006-11-08 03:11:35 UTC (rev 3953)
@@ -30,7 +30,8 @@
static long s_next_id = 0;
static long s_ncurrently_allocated = 0;
-long gr_basic_block_ncurrently_allocated()
+long
+gr_basic_block_ncurrently_allocated()
{
return s_ncurrently_allocated;
}
@@ -51,7 +52,8 @@
s_ncurrently_allocated--;
}
-gr_basic_block_sptr gr_basic_block::basic_block()
+gr_basic_block_sptr
+gr_basic_block::basic_block()
{
return shared_from_this();
}
Modified:
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.cc
===================================================================
---
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.cc
2006-11-08 01:57:18 UTC (rev 3952)
+++
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.cc
2006-11-08 03:11:35 UTC (rev 3953)
@@ -49,35 +49,38 @@
delete d_impl;
}
-void gr_hier_block2::define_component(const std::string name,
gr_basic_block_sptr basic_block)
+void
+gr_hier_block2::define_component(const std::string name, gr_basic_block_sptr
basic_block)
{
d_impl->define_component(name, basic_block);
}
-void gr_hier_block2::connect(const std::string src_name, int src_port, const
std::string dst_name, int dst_port)
+void
+gr_hier_block2::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-in") {
- gr_basic_block_sptr src_block = d_impl->lookup_component(src_name);
+ if (src_name == "self")
+ src_io_signature = input_signature();
+ else {
+ gr_basic_block_sptr src_block = d_impl->get_block_by_name(src_name);
if (!src_block)
throw std::invalid_argument("Undefined src name");
src_io_signature = src_block->output_signature();
}
- else
- src_io_signature = input_signature();
// Check against our *output_signature* if we're wiring to one of our
external outputs
- if (dst_name != "self-out") {
- gr_basic_block_sptr dst_block = d_impl->lookup_component(dst_name);
+ if (dst_name == "self")
+ dst_io_signature = output_signature();
+ else {
+ gr_basic_block_sptr dst_block = d_impl->get_block_by_name(dst_name);
if (!dst_block)
throw std::invalid_argument("Undefined dst name");
dst_io_signature = dst_block->input_signature();
}
- else
- dst_io_signature = output_signature();
// Check port numbers are valid
d_impl->check_valid_port(src_io_signature, src_port);
@@ -86,17 +89,11 @@
// Check destination port not already in use
d_impl->check_dst_not_used(dst_name, dst_port);
- // Make sure endpoints have the same stream size
- if (src_io_signature->sizeof_stream_item(src_port) !=
- dst_io_signature->sizeof_stream_item(dst_port))
- throw std::invalid_argument("type mismatch");
+ // Check endpoint types match
+ d_impl->check_type_match(src_io_signature, src_port,
+ dst_io_signature, dst_port);
- gr_connection connection(gr_endpoint(src_name, src_port),
gr_endpoint(dst_name, dst_port));
+ gr_connection connection(gr_endpoint(src_name, src_port),
+ gr_endpoint(dst_name, dst_port));
d_impl->d_connections.push_back(connection);
}
-
-// Stub implementation, accept any topology, create no subcomponents
-bool gr_hier_block2::update_connections(int ninputs, int noutputs)
-{
- return true;
-}
Modified:
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.h
===================================================================
---
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.h
2006-11-08 01:57:18 UTC (rev 3952)
+++
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.h
2006-11-08 03:11:35 UTC (rev 3953)
@@ -22,9 +22,6 @@
#ifndef INCLUDED_GR_HIER_BLOCK2_H
#define INCLUDED_GR_HIER_BLOCK2_H
-// Define to 0 to eliminate debugging
-#define GR_HIER_BLOCK2_DEBUG 1
-
#include <gr_basic_block.h>
/*!
@@ -57,22 +54,18 @@
gr_io_signature_sptr input_signature,
gr_io_signature_sptr output_signature);
- virtual bool update_connections(int ninputs, int noutputs);
-
public:
~gr_hier_block2();
void define_component(const std::string name, gr_basic_block_sptr
basic_block);
- void connect(const std::string from_name, int from_port,
- const std::string to_name, int to_port);
+ void connect(const std::string src_name, int src_port,
+ const std::string dst_name, int dst_port);
};
-#if GR_HIER_BLOCK2_DEBUG
inline std::ostream &operator << (std::ostream &os, gr_basic_block_sptr
basic_block)
{
os << basic_block->name() << "(" << basic_block->unique_id() << ")";
return os;
}
-#endif /* GR_HIER_BLOCK2_DEBUG */
#endif /* INCLUDED_GR_HIER_BLOCK2_H */
Modified:
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.i
===================================================================
---
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.i
2006-11-08 01:57:18 UTC (rev 3952)
+++
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.i
2006-11-08 03:11:35 UTC (rev 3953)
@@ -49,7 +49,7 @@
// Add a named block to the container
void define_component(const std::string name, gr_basic_block_sptr
basic_block)
throw (std::invalid_argument);
- void connect(const std::string from_name, int from_port,
- const std::string to_name, int to_port)
+ void connect(const std::string src_name, int src_port,
+ const std::string dst_name, int dst_port)
throw (std::invalid_argument);
};
Modified:
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_impl.cc
===================================================================
---
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_impl.cc
2006-11-08 01:57:18 UTC (rev 3952)
+++
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_impl.cc
2006-11-08 03:11:35 UTC (rev 3953)
@@ -36,21 +36,24 @@
{
}
-void gr_hier_block2_impl::define_component(const std::string &name,
gr_basic_block_sptr basic_block)
+void
+gr_hier_block2_impl::define_component(const std::string &name,
+ gr_basic_block_sptr basic_block)
{
- if (name == "self-in" || name == "self-out")
+ if (name == "self")
throw std::invalid_argument("name is reserved");
- if (lookup_component(name))
- throw std::invalid_argument("Name already in use");
+ if (get_block_by_name(name))
+ throw std::invalid_argument("name already in use");
- if (lookup_component(basic_block) != "")
- throw std::invalid_argument("Component already defined");
+ if (get_name_by_block(basic_block) != "")
+ throw std::invalid_argument("component already defined");
d_components.push_back(gr_hier_component(name, basic_block));
}
-gr_basic_block_sptr gr_hier_block2_impl::lookup_component(const std::string
&name)
+gr_basic_block_sptr
+gr_hier_block2_impl::get_block_by_name(const std::string &name)
{
for (std::vector<gr_hier_component>::const_iterator p =
d_components.begin();
p != d_components.end(); p++) {
@@ -61,7 +64,8 @@
return gr_basic_block_sptr();
}
-std::string gr_hier_block2_impl::lookup_component(gr_basic_block_sptr
basic_block)
+std::string
+gr_hier_block2_impl::get_name_by_block(gr_basic_block_sptr basic_block)
{
for (std::vector<gr_hier_component>::const_iterator p =
d_components.begin();
p != d_components.end(); p++) {
@@ -72,7 +76,8 @@
return std::string("");
}
-void gr_hier_block2_impl::check_valid_port(gr_io_signature_sptr sig, int port)
+void
+gr_hier_block2_impl::check_valid_port(gr_io_signature_sptr sig, int port)
{
if (port < 0)
throw std::invalid_argument("port number must not be negative");
@@ -81,7 +86,8 @@
throw std::invalid_argument("port number exceeds max streams");
}
-void gr_hier_block2_impl::check_dst_not_used(const std::string name, int port)
+void
+gr_hier_block2_impl::check_dst_not_used(const std::string name, int port)
{
for (std::vector<gr_connection>::const_iterator p = d_connections.begin();
p != d_connections.end(); p++) {
@@ -90,3 +96,12 @@
throw std::invalid_argument("destination port in use");
}
}
+
+void
+gr_hier_block2_impl::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");
+}
Modified:
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_impl.h
===================================================================
---
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_impl.h
2006-11-08 01:57:18 UTC (rev 3952)
+++
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2_impl.h
2006-11-08 03:11:35 UTC (rev 3953)
@@ -22,12 +22,10 @@
#ifndef INCLUDED_GR_HIER_BLOCK2_IMPL_H
#define INCLUDED_GR_HIER_BLOCK2_IMPL_H
-// Define to 0 to eliminate debugging
-#define GR_HIER_BLOCK2_IMPL_DEBUG 1
-
#include <gr_basic_block.h>
#include <stdexcept>
#include <iostream>
+#include <boost/utility.hpp>
// This beats the hell out of using pairs
class gr_hier_component
@@ -72,30 +70,27 @@
gr_endpoint dst() const { return d_dst; }
};
-class gr_hier_block2_impl
+class gr_hier_block2_impl : boost::noncopyable
{
private:
friend class gr_hier_block2;
gr_hier_block2_impl();
- // Not implemented, making private makes class noncopyable
- gr_hier_block2_impl(const gr_hier_block2_impl &rhs);
- gr_hier_block2_impl &operator=(const gr_hier_block2_impl &rhs);
-
std::vector<gr_hier_component> d_components;
std::vector<gr_connection> d_connections;
void define_component(const std::string &name, gr_basic_block_sptr
basic_block);
- gr_basic_block_sptr lookup_component(const std::string &name);
- std::string lookup_component(gr_basic_block_sptr basic_block);
+ gr_basic_block_sptr get_block_by_name(const std::string &name);
+ std::string get_name_by_block(gr_basic_block_sptr basic_block);
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);
+
public:
~gr_hier_block2_impl();
};
-#if GR_HIER_BLOCK2_IMPL_DEBUG
inline std::ostream &operator << (std::ostream &os, const gr_endpoint endpoint)
{
os << endpoint.name() << ":" << endpoint.port();
@@ -107,6 +102,5 @@
os << connection.src() << "->" << connection.dst();
return os;
}
-#endif /* GR_HIER_BLOCK2_IMPL_DEBUG */
#endif /* INCLUDED_GR_HIER_BLOCK2_H */
Modified:
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime.cc
===================================================================
---
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime.cc
2006-11-08 01:57:18 UTC (rev 3952)
+++
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime.cc
2006-11-08 03:11:35 UTC (rev 3953)
@@ -28,7 +28,8 @@
#include <gr_runtime_impl.h>
#include <iostream.h>
-gr_runtime_sptr gr_make_runtime(gr_hier_block2_sptr top_block)
+gr_runtime_sptr
+gr_make_runtime(gr_hier_block2_sptr top_block)
{
return gr_runtime_sptr(new gr_runtime(top_block));
}
@@ -43,22 +44,26 @@
delete d_impl;
}
-void gr_runtime::start()
+void
+gr_runtime::start()
{
d_impl->start();
}
-void gr_runtime::stop()
+void
+gr_runtime::stop()
{
d_impl->stop();
}
-void gr_runtime::wait()
+void
+gr_runtime::wait()
{
d_impl->wait();
}
-void gr_runtime::run()
+void
+gr_runtime::run()
{
start();
wait();
Modified:
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime.h
===================================================================
---
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime.h
2006-11-08 01:57:18 UTC (rev 3952)
+++
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime.h
2006-11-08 03:11:35 UTC (rev 3953)
@@ -23,9 +23,6 @@
#ifndef INCLUDED_GR_RUNTIME_H
#define INCLUDED_GR_RUNTIME_H
-// Define to 0 to eliminate runtime debugging
-#define GR_RUNTIME_DEBUG 1
-
#include <gr_runtime_types.h>
class gr_runtime_impl;
Modified:
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime_impl.cc
===================================================================
---
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime_impl.cc
2006-11-08 01:57:18 UTC (rev 3952)
+++
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime_impl.cc
2006-11-08 03:11:35 UTC (rev 3953)
@@ -24,6 +24,8 @@
#include "config.h"
#endif
+#define GR_RUNTIME_IMPL_DEBUG 1
+
#include <gr_runtime_impl.h>
#include <stdexcept>
#include <iostream>
@@ -32,17 +34,14 @@
d_top_block(top_block),
d_running(false)
{
- if (GR_RUNTIME_IMPL_DEBUG)
- std::cout << "gr_runtime_impl::gr_runtime_impl()" << std::endl;
}
gr_runtime_impl::~gr_runtime_impl()
{
- if (GR_RUNTIME_IMPL_DEBUG)
- std::cout << "gr_runtime_impl::~gr_runtime_impl()" << std::endl;
}
-void gr_runtime_impl::start()
+void
+gr_runtime_impl::start()
{
if (GR_RUNTIME_IMPL_DEBUG)
std::cout << "gr_runtime_impl::start()" << std::endl;
@@ -55,7 +54,8 @@
// Start
}
-void gr_runtime_impl::stop()
+void
+gr_runtime_impl::stop()
{
if (GR_RUNTIME_IMPL_DEBUG)
std::cout << "gr_runtime_impl::stop()" << std::endl;
@@ -67,7 +67,8 @@
d_running = false;
}
-void gr_runtime_impl::wait()
+void
+gr_runtime_impl::wait()
{
if (GR_RUNTIME_IMPL_DEBUG)
std::cout << "gr_runtime_impl::wait()" << std::endl;
Modified:
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime_impl.h
===================================================================
---
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime_impl.h
2006-11-08 01:57:18 UTC (rev 3952)
+++
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_runtime_impl.h
2006-11-08 03:11:35 UTC (rev 3953)
@@ -25,9 +25,6 @@
#include <gr_runtime_types.h>
-// Define to 0 to eliminate runtime debugging
-#define GR_RUNTIME_IMPL_DEBUG 1
-
class gr_runtime_impl
{
private:
Modified:
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/qa_gr_hier_block2.cc
===================================================================
---
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/qa_gr_hier_block2.cc
2006-11-08 01:57:18 UTC (rev 3952)
+++
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/qa_gr_hier_block2.cc
2006-11-08 03:11:35 UTC (rev 3953)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2006 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -30,53 +30,6 @@
#include <gr_null_source.h>
#include <gr_null_sink.h>
-// gr_hier_block2 functionality only available from within derived class, so
make one
-class gr_test_block;
-typedef boost::shared_ptr<gr_test_block> gr_test_block_sptr;
-gr_test_block_sptr gr_make_test_block();
-
-class gr_test_block : public gr_hier_block2
-{
-private:
- gr_test_block();
- friend gr_test_block_sptr gr_make_test_block();
-
- bool update_connections(int inputs, int outputs);
-
-public:
- ~gr_test_block();
-};
-
-gr_test_block_sptr gr_make_test_block()
-{
- return gr_test_block_sptr(new gr_test_block());
-}
-
-gr_test_block::gr_test_block()
- : gr_hier_block2("test_block",
- gr_make_io_signature(1, 1, sizeof(int)),
- gr_make_io_signature(1, 1, sizeof(int)))
-{
- define_component("source", gr_make_null_source(sizeof(int)));
- define_component("sink", gr_make_null_sink(sizeof(int)));
-}
-
-bool gr_test_block::update_connections(int inputs, int outputs)
-{
- if (inputs != 1 || outputs != 1)
- return false;
-
- connect("self-in", 0, "source", 0);
- connect("source", 0, "sink", 0);
- connect("sink", 0, "self-out", 0);
-
- return true;
-}
-
-gr_test_block::~gr_test_block()
-{
-}
-
void qa_gr_hier_block2::test_make()
{
gr_hier_block2_sptr src1(gr_make_hier_block2("test",
@@ -91,16 +44,3 @@
CPPUNIT_ASSERT_EQUAL(sizeof(int),
src1->output_signature()->sizeof_stream_item(0));
}
-
-void qa_gr_hier_block2::test_derived()
-{
- gr_test_block_sptr blk1(gr_make_test_block());
-
- CPPUNIT_ASSERT(blk1);
- CPPUNIT_ASSERT_EQUAL(std::string("test_block"), blk1->name());
- CPPUNIT_ASSERT_EQUAL(1, blk1->input_signature()->max_streams());
- CPPUNIT_ASSERT_EQUAL(1, blk1->output_signature()->min_streams());
- CPPUNIT_ASSERT_EQUAL(1, blk1->output_signature()->max_streams());
- CPPUNIT_ASSERT_EQUAL(sizeof(int),
- blk1->output_signature()->sizeof_stream_item(0));
-}
Modified:
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/qa_gr_hier_block2.h
===================================================================
---
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/qa_gr_hier_block2.h
2006-11-08 01:57:18 UTC (rev 3952)
+++
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/qa_gr_hier_block2.h
2006-11-08 03:11:35 UTC (rev 3953)
@@ -32,7 +32,6 @@
CPPUNIT_TEST_SUITE(qa_gr_hier_block2);
CPPUNIT_TEST(test_make);
- CPPUNIT_TEST(test_derived);
CPPUNIT_TEST_SUITE_END();
Modified:
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
===================================================================
---
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
2006-11-08 01:57:18 UTC (rev 3952)
+++
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
2006-11-08 03:11:35 UTC (rev 3953)
@@ -37,15 +37,8 @@
gr.io_signature(1,1,gr.sizeof_int),
gr.io_signature(1,1,gr.sizeof_int))
src1 = gr.nop(gr.sizeof_int)
- self.assertRaises(ValueError, lambda:
hblock.define_component("self-in", src1))
+ self.assertRaises(ValueError, lambda: hblock.define_component("self",
src1))
- def test_004_define_component_reserved_output(self):
- hblock = gr.hier_block2("test_block",
- gr.io_signature(1,1,gr.sizeof_int),
- gr.io_signature(1,1,gr.sizeof_int))
- src1 = gr.nop(gr.sizeof_int)
- self.assertRaises(ValueError, lambda:
hblock.define_component("self-out", src1))
-
def test_005_define_component_name_in_use(self):
hblock = gr.hier_block2("test_block",
gr.io_signature(1,1,gr.sizeof_int),
@@ -85,7 +78,7 @@
nop1 = gr.nop(gr.sizeof_int)
hblock.define_component("nop1", nop1)
- hblock.connect("self-in", 0, "nop1", 0)
+ hblock.connect("self", 0, "nop1", 0)
def test_009_connect_output(self):
hblock = gr.hier_block2("test_block",
@@ -94,7 +87,7 @@
nop1 = gr.nop(gr.sizeof_int)
hblock.define_component("nop1", nop1)
- hblock.connect("nop1", 0, "self-out", 0)
+ hblock.connect("nop1", 0, "self", 0)
def test_010_connect_unknown_src(self):
hblock = gr.hier_block2("test_block",
@@ -103,7 +96,7 @@
nop1 = gr.nop(gr.sizeof_int)
hblock.define_component("nop1", nop1)
- self.assertRaises(ValueError, lambda: hblock.connect("nop2", 0,
"self-out", 0))
+ self.assertRaises(ValueError, lambda: hblock.connect("nop2", 0, "self",
0))
def test_011_connect_unknown_dst(self):
hblock = gr.hier_block2("test_block",
@@ -112,7 +105,7 @@
nop1 = gr.nop(gr.sizeof_int)
hblock.define_component("nop1", nop1)
- self.assertRaises(ValueError, lambda: hblock.connect("self-in", 0,
"nop2", 0))
+ self.assertRaises(ValueError, lambda: hblock.connect("self", 0, "nop2",
0))
def test_012_connect_invalid_src_port_neg(self):
hblock = gr.hier_block2("test_block",
@@ -121,7 +114,7 @@
nop1 = gr.nop(gr.sizeof_int)
hblock.define_component("nop1", nop1)
- self.assertRaises(ValueError, lambda: hblock.connect("self-in", -1,
"nop1", 0))
+ self.assertRaises(ValueError, lambda: hblock.connect("self", -1,
"nop1", 0))
def test_013_connect_invalid_src_port_exceeds(self):
hblock = gr.hier_block2("test_block",
@@ -130,7 +123,7 @@
nop1 = gr.nop(gr.sizeof_int)
hblock.define_component("nop1", nop1)
- self.assertRaises(ValueError, lambda: hblock.connect("self-in", 1,
"nop1", 0))
+ self.assertRaises(ValueError, lambda: hblock.connect("self", 1, "nop1",
0))
def test_014_connect_invalid_dst_port_neg(self):
hblock = gr.hier_block2("test_block",
@@ -139,7 +132,7 @@
nop1 = gr.nop(gr.sizeof_int)
hblock.define_component("nop1", nop1)
- self.assertRaises(ValueError, lambda: hblock.connect("self-in", -1,
"nop1", 0))
+ self.assertRaises(ValueError, lambda: hblock.connect("self", -1,
"nop1", 0))
def test_015_connect_invalid_dst_port_exceeds(self):
hblock = gr.hier_block2("test_block",
@@ -148,7 +141,7 @@
nop1 = gr.nop(gr.sizeof_int)
hblock.define_component("nop1", nop1)
- self.assertRaises(ValueError, lambda: hblock.connect("self-in", 1,
"nop1", 0))
+ self.assertRaises(ValueError, lambda: hblock.connect("self", 1, "nop1",
0))
def test_016_connect_dst_port_in_use(self):
hblock = gr.hier_block2("test_block",
@@ -157,8 +150,8 @@
nop1 = gr.nop(gr.sizeof_int)
hblock.define_component("nop1", nop1)
- hblock.connect("nop1", 0, "self-out", 0);
- self.assertRaises(ValueError, lambda: hblock.connect("nop1", 0,
"self-out", 0))
+ hblock.connect("nop1", 0, "self", 0);
+ self.assertRaises(ValueError, lambda: hblock.connect("nop1", 0, "self",
0))
def test_017_connect_type_mismatch(self):
hblock = gr.hier_block2("test_block",
@@ -167,7 +160,7 @@
nop1 = gr.nop(gr.sizeof_char)
hblock.define_component("nop1", nop1)
- self.assertRaises(ValueError, lambda: hblock.connect("nop1", 0,
"self-out", 0))
+ self.assertRaises(ValueError, lambda: hblock.connect("nop1", 0, "self",
0))
if __name__ == "__main__":
gr_unittest.main()
Modified:
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/dialtone/dialtone.cc
===================================================================
---
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/dialtone/dialtone.cc
2006-11-08 01:57:18 UTC (rev 3952)
+++
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/dialtone/dialtone.cc
2006-11-08 03:11:35 UTC (rev 3953)
@@ -39,17 +39,7 @@
define_component("source0", gr_make_sig_source_f(48000, GR_SIN_WAVE, 350,
0.5));
define_component("source1", gr_make_sig_source_f(48000, GR_SIN_WAVE, 440,
0.5));
define_component("sink", audio_alsa_make_sink(48000));
-}
-// Called by runtime whenever connectivity changes, at least once
-// on startup.
-bool dialtone::update_connections(int ninputs, int noutputs)
-{
- if (ninputs || noutputs) // Top-level blocks have no external connections
- return false;
-
connect("source0", 0, "sink", 0);
connect("source1", 0, "sink", 1);
-
- return true;
-}
+}
Modified:
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/dialtone/dialtone.h
===================================================================
---
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/dialtone/dialtone.h
2006-11-08 01:57:18 UTC (rev 3952)
+++
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/dialtone/dialtone.h
2006-11-08 03:11:35 UTC (rev 3953)
@@ -30,6 +30,4 @@
private:
dialtone();
friend dialtone_sptr make_dialtone();
-
- bool update_connections(int inputs, int outputs);
};
Modified:
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/usrp_wfm_rcv/usrp_wfm_rcv.cc
===================================================================
---
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/usrp_wfm_rcv/usrp_wfm_rcv.cc
2006-11-08 01:57:18 UTC (rev 3952)
+++
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/usrp_wfm_rcv/usrp_wfm_rcv.cc
2006-11-08 03:11:35 UTC (rev 3953)
@@ -57,17 +57,9 @@
USRP_FPGA_FILENAME,
USRP_FIRMWARE_FILENAME));
define_component("quad", gr_make_quadrature_demod_cf(demod_gain));
- define_component("null", gr_make_null_sink(sizeof(gr_complex)));
+ define_component("null", gr_make_null_sink(sizeof(float)));
define_component("sink", audio_alsa_make_sink(48000));
-}
-bool usrp_wfm_rcv::update_connections(int ninputs, int noutputs)
-{
- if (ninputs || noutputs) // Top level blocks shouldn't have any inputs or
outputs
- return false;
-
connect("src", 0, "quad", 0);
connect("quad", 0, "null", 0);
-
- return true;
}
Modified:
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/usrp_wfm_rcv/usrp_wfm_rcv.h
===================================================================
---
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/usrp_wfm_rcv/usrp_wfm_rcv.h
2006-11-08 01:57:18 UTC (rev 3952)
+++
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/c++/usrp_wfm_rcv/usrp_wfm_rcv.h
2006-11-08 03:11:35 UTC (rev 3953)
@@ -30,6 +30,4 @@
private:
usrp_wfm_rcv();
friend usrp_wfm_rcv_sptr usrp_make_wfm_rcv();
-
- bool update_connections(int ninputs, int noutputs);
};
Modified:
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/python/audio/dial_tone2.py
===================================================================
---
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/python/audio/dial_tone2.py
2006-11-08 01:57:18 UTC (rev 3952)
+++
gnuradio/branches/developers/jcorgan/hier/gnuradio-examples/python/audio/dial_tone2.py
2006-11-08 03:11:35 UTC (rev 3953)
@@ -48,14 +48,8 @@
self.define_component("source0", gr.sig_source_f (sample_rate,
gr.GR_SIN_WAVE, 350, ampl))
self.define_component("source1", gr.sig_source_f (sample_rate,
gr.GR_SIN_WAVE, 440, ampl))
self.define_component("dest", audio.sink(sample_rate,
options.audio_output))
-
- def update_connections(self, ninputs, noutputs):
- if ninputs or noutputs: # Top level blocks shouldn't have inputs or
outputs
- return False
-
self.connect("source0", 0, "dest", 0)
self.connect("source1", 0, "dest", 1)
- return True
if __name__ == '__main__':
top_block = dial_tone()
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r3953 - in gnuradio/branches/developers/jcorgan/hier: gnuradio-core/src/lib/runtime gnuradio-core/src/python/gnuradio/gr gnuradio-examples/c++/dialtone gnuradio-examples/c++/usrp_wfm_rcv gnuradio-examples/python/audio,
jcorgan <=