summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gnuradio-runtime/include/gnuradio/flowgraph.h2
-rw-r--r--gnuradio-runtime/include/gnuradio/pycallback_object.h8
-rw-r--r--gnuradio-runtime/lib/block.cc11
-rw-r--r--gnuradio-runtime/lib/flat_flowgraph.cc22
-rw-r--r--gnuradio-runtime/lib/flat_flowgraph.h3
-rw-r--r--gnuradio-runtime/lib/flowgraph.cc19
-rw-r--r--gnuradio-runtime/lib/hier_block2_detail.cc255
-rw-r--r--gnuradio-runtime/lib/hier_block2_detail.h4
-rw-r--r--gnuradio-runtime/lib/logger.cc2
-rw-r--r--gnuradio-runtime/python/gnuradio/gr/bindings/flowgraph_python.cc2
-rw-r--r--gr-audio/lib/alsa/alsa_impl.cc10
-rw-r--r--gr-audio/lib/osx/osx_source.cc230
-rw-r--r--gr-blocks/lib/check_lfsr_32k_s_impl.cc38
-rw-r--r--gr-blocks/lib/qa_block_tags.cc79
-rw-r--r--gr-digital/lib/constellation_receiver_cb_impl.cc18
-rw-r--r--gr-digital/lib/fll_band_edge_cc_impl.cc24
-rw-r--r--gr-fec/lib/async_encoder_impl.cc12
-rw-r--r--gr-iio/lib/pluto_utils.cc16
18 files changed, 392 insertions, 363 deletions
diff --git a/gnuradio-runtime/include/gnuradio/flowgraph.h b/gnuradio-runtime/include/gnuradio/flowgraph.h
index 1d2e7a6550..34df6082f4 100644
--- a/gnuradio-runtime/include/gnuradio/flowgraph.h
+++ b/gnuradio-runtime/include/gnuradio/flowgraph.h
@@ -251,6 +251,8 @@ protected:
basic_block_vector_t d_blocks;
edge_vector_t d_edges;
msg_edge_vector_t d_msg_edges;
+ gr::logger_ptr d_logger;
+ gr::logger_ptr d_debug_logger;
flowgraph();
std::vector<int> calc_used_ports(basic_block_sptr block, bool check_inputs);
diff --git a/gnuradio-runtime/include/gnuradio/pycallback_object.h b/gnuradio-runtime/include/gnuradio/pycallback_object.h
index 2af94c167e..80281db1e2 100644
--- a/gnuradio-runtime/include/gnuradio/pycallback_object.h
+++ b/gnuradio-runtime/include/gnuradio/pycallback_object.h
@@ -12,6 +12,8 @@
#include <pythread.h>
#include <boost/format.hpp>
+#include <iostream>
+
enum pyport_t { PYPORT_STRING, PYPORT_FLOAT };
int pycallback_object_count = 500;
@@ -70,7 +72,9 @@ public:
{
myType rVal = d_deflt;
if (d_callback == NULL) {
- printf("WARNING: pycallback_object get() called without py callback set!\n");
+ std::cerr
+ << "WARNING: pycallback_object get() called without py callback set!"
+ << std::endl;
return rVal;
} else {
// obtain PyGIL
@@ -130,7 +134,7 @@ private:
* something. */
myType pyCast(PyObject* obj)
{
- printf("TYPE NOT IMPLEMENTED!\n");
+ std::cerr << "TYPE NOT IMPLEMENTED!" << std::endl;
assert(0);
// the following is to make compilers happy only.
myType dummy;
diff --git a/gnuradio-runtime/lib/block.cc b/gnuradio-runtime/lib/block.cc
index e9f1a635bb..cddf5a5baa 100644
--- a/gnuradio-runtime/lib/block.cc
+++ b/gnuradio-runtime/lib/block.cc
@@ -16,7 +16,9 @@
#include <gnuradio/block_detail.h>
#include <gnuradio/block_registry.h>
#include <gnuradio/buffer.h>
+#include <gnuradio/logger.h>
#include <gnuradio/prefs.h>
+#include <boost/format.hpp>
#include <iostream>
#include <stdexcept>
@@ -357,8 +359,9 @@ long block::min_output_buffer(size_t i)
void block::set_min_output_buffer(long min_output_buffer)
{
- std::cout << "set_min_output_buffer on block " << unique_id() << " to "
- << min_output_buffer << std::endl;
+ GR_LOG_INFO(d_logger,
+ boost::format("set_min_output_buffer on block %s to %d") % unique_id() %
+ min_output_buffer);
for (int i = 0; i < output_signature()->max_streams(); i++) {
set_min_output_buffer(i, min_output_buffer);
}
@@ -594,13 +597,13 @@ void block::reset_perf_counters()
void block::system_handler(pmt::pmt_t msg)
{
- // std::cout << "system_handler " << msg << "\n";
+ // GR_LOG_INFO(d_logger, boost::format("system handler %s") % msg);
pmt::pmt_t op = pmt::car(msg);
if (pmt::eqv(op, d_pmt_done)) {
d_finished = pmt::to_long(pmt::cdr(msg));
global_block_registry.notify_blk(d_symbol_name);
} else {
- std::cout << "WARNING: bad message op on system port!\n";
+ GR_LOG_WARN(d_logger, "bad message op on system port!");
pmt::print(msg);
}
}
diff --git a/gnuradio-runtime/lib/flat_flowgraph.cc b/gnuradio-runtime/lib/flat_flowgraph.cc
index 150b74fd6e..0df75553e0 100644
--- a/gnuradio-runtime/lib/flat_flowgraph.cc
+++ b/gnuradio-runtime/lib/flat_flowgraph.cc
@@ -35,10 +35,7 @@ flat_flowgraph_sptr make_flat_flowgraph()
return flat_flowgraph_sptr(new flat_flowgraph());
}
-flat_flowgraph::flat_flowgraph()
-{
- configure_default_loggers(d_logger, d_debug_logger, "flat_flowgraph");
-}
+flat_flowgraph::flat_flowgraph() {}
flat_flowgraph::~flat_flowgraph() {}
@@ -130,8 +127,8 @@ buffer_sptr flat_flowgraph::allocate_buffer(basic_block_sptr block, int port)
// limit buffer size if indicated
if (grblock->max_output_buffer(port) > 0) {
- // std::cout << "constraining output items to " << block->max_output_buffer(port)
- // << "\n";
+ // GR_LOG_INFO(d_debug_logger, boost::format("constraining output items to %d")
+ // % block->max_output_buffer(port));
nitems = std::min((long)nitems, (long)grblock->max_output_buffer(port));
nitems -= nitems % grblock->output_multiple();
if (nitems < 1)
@@ -371,24 +368,25 @@ std::string flat_flowgraph::msg_edge_list()
void flat_flowgraph::dump()
{
for (edge_viter_t e = d_edges.begin(); e != d_edges.end(); e++)
- std::cout << " edge: " << (*e) << std::endl;
+ GR_LOG_INFO(d_logger, boost::format(" edge: %s") % *e);
for (basic_block_viter_t p = d_blocks.begin(); p != d_blocks.end(); p++) {
- std::cout << " block: " << (*p) << std::endl;
+ GR_LOG_INFO(d_logger, boost::format(" block: %s") % *p);
block_detail_sptr detail = cast_to_block_sptr(*p)->detail();
- std::cout << " detail @" << detail << ":" << std::endl;
+ GR_LOG_INFO(d_logger, boost::format(" detail @%s:") % detail);
int ni = detail->ninputs();
int no = detail->noutputs();
for (int i = 0; i < no; i++) {
buffer_sptr buffer = detail->output(i);
- std::cout << " output " << i << ": " << buffer << std::endl;
+ GR_LOG_INFO(d_logger, boost::format(" output %d: %s") % i % buffer);
}
for (int i = 0; i < ni; i++) {
buffer_reader_sptr reader = detail->input(i);
- std::cout << " reader " << i << ": " << reader
- << " reading from buffer=" << reader->buffer() << std::endl;
+ GR_LOG_INFO(d_logger,
+ boost::format(" reader %d: %s reading from buffer=%s") % i %
+ reader % reader->buffer());
}
}
}
diff --git a/gnuradio-runtime/lib/flat_flowgraph.h b/gnuradio-runtime/lib/flat_flowgraph.h
index 83f5d1b78a..deb0fe2c6a 100644
--- a/gnuradio-runtime/lib/flat_flowgraph.h
+++ b/gnuradio-runtime/lib/flat_flowgraph.h
@@ -90,9 +90,6 @@ private:
* start and restarts.
*/
void setup_buffer_alignment(block_sptr block);
-
- gr::logger_ptr d_logger;
- gr::logger_ptr d_debug_logger;
};
} /* namespace gr */
diff --git a/gnuradio-runtime/lib/flowgraph.cc b/gnuradio-runtime/lib/flowgraph.cc
index 4e60e16010..8c9f398d2f 100644
--- a/gnuradio-runtime/lib/flowgraph.cc
+++ b/gnuradio-runtime/lib/flowgraph.cc
@@ -22,13 +22,14 @@
namespace gr {
-constexpr bool FLOWGRAPH_DEBUG = false;
-
edge::~edge() {}
flowgraph_sptr make_flowgraph() { return flowgraph_sptr(new flowgraph()); }
-flowgraph::flowgraph() {}
+flowgraph::flowgraph()
+{
+ configure_default_loggers(d_logger, d_debug_logger, "flowgraph");
+}
flowgraph::~flowgraph() {}
@@ -76,8 +77,7 @@ void flowgraph::validate()
std::vector<int> used_ports;
int ninputs, noutputs;
- if (FLOWGRAPH_DEBUG)
- std::cout << "Validating block: " << (*p) << std::endl;
+ GR_LOG_DEBUG(d_debug_logger, boost::format("Validating block: %s") % *p);
used_ports = calc_used_ports(*p, true); // inputs
ninputs = used_ports.size();
@@ -125,17 +125,16 @@ void flowgraph::check_valid_port(gr::io_signature::sptr sig, int port)
void flowgraph::check_valid_port(const msg_endpoint& e)
{
- if (FLOWGRAPH_DEBUG)
- std::cout << "check_valid_port( " << e.block() << ", " << e.port() << ")\n";
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("check_valid_port(%s, %s)") % e.block() % e.port());
if (!e.block()->has_msg_port(e.port())) {
const gr::basic_block::msg_queue_map_t& msg_map = e.block()->get_msg_map();
- std::cout << "Could not find port: " << e.port() << " in:" << std::endl;
+ GR_LOG_WARN(d_logger, boost::format("Could not find port %s in:") % e.port());
for (gr::basic_block::msg_queue_map_t::const_iterator it = msg_map.begin();
it != msg_map.end();
++it)
- std::cout << it->first << std::endl;
- std::cout << std::endl;
+ GR_LOG_WARN(d_logger, boost::format(" %s") % it->first);
throw std::invalid_argument("invalid msg port in connect() or disconnect()");
}
}
diff --git a/gnuradio-runtime/lib/hier_block2_detail.cc b/gnuradio-runtime/lib/hier_block2_detail.cc
index d63195d36d..282ec79332 100644
--- a/gnuradio-runtime/lib/hier_block2_detail.cc
+++ b/gnuradio-runtime/lib/hier_block2_detail.cc
@@ -24,8 +24,6 @@
namespace gr {
-constexpr bool HIER_BLOCK2_DETAIL_DEBUG = false;
-
hier_block2_detail::hier_block2_detail(hier_block2* owner)
: d_owner(owner), d_parent_detail(0), d_fg(make_flowgraph())
{
@@ -48,6 +46,8 @@ hier_block2_detail::hier_block2_detail(hier_block2* owner)
d_max_output_buffer = std::vector<size_t>(std::max(max_outputs, 1), 0);
d_min_output_buffer = std::vector<size_t>(std::max(max_outputs, 1), 0);
+
+ configure_default_loggers(d_logger, d_debug_logger, "hier_block2_detail");
}
hier_block2_detail::~hier_block2_detail()
@@ -75,9 +75,9 @@ void hier_block2_detail::connect(basic_block_sptr block)
hier_block2_sptr hblock(cast_to_hier_block2_sptr(block));
if (hblock && hblock.get() != d_owner) {
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "connect: block is hierarchical, setting parent to " << this
- << std::endl;
+ GR_LOG_DEBUG(
+ d_debug_logger,
+ boost::format("connect: block is hierarchical, setting parent to %s") % this);
hblock->d_detail->d_parent_detail = this;
}
@@ -91,9 +91,9 @@ void hier_block2_detail::connect(basic_block_sptr src,
{
std::stringstream msg;
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "connecting: " << endpoint(src, src_port) << " -> "
- << endpoint(dst, dst_port) << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("connecting: %s -> %s") % endpoint(src, src_port) %
+ endpoint(dst, dst_port));
if (src.get() == dst.get())
throw std::invalid_argument(
@@ -103,16 +103,16 @@ void hier_block2_detail::connect(basic_block_sptr src,
hier_block2_sptr dst_block(cast_to_hier_block2_sptr(dst));
if (src_block && src.get() != d_owner) {
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "connect: src is hierarchical, setting parent to " << this
- << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("connect: src is hierarchical, setting parent to %s") %
+ this);
src_block->d_detail->d_parent_detail = this;
}
if (dst_block && dst.get() != d_owner) {
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "connect: dst is hierarchical, setting parent to " << this
- << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("connect: dst is hierarchical, setting parent to %s") %
+ this);
dst_block->d_detail->d_parent_detail = this;
}
@@ -149,8 +149,7 @@ void hier_block2_detail::msg_connect(basic_block_sptr src,
basic_block_sptr dst,
pmt::pmt_t dstport)
{
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "connecting message port..." << std::endl;
+ GR_LOG_DEBUG(d_debug_logger, "connecting message port...");
// add block uniquely to list to internal blocks
if (std::find(d_blocks.begin(), d_blocks.end(), dst) == d_blocks.end()) {
@@ -174,23 +173,25 @@ void hier_block2_detail::msg_connect(basic_block_sptr src,
hier_block2_sptr dst_block(cast_to_hier_block2_sptr(dst));
if (src_block && src.get() != d_owner) {
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "msg_connect: src is hierarchical, setting parent to " << this
- << std::endl;
+ GR_LOG_DEBUG(
+ d_debug_logger,
+ boost::format("msg_connect: src is hierarchical, setting parent to %s") %
+ this);
src_block->d_detail->d_parent_detail = this;
}
if (dst_block && dst.get() != d_owner) {
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "msg_connect: dst is hierarchical, setting parent to " << this
- << std::endl;
+ GR_LOG_DEBUG(
+ d_debug_logger,
+ boost::format("msg_connect: dst is hierarchical, setting parent to %s") %
+ this);
dst_block->d_detail->d_parent_detail = this;
}
// add edge for this message connection
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << boost::format("msg_connect( (%s, %s, %d), (%s, %s, %d) )\n") % src %
- srcport % hier_out % dst % dstport % hier_in;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("msg_connect( (%s, %s, %d), (%s, %s, %d) )") % src %
+ srcport % hier_out % dst % dstport % hier_in);
d_fg->connect(msg_endpoint(src, srcport, hier_out),
msg_endpoint(dst, dstport, hier_in));
}
@@ -200,8 +201,7 @@ void hier_block2_detail::msg_disconnect(basic_block_sptr src,
basic_block_sptr dst,
pmt::pmt_t dstport)
{
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "disconnecting message port..." << std::endl;
+ GR_LOG_DEBUG(d_debug_logger, "disconnecting message port...");
// remove edge for this message connection
bool hier_in = false, hier_out = false;
@@ -257,9 +257,8 @@ void hier_block2_detail::disconnect(basic_block_sptr block)
hier_block2_sptr hblock(cast_to_hier_block2_sptr(block));
if (block && block.get() != d_owner) {
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "disconnect: block is hierarchical, clearing parent"
- << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ "disconnect: block is hierarchical, clearing parent");
hblock->d_detail->d_parent_detail = 0;
}
@@ -274,8 +273,8 @@ void hier_block2_detail::disconnect(basic_block_sptr block)
if ((*p).src().block() == block || (*p).dst().block() == block) {
edges.push_back(*p);
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "disconnect: block found in edge " << (*p) << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("disconnect: block found in edge %s") % *p);
}
}
@@ -296,9 +295,9 @@ void hier_block2_detail::disconnect(basic_block_sptr src,
basic_block_sptr dst,
int dst_port)
{
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "disconnecting: " << endpoint(src, src_port) << " -> "
- << endpoint(dst, dst_port) << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("disconnecting: %s -> %s") % endpoint(src, src_port) %
+ endpoint(dst, dst_port));
if (src.get() == dst.get())
throw std::invalid_argument(
@@ -308,14 +307,12 @@ void hier_block2_detail::disconnect(basic_block_sptr src,
hier_block2_sptr dst_block(cast_to_hier_block2_sptr(dst));
if (src_block && src.get() != d_owner) {
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "disconnect: src is hierarchical, clearing parent" << std::endl;
+ GR_LOG_DEBUG(d_debug_logger, "disconnect: src is hierarchical, clearing parent");
src_block->d_detail->d_parent_detail = 0;
}
if (dst_block && dst.get() != d_owner) {
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "disconnect: dst is hierarchical, clearing parent" << std::endl;
+ GR_LOG_DEBUG(d_debug_logger, "disconnect: dst is hierarchical, clearing parent");
dst_block->d_detail->d_parent_detail = 0;
}
@@ -448,10 +445,9 @@ endpoint_vector_t hier_block2_detail::resolve_port(int port, bool is_input)
{
std::stringstream msg;
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "Resolving port " << port << " as an "
- << (is_input ? "input" : "output") << " of " << d_owner->name()
- << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("Resolving port %s as an %s of %s") % port %
+ (is_input ? "input" : "output") % d_owner->name());
endpoint_vector_t result;
@@ -519,9 +515,8 @@ endpoint_vector_t hier_block2_detail::resolve_endpoint(const endpoint& endp,
// Check if endpoint is a leaf node
if (cast_to_block_sptr(endp.block())) {
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "Block " << endp.block() << " is a leaf node, returning."
- << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("Block %s is a leaf node, returning.") % endp.block());
result.push_back(endp);
return result;
}
@@ -529,9 +524,9 @@ endpoint_vector_t hier_block2_detail::resolve_endpoint(const endpoint& endp,
// Check if endpoint is a hierarchical block
hier_block2_sptr hier_block2(cast_to_hier_block2_sptr(endp.block()));
if (hier_block2) {
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "Resolving endpoint " << endp << " as an "
- << (is_input ? "input" : "output") << ", recursing" << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("Resolving endpoint %s as an %s, recursing") % endp %
+ (is_input ? "input" : "output"));
return hier_block2->d_detail->resolve_port(endp.port(), is_input);
}
@@ -542,9 +537,10 @@ endpoint_vector_t hier_block2_detail::resolve_endpoint(const endpoint& endp,
void hier_block2_detail::flatten_aux(flat_flowgraph_sptr sfg) const
{
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << " ** Flattening " << d_owner->name()
- << " parent: " << d_parent_detail << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format(" ** Flattening %s parent: %s") % d_owner->name() %
+ d_parent_detail);
+ ;
bool is_top_block = (d_parent_detail == NULL);
// Add my edges to the flow graph, resolving references to actual endpoints
@@ -563,15 +559,13 @@ void hier_block2_detail::flatten_aux(flat_flowgraph_sptr sfg) const
bool set_all_max_buff = d_owner->all_max_output_buffer_p();
// Get the min and max buffer length
if (set_all_min_buff) {
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "Getting (" << (d_owner->alias()).c_str() << ") min buffer"
- << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("Getting (%s) min buffer") % d_owner->alias());
min_buff = d_owner->min_output_buffer();
}
if (set_all_max_buff) {
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "Getting (" << (d_owner->alias()).c_str() << ") max buffer"
- << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("Getting (%s) max buffer") % d_owner->alias());
max_buff = d_owner->max_output_buffer();
}
@@ -587,19 +581,18 @@ void hier_block2_detail::flatten_aux(flat_flowgraph_sptr sfg) const
block_sptr bb = std::dynamic_pointer_cast<block>(b);
if (bb != 0) {
if (bb->min_output_buffer(0) != min_buff) {
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "Block (" << (bb->alias()).c_str()
- << ") min_buff (" << min_buff << ")" << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("Block (%s) min_buff (%d)") %
+ bb->alias() % min_buff);
bb->set_min_output_buffer(min_buff);
}
} else {
hier_block2_sptr hh = std::dynamic_pointer_cast<hier_block2>(b);
if (hh != 0) {
if (hh->min_output_buffer(0) != min_buff) {
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "HBlock (" << (hh->alias()).c_str()
- << ") min_buff (" << min_buff << ")"
- << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("HBlock (%s) min_buff (%d)") %
+ hh->alias() % min_buff);
hh->set_min_output_buffer(min_buff);
}
}
@@ -612,19 +605,18 @@ void hier_block2_detail::flatten_aux(flat_flowgraph_sptr sfg) const
block_sptr bb = std::dynamic_pointer_cast<block>(b);
if (bb != 0) {
if (bb->max_output_buffer(0) != max_buff) {
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "Block (" << (bb->alias()).c_str()
- << ") max_buff (" << max_buff << ")" << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("Block (%s) max_buff (%d)") %
+ bb->alias() % max_buff);
bb->set_max_output_buffer(max_buff);
}
} else {
hier_block2_sptr hh = std::dynamic_pointer_cast<hier_block2>(b);
if (hh != 0) {
if (hh->max_output_buffer(0) != max_buff) {
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "HBlock (" << (hh->alias()).c_str()
- << ") max_buff (" << max_buff << ")"
- << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("HBlock (%s) max_buff (%d)") %
+ hh->alias() % max_buff);
hh->set_max_output_buffer(max_buff);
}
}
@@ -639,19 +631,18 @@ void hier_block2_detail::flatten_aux(flat_flowgraph_sptr sfg) const
block_sptr bb = std::dynamic_pointer_cast<block>(b);
if (bb != 0) {
if (bb->min_output_buffer(0) != min_buff) {
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "Block (" << (bb->alias()).c_str()
- << ") min_buff (" << min_buff << ")" << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("Block (%s) min_buff (%d)") %
+ bb->alias() % min_buff);
bb->set_min_output_buffer(min_buff);
}
} else {
hier_block2_sptr hh = std::dynamic_pointer_cast<hier_block2>(b);
if (hh != 0) {
if (hh->min_output_buffer(0) != min_buff) {
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "HBlock (" << (hh->alias()).c_str()
- << ") min_buff (" << min_buff << ")"
- << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("HBlock (%s) min_buff (%d)") %
+ hh->alias() % min_buff);
hh->set_min_output_buffer(min_buff);
}
}
@@ -664,19 +655,21 @@ void hier_block2_detail::flatten_aux(flat_flowgraph_sptr sfg) const
block_sptr bb = std::dynamic_pointer_cast<block>(b);
if (bb != 0) {
if (bb->max_output_buffer(0) != max_buff) {
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "Block (" << (bb->alias()).c_str()
- << ") max_buff (" << max_buff << ")" << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("Block (%s) max_buff (%d)") %
+ bb->alias() % max_buff);
bb->set_max_output_buffer(max_buff);
}
} else {
hier_block2_sptr hh = std::dynamic_pointer_cast<hier_block2>(b);
if (hh != 0) {
if (hh->max_output_buffer(0) != max_buff) {
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "HBlock (" << (hh->alias()).c_str()
- << ") max_buff (" << max_buff << ")"
- << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("HBlock (%s) max_buff (%d)") %
+ hh->alias() % max_buff);
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("HBlock (%s) max_buff (%d)") %
+ hh->alias() % max_buff);
hh->set_max_output_buffer(max_buff);
}
}
@@ -685,12 +678,10 @@ void hier_block2_detail::flatten_aux(flat_flowgraph_sptr sfg) const
}
}
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "Flattening stream connections: " << std::endl;
+ GR_LOG_DEBUG(d_debug_logger, "Flattening stream connections: ");
for (p = edges.begin(); p != edges.end(); p++) {
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "Flattening edge " << (*p) << std::endl;
+ GR_LOG_DEBUG(d_debug_logger, boost::format("Flattening edge %s") % *p);
endpoint_vector_t src_endps = resolve_endpoint(p->src(), false);
endpoint_vector_t dst_endps = resolve_endpoint(p->dst(), true);
@@ -698,43 +689,40 @@ void hier_block2_detail::flatten_aux(flat_flowgraph_sptr sfg) const
endpoint_viter_t s, d;
for (s = src_endps.begin(); s != src_endps.end(); s++) {
for (d = dst_endps.begin(); d != dst_endps.end(); d++) {
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << (*s) << "->" << (*d) << std::endl;
+ GR_LOG_DEBUG(d_debug_logger, boost::format(" %s -> %s") % *s % *d);
sfg->connect(*s, *d);
}
}
}
// loop through flattening hierarchical connections
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "Flattening msg connections: " << std::endl;
+ GR_LOG_DEBUG(d_debug_logger, "Flattening msg connections: ");
std::vector<std::pair<msg_endpoint, bool>> resolved_endpoints;
for (q = msg_edges.begin(); q != msg_edges.end(); q++) {
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << boost::format(
- " flattening edge ( %s, %s, %d) -> ( %s, %s, %d)\n") %
- q->src().block() % q->src().port() % q->src().is_hier() %
- q->dst().block() % q->dst().port() % q->dst().is_hier();
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format(" flattening edge ( %s, %s, %d) -> ( %s, %s, %d)") %
+ q->src().block() % q->src().port() % q->src().is_hier() %
+ q->dst().block() % q->dst().port() % q->dst().is_hier());
if (q->src().is_hier() && q->src().block().get() == d_owner) {
// connection into this block ..
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "hier incoming port: " << q->src() << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("hier incoming port: %s") % q->src());
sfg->replace_endpoint(q->src(), q->dst(), false);
resolved_endpoints.push_back(std::pair<msg_endpoint, bool>(q->src(), false));
} else if (q->dst().is_hier() && q->dst().block().get() == d_owner) {
// connection out of this block
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "hier outgoing port: " << q->dst() << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("hier outgoing port: %s") % q->dst());
sfg->replace_endpoint(q->dst(), q->src(), true);
resolved_endpoints.push_back(std::pair<msg_endpoint, bool>(q->dst(), true));
} else {
// internal connection only
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "internal msg connection: " << q->src() << "-->" << q->dst()
- << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("internal msg connection: %s --> %s") % q->src() %
+ q->dst());
sfg->connect(q->src(), q->dst());
}
}
@@ -743,9 +731,9 @@ void hier_block2_detail::flatten_aux(flat_flowgraph_sptr sfg) const
resolved_endpoints.begin();
it != resolved_endpoints.end();
it++) {
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "sfg->clear_endpoint(" << (*it).first << ", " << (*it).second
- << ") " << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("sfg->clear_endpoint(%s, %s)") % it->first %
+ it->second);
sfg->clear_endpoint((*it).first, (*it).second);
}
@@ -799,19 +787,18 @@ void hier_block2_detail::flatten_aux(flat_flowgraph_sptr sfg) const
block_sptr bb = std::dynamic_pointer_cast<block>(blk);
if (bb != 0) {
int bb_src_port = d_outputs[i].port();
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "Block (" << (bb->alias()).c_str() << ") Port ("
- << bb_src_port << ") min_buff (" << min_buff << ")"
- << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("Block (%s) Port (%d) min_buff (d)") %
+ bb->alias() % bb_src_port % min_buff);
bb->set_min_output_buffer(bb_src_port, min_buff);
} else {
hier_block2_sptr hh = std::dynamic_pointer_cast<hier_block2>(blk);
if (hh != 0) {
int hh_src_port = d_outputs[i].port();
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "HBlock (" << (hh->alias()).c_str() << ") Port ("
- << hh_src_port << ") min_buff (" << min_buff << ")"
- << std::endl;
+ GR_LOG_DEBUG(
+ d_debug_logger,
+ boost::format("HBlock (%s) Port (%d) min_buff (%d)") %
+ hh->alias() % hh_src_port % min_buff);
hh->set_min_output_buffer(hh_src_port, min_buff);
}
}
@@ -823,19 +810,18 @@ void hier_block2_detail::flatten_aux(flat_flowgraph_sptr sfg) const
block_sptr bb = std::dynamic_pointer_cast<block>(blk);
if (bb != 0) {
int bb_src_port = d_outputs[i].port();
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "Block (" << (bb->alias()).c_str() << ") Port ("
- << bb_src_port << ") max_buff (" << max_buff << ")"
- << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("Block (%s) Port (%d) max_buff (%d)") %
+ bb->alias() % bb_src_port % max_buff);
bb->set_max_output_buffer(bb_src_port, max_buff);
} else {
hier_block2_sptr hh = std::dynamic_pointer_cast<hier_block2>(blk);
if (hh != 0) {
int hh_src_port = d_outputs[i].port();
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "HBlock (" << (hh->alias()).c_str() << ") Port ("
- << hh_src_port << ") max_buff (" << max_buff << ")"
- << std::endl;
+ GR_LOG_DEBUG(
+ d_debug_logger,
+ boost::format("HBlock (%s) Port (%d) max_buff (%d)") %
+ hh->alias() % hh_src_port % max_buff);
hh->set_max_output_buffer(hh_src_port, max_buff);
}
}
@@ -852,9 +838,10 @@ void hier_block2_detail::flatten_aux(flat_flowgraph_sptr sfg) const
for (basic_block_viter_t p = blocks.begin(); p != blocks.end(); p++) {
hier_block2_sptr hier_block2(cast_to_hier_block2_sptr(*p));
if (hier_block2 && (hier_block2.get() != d_owner)) {
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "flatten_aux: recursing into hierarchical block "
- << hier_block2->alias() << std::endl;
+ GR_LOG_DEBUG(
+ d_debug_logger,
+ boost::format("flatten_aux: recursing into hierarchical block %s") %
+ hier_block2->alias());
hier_block2->d_detail->flatten_aux(sfg);
}
}
@@ -867,9 +854,9 @@ void hier_block2_detail::flatten_aux(flat_flowgraph_sptr sfg) const
}
// print all primitive connections at exit
- if (HIER_BLOCK2_DETAIL_DEBUG && is_top_block) {
- std::cout << "flatten_aux finished in top_block" << std::endl;
- sfg->dump();
+ if (is_top_block) {
+ GR_LOG_DEBUG(d_debug_logger, "flatten_aux finished in top_block");
+ // sfg->dump();
}
// if ctrlport is enabled, call setup RPC for all blocks in the flowgraph
@@ -885,8 +872,7 @@ void hier_block2_detail::flatten_aux(flat_flowgraph_sptr sfg) const
void hier_block2_detail::lock()
{
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "lock: entered in " << this << std::endl;
+ GR_LOG_DEBUG(d_debug_logger, boost::format("lock: entered in %s") % this);
if (d_parent_detail)
d_parent_detail->lock();
@@ -896,8 +882,7 @@ void hier_block2_detail::lock()
void hier_block2_detail::unlock()
{
- if (HIER_BLOCK2_DETAIL_DEBUG)
- std::cout << "unlock: entered in " << this << std::endl;
+ GR_LOG_DEBUG(d_debug_logger, boost::format("unlock: entered in %s") % this);
if (d_parent_detail)
d_parent_detail->unlock();
diff --git a/gnuradio-runtime/lib/hier_block2_detail.h b/gnuradio-runtime/lib/hier_block2_detail.h
index 35da1f922d..15a45e0091 100644
--- a/gnuradio-runtime/lib/hier_block2_detail.h
+++ b/gnuradio-runtime/lib/hier_block2_detail.h
@@ -13,6 +13,7 @@
#include <gnuradio/api.h>
#include <gnuradio/hier_block2.h>
+#include <gnuradio/logger.h>
#include <flat_flowgraph.h>
#include <boost/core/noncopyable.hpp>
@@ -65,6 +66,9 @@ private:
endpoint_vector_t d_outputs; // Single internal endpoint per external output
basic_block_vector_t d_blocks;
+ gr::logger_ptr d_logger;
+ gr::logger_ptr d_debug_logger;
+
void refresh_io_signature();
void connect_input(int my_port, int port, basic_block_sptr block);
void connect_output(int my_port, int port, basic_block_sptr block);
diff --git a/gnuradio-runtime/lib/logger.cc b/gnuradio-runtime/lib/logger.cc
index 3e9b313de7..4721571119 100644
--- a/gnuradio-runtime/lib/logger.cc
+++ b/gnuradio-runtime/lib/logger.cc
@@ -83,7 +83,7 @@ void logger_config::watch_file(std::string filename, unsigned int watch_period)
boost::this_thread::sleep(
boost::posix_time::time_duration(0, 0, watch_period, 0));
} catch (const boost::thread_interrupted&) {
- std::cout << "GNURadio leaving logger config file watch." << std::endl;
+ std::cerr << "GNURadio leaving logger config file watch." << std::endl;
break;
}
}
diff --git a/gnuradio-runtime/python/gnuradio/gr/bindings/flowgraph_python.cc b/gnuradio-runtime/python/gnuradio/gr/bindings/flowgraph_python.cc
index e42d5e9ea0..ae4c852a01 100644
--- a/gnuradio-runtime/python/gnuradio/gr/bindings/flowgraph_python.cc
+++ b/gnuradio-runtime/python/gnuradio/gr/bindings/flowgraph_python.cc
@@ -14,7 +14,7 @@
/* BINDTOOL_GEN_AUTOMATIC(0) */
/* BINDTOOL_USE_PYGCCXML(0) */
/* BINDTOOL_HEADER_FILE(flowgraph.h) */
-/* BINDTOOL_HEADER_FILE_HASH(53d5d6556e06c6423bdcb73f499fa305) */
+/* BINDTOOL_HEADER_FILE_HASH(49416214d3bddf2a0086e40d7933a855) */
/***********************************************************************************/
#include <pybind11/complex.h>
diff --git a/gr-audio/lib/alsa/alsa_impl.cc b/gr-audio/lib/alsa/alsa_impl.cc
index 5099fe7149..73ff0c0378 100644
--- a/gr-audio/lib/alsa/alsa_impl.cc
+++ b/gr-audio/lib/alsa/alsa_impl.cc
@@ -157,12 +157,10 @@ bool gri_alsa_pick_acceptable_format(snd_pcm_t* pcm,
error_msg_tag % snd_pcm_name(pcm) % snd_strerror(err));
return false;
}
- if (verbose)
- fprintf(stdout,
- "%s[%s]: using %s",
- error_msg_tag,
- snd_pcm_name(pcm),
- snd_pcm_format_name(acceptable_formats[i]));
+ GR_LOG_INFO(debug_logger,
+ boost::format("%s[%s]: using %s") % error_msg_tag %
+ snd_pcm_name(pcm) %
+ snd_pcm_format_name(acceptable_formats[i]));
*selected_format = acceptable_formats[i];
return true;
}
diff --git a/gr-audio/lib/osx/osx_source.cc b/gr-audio/lib/osx/osx_source.cc
index 468d65e8f3..94048a7ca5 100644
--- a/gr-audio/lib/osx/osx_source.cc
+++ b/gr-audio/lib/osx/osx_source.cc
@@ -221,7 +221,8 @@ void osx_source::setup()
(d_output_sample_rate < 50000.0 ? 50000 : (UInt32)d_output_sample_rate);
#if _OSX_AU_DEBUG_
- std::cerr << "source(): max # samples = " << d_buffer_sample_count << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("source(): max # samples = %d") % d_buffer_sample_count);
#endif
// create the default AudioUnit for input
@@ -331,10 +332,9 @@ void osx_source::setup()
err, "Get Device Input Stream Format (before) failed", "audio_osx_source::setup");
#if _OSX_AU_DEBUG_
- std::cerr << std::endl
- << "---- Device Stream Format (before) ----" << std::endl
- << d_asbd_device << std::endl
- << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("\n---- Device Stream Format (before) ----\n%s\n") %
+ d_asbd_device);
#endif
// try to set the device (input) side of the audio device to the
@@ -365,10 +365,9 @@ void osx_source::setup()
err, "Get Device Input Stream Format (after) failed", "audio_osx_source::setup");
#if _OSX_AU_DEBUG_
- std::cerr << std::endl
- << "---- Device Stream Format (after) ----" << std::endl
- << d_asbd_device << std::endl
- << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("\n---- Device Stream Format (after) ----\n%s\n") %
+ d_asbd_device);
#endif
d_device_sample_rate = d_asbd_device.mSampleRate;
@@ -388,9 +387,9 @@ void osx_source::setup()
"audio_osx_source::setup");
#if _OSX_AU_DEBUG_
- std::cerr << "---- Client Stream Format (Before) ----" << std::endl
- << d_asbd_client << std::endl
- << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("---- Client Stream Format (Before) ----\n%s\n") %
+ d_asbd_client);
#endif
// Set the format of all the AUs to the
@@ -437,9 +436,9 @@ void osx_source::setup()
err, "Get Device Output Stream Format (after) failed", "audio_osx_source::setup");
#if _OSX_AU_DEBUG_
- std::cerr << "---- Client Stream Format (After) ----" << std::endl
- << d_asbd_client << std::endl
- << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("---- Client Stream Format (After) ----\n%s\n") %
+ d_asbd_client);
#endif
d_pass_through = (d_asbd_client.mSampleRate == d_output_sample_rate);
@@ -646,26 +645,27 @@ void osx_source::setup()
check_error_and_throw(err, "AudioUnitInitialize", "audio_osx_source::check_channels");
#if _OSX_AU_DEBUG_
- std::cerr << std::endl
- << "audio_osx_source Parameters:" << std::endl
- << " Device Sample Rate is " << d_device_sample_rate << std::endl
- << " Client Sample Rate is "
- << (d_pass_through ? d_output_sample_rate : d_device_sample_rate)
- << std::endl
- << " User Sample Rate is " << d_output_sample_rate << std::endl
- << " Do Passthrough is " << (d_pass_through ? "true" : "false")
- << std::endl
- << " Max Sample Count is " << d_buffer_sample_count << std::endl
- << " # Device Channels is " << d_n_dev_channels << std::endl
- << " Device Buffer Size in Frames = " << d_device_buffer_size_frames
- << std::endl
- << " Lead Size in Frames = " << d_lead_size_frames << std::endl
- << " Trail Size in Frames = " << d_trail_size_frames << std::endl
- << " Input Buffer Size in Frames = " << d_input_buffer_size_frames
- << std::endl
- << " Output Buffer Size in Frames = " << d_output_buffer_size_frames
- << std::endl
- << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format(R"EOF(
+audio_osx_source Parameters:
+ Device Sample Rate is %d
+ Client Sample Rate is %d
+ User Sample Rate is %d
+ Do Passthrough is %s
+ Max Sample Count is %d
+ # Device Channels is %d
+ Device Buffer Size in Frames = %d
+ Lead Size in Frames = %d
+ Trail Size in Frames = %d
+ Input Buffer Size in Frames = %d
+ Output Buffer Size in Frames = %d
+)EOF") % d_device_sample_rate %
+ (d_pass_through ? d_output_sample_rate : d_device_sample_rate) %
+ d_output_sample_rate % (d_pass_through ? "true" : "false") %
+ d_buffer_sample_count % d_n_dev_channels %
+ d_device_buffer_size_frames % d_lead_size_frames %
+ d_trail_size_frames % d_input_buffer_size_frames %
+ d_output_buffer_size_frames);
#endif
}
@@ -682,8 +682,9 @@ void osx_source::alloc_audio_buffer_list(AudioBufferList** t_abl,
int counter = n_channels;
#if _OSX_AU_DEBUG_
- std::cerr << "alloc_audio_buffer_list: (#chan, #bytes) == (" << n_channels << ", "
- << input_buffer_size_bytes << ")" << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("alloc_audio_buffer_list: (#chan, #bytes) == (%d, %d)") %
+ n_channels % input_buffer_size_bytes);
#endif
while (--counter >= 0) {
@@ -731,15 +732,17 @@ bool osx_source::is_running()
bool osx_source::start()
{
#if _OSX_AU_DEBUG_
- std::cerr << ((void*)(pthread_self())) << " : audio_osx_source::start: Starting."
- << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("%s : audio_osx_source::start: Starting.") %
+ ((void*)(pthread_self())));
#endif
if ((!is_running()) && d_input_au) {
#if _OSX_AU_DEBUG_
- std::cerr << ((void*)(pthread_self()))
- << " : audio_osx_source::start: Starting Audio Unit." << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("%s : audio_osx_source::start: Starting Audio Unit.") %
+ ((void*)(pthread_self())));
#endif
// reset buffers before starting
@@ -760,8 +763,10 @@ bool osx_source::start()
}
#if _OSX_AU_DEBUG_
- std::cerr << ((void*)(pthread_self())) << " : audio_osx_source::start: Returning."
- << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("%s : audio_osx_source::start: Returning.") %
+ (void*)(pthread_self()));
+
#endif
return (true);
@@ -770,14 +775,16 @@ bool osx_source::start()
bool osx_source::stop()
{
#if _OSX_AU_DEBUG_
- std::cerr << ((void*)(pthread_self())) << " : audio_osx_source::stop: Starting."
- << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("%s : audio_osx_source::stop: Starting.") %
+ ((void*)(pthread_self())));
#endif
if (is_running()) {
#if _OSX_AU_DEBUG_
- std::cerr << ((void*)(pthread_self()))
- << " : audio_osx_source::stop: stopping audio unit." << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("%s : audio_osx_source::stop: stopping audio unit.") %
+ ((void*)(pthread_self())));
#endif
// stop the audio unit
@@ -793,8 +800,9 @@ bool osx_source::stop()
}
#if _OSX_AU_DEBUG_
- std::cerr << ((void*)(pthread_self())) << " : audio_osx_source::stop: Returning."
- << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("%s : audio_osx_source::stop: Returning.") %
+ ((void*)(pthread_self())));
#endif
return (true);
@@ -803,8 +811,9 @@ bool osx_source::stop()
void osx_source::teardown()
{
#if _OSX_AU_DEBUG_
- std::cerr << ((void*)(pthread_self())) << " : audio_osx_source::teardown: Starting."
- << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("%s : audio_osx_source::teardown: Starting.") %
+ ((void*)(pthread_self())));
#endif
OSStatus err = noErr;
@@ -928,8 +937,9 @@ void osx_source::teardown()
d_using_default_device = false;
#if _OSX_AU_DEBUG_
- std::cerr << ((void*)(pthread_self())) << " : audio_osx_source::teardown: Returning."
- << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("%s : audio_osx_source::teardown: Returning.") %
+ ((void*)(pthread_self())));
#endif
}
@@ -961,7 +971,9 @@ bool osx_source::check_topology(int ninputs, int noutputs)
d_n_user_channels = noutputs;
#if _OSX_AU_DEBUG_
- std::cerr << "chk_topo: Actual # user output channels = " << noutputs << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("chk_topo: Actual # user output channels = %d") %
+ noutputs);
#endif
return (true);
@@ -972,8 +984,9 @@ int osx_source::work(int noutput_items,
gr_vector_void_star& output_items)
{
#if _OSX_AU_DEBUG_RENDER_
- std::cerr << ((void*)(pthread_self())) << " : audio_osx_source::work: Starting."
- << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("%s : audio_osx_source::work: Starting.") %
+ ((void*)(pthread_self())));
#endif
if (d_do_reset) {
if (d_hardware_changed) {
@@ -1000,13 +1013,13 @@ int osx_source::work(int noutput_items,
} else {
#if _OSX_AU_DEBUG_RENDER_
- std::cerr << "audio_osx_source::work: doing reset." << std::endl;
+ GR_LOG_DEBUG(d_debug_logger, "audio_osx_source::work: doing reset.");
#endif
GR_LOG_WARN(d_logger,
- boost::format("\n\nThe default input audio device has "
- "changed; resetting audio.\nThere may "
- "be a sound glitch while resetting.\n"));
+ "\n\nThe default input audio device has "
+ "changed; resetting audio.\nThere may "
+ "be a sound glitch while resetting.\n");
// for any changes, just tear down the current
// configuration, then set it up again using the user's
@@ -1017,14 +1030,15 @@ int osx_source::work(int noutput_items,
gr::thread::scoped_lock l(d_internal);
#if _OSX_AU_DEBUG_RENDER_
- std::cerr << "audio_osx_source::work: mutex locked." << std::endl;
+ GR_LOG_DEBUG(d_debug_logger, "audio_osx_source::work: mutex locked.");
#endif
setup();
start();
#if _OSX_AU_DEBUG_RENDER_
- std::cerr << "audio_osx_source::work: returning after reset." << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ "audio_osx_source::work: returning after reset.");
#endif
return (0);
}
@@ -1033,12 +1047,11 @@ int osx_source::work(int noutput_items,
gr::thread::scoped_lock l(d_internal);
#if _OSX_AU_DEBUG_RENDER_
- std::cerr << "audio_osx_source::work: mutex locked." << std::endl;
-#endif
+ GR_LOG_DEBUG(d_debug_logger, "audio_osx_source::work: mutex locked.");
-#if _OSX_AU_DEBUG_RENDER_
- std::cerr << "work1: SC = " << d_queue_sample_count << ", #OI = " << noutput_items
- << ", #Chan = " << output_items.size() << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("work1: SC=%d, #OI=%d, #Chan=%d") % d_queue_sample_count %
+ noutput_items % output_items.size());
#endif
// set the actual # of output items to the 'desired' amount then
@@ -1058,13 +1071,13 @@ int osx_source::work(int noutput_items,
// release control so-as to allow data to be retrieved;
// block until there is data to return
#if _OSX_AU_DEBUG_RENDER_
- std::cerr << "audio_osx_source::work: waiting." << std::endl;
+ GR_LOG_DEBUG(d_debug_logger, "audio_osx_source::work: waiting.");
#endif
d_waiting_for_data = true;
d_cond_data.wait(l);
d_waiting_for_data = false;
#if _OSX_AU_DEBUG_RENDER_
- std::cerr << "audio_osx_source::work: done waiting." << std::endl;
+ GR_LOG_DEBUG(d_debug_logger, "audio_osx_source::work: done waiting.");
#endif
// the condition's 'notify' was called; acquire control to
// keep thread safe
@@ -1073,9 +1086,8 @@ int osx_source::work(int noutput_items,
// up the next time this method is called.
if (d_do_reset) {
#if _OSX_AU_DEBUG_RENDER_
- std::cerr << "audio_osx_source::work: "
- "returning for reset."
- << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ "audio_osx_source::work: returning for reset.");
#endif
return (0);
}
@@ -1083,9 +1095,9 @@ int osx_source::work(int noutput_items,
} else {
// no data & not blocking; return nothing
#if _OSX_AU_DEBUG_RENDER_
- std::cerr << "audio_osx_source::work: no data "
- "& not blocking; returning 0."
- << std::endl;
+ GR_LOG_DEBUG(
+ d_debug_logger,
+ "audio_osx_source::work: no data & not blocking; returning 0.");
#endif
return (0);
}
@@ -1096,8 +1108,9 @@ int osx_source::work(int noutput_items,
}
#if _OSX_AU_DEBUG_RENDER_
- std::cerr << "audio_osx_source::work: copying " << actual_noutput_items
- << " items per channel" << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("audio_osx_source::work: copying %d items per channel") %
+ actual_noutput_items);
#endif
// number of channels
@@ -1128,12 +1141,12 @@ int osx_source::work(int noutput_items,
d_queue_sample_count -= actual_noutput_items;
#if _OSX_AU_DEBUG_RENDER_
- std::cerr << "work2: SC = " << d_queue_sample_count
- << ", act#OI = " << actual_noutput_items << std::endl
- << "Returning." << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("work2: SC = %d, act#OI = %d\nReturning.") %
+ d_queue_sample_count % actual_noutput_items);
#endif
#if _OSX_AU_DEBUG_RENDER_
- std::cerr << "audio_osx_source::work: returning." << std::endl;
+ GR_LOG_DEBUG(d_debug_logger, "audio_osx_source::work: returning.");
#endif
return (actual_noutput_items);
@@ -1158,9 +1171,9 @@ OSStatus osx_source::converter_callback(AudioConverterRef in_audio_converter,
This->d_n_actual_input_frames = (*io_number_data_packets);
#if _OSX_AU_DEBUG_RENDER_
- std::cerr << "cc1: io#DP = " << (*io_number_data_packets)
- << ", TIBSB = " << total_input_buffer_size_bytes << ", #C = " << counter
- << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("cc1: io#DP = %d, TIBSB = %d, #C = %d") %
+ (*io_number_data_packets) % total_input_buffer_size_bytes % counter);
#endif
while (--counter >= 0) {
@@ -1171,7 +1184,7 @@ OSStatus osx_source::converter_callback(AudioConverterRef in_audio_converter,
}
#if _OSX_AU_DEBUG_RENDER_
- std::cerr << "cc2: Returning." << std::endl;
+ GR_LOG_DEBUG(d_debug_logger, "cc2: Returning.");
#endif
return (noErr);
@@ -1185,26 +1198,30 @@ OSStatus osx_source::au_input_callback(void* in_ref_con,
AudioBufferList* io_data)
{
#if _OSX_AU_DEBUG_RENDER_
- std::cerr << ((void*)(pthread_self()))
- << " : audio_osx_source::au_input_callback: Starting." << std::endl;
+ // GR_LOG_DEBUG(This->d_debug_logger, boost::format("%s :
+ // audio_osx_source::au_input_callback: Starting." )
+ // % ((void*)(pthread_self())));
#endif
osx_source* This = reinterpret_cast<osx_source*>(in_ref_con);
gr::thread::scoped_lock l(This->d_internal);
gr::logger_ptr d_logger = This->d_logger;
+ gr::logger_ptr d_debug_logger = This->d_debug_logger;
#if _OSX_AU_DEBUG_RENDER_
- std::cerr << "audio_osx_source::au_input_callback: mutex locked." << std::endl;
+ GR_LOG_DEBUG(d_debug_logger, "audio_osx_source::au_input_callback: mutex locked.");
#endif
OSStatus err = noErr;
#if _OSX_AU_DEBUG_RENDER_
- std::cerr << "cb0: in#Fr = " << in_number_frames << ", inBus# = " << in_bus_number
- << ", idD = " << ((void*)io_data)
- << ", d_ib = " << ((void*)(This->d_input_buffer))
- << ", d_ib#c = " << This->d_input_buffer->mNumberBuffers
- << ", SC = " << This->d_queue_sample_count << std::endl;
+ GR_LOG_DEBUG(
+ d_debug_logger,
+ boost::format(
+ "cb0: in#Fr = %d, inBus# = %d, idD = %d, d_ib = %d, d_ib#c = %d, SC = %d") %
+ in_number_frames % in_bus_number % ((void*)io_data) %
+ ((void*)(This->d_input_buffer)) % This->d_input_buffer->mNumberBuffers %
+ This->d_queue_sample_count);
#endif
if (This->d_do_reset) {
@@ -1279,8 +1296,9 @@ OSStatus osx_source::au_input_callback(void* in_ref_con,
#endif
#if _OSX_AU_DEBUG_RENDER_
- std::cerr << "cb1: avail: #IF = " << available_input_frames
- << ", #OF = " << available_output_frames << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("cb1: avail: #IF = %d, #OF = %d") %
+ available_input_frames % available_output_frames);
#endif
actual_output_frames = available_output_frames;
@@ -1303,11 +1321,14 @@ OSStatus osx_source::au_input_callback(void* in_ref_con,
// output frames
#if _OSX_AU_DEBUG_RENDER_
- std::cerr << "cb2: actual: #IF = " << This->d_n_actual_input_frames
- << ", #OF = " << actual_output_frames << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("cb2: actual: #IF = %d, #OF = %d") %
+ This->d_n_actual_input_frames % actual_output_frames);
+
if (This->d_n_actual_input_frames != available_input_frames)
- std::cerr << "cb2.1: avail#IF = " << available_input_frames
- << ", actual#IF = " << This->d_n_actual_input_frames << std::endl;
+ GR_LOG_WARN(d_debug_logger,
+ boost::format("cb2.1: (avail#IF = %d) != (actual#IF = %d)") %
+ available_input_frames % This->d_n_actual_input_frames);
#endif
}
@@ -1320,7 +1341,7 @@ OSStatus osx_source::au_input_callback(void* in_ref_con,
float* in_buffer = (float*)This->d_output_buffer->mBuffers[counter].mData;
#if _OSX_AU_DEBUG_RENDER_
- std::cerr << "cb3: enqueuing audio data." << std::endl;
+ GR_LOG_DEBUG(d_debug_logger, "cb3: enqueuing audio data.");
#endif
int l_res = This->d_buffers[counter]->enqueue(in_buffer, actual_output_frames);
@@ -1341,9 +1362,10 @@ OSStatus osx_source::au_input_callback(void* in_ref_con,
}
#if _OSX_AU_DEBUG_RENDER_
- std::cerr << "cb4: #OI = " << actual_output_frames
- << ", #Cnt = " << This->d_queue_sample_count
- << ", mSC = " << This->d_buffer_sample_count << std::endl;
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("cb4: #OI = %d, #Cnt = %d, mSC = %d") %
+ actual_output_frames % This->d_queue_sample_count %
+ This->d_buffer_sample_count);
#endif
// signal that data is available, if appropriate
@@ -1353,7 +1375,7 @@ OSStatus osx_source::au_input_callback(void* in_ref_con,
}
#if _OSX_AU_DEBUG_RENDER_
- std::cerr << "cb5: returning." << std::endl;
+ GR_LOG_DEBUG(d_debug_logger, "cb5: returning.");
#endif
return (err);
diff --git a/gr-blocks/lib/check_lfsr_32k_s_impl.cc b/gr-blocks/lib/check_lfsr_32k_s_impl.cc
index 443b01ce70..48c8493d97 100644
--- a/gr-blocks/lib/check_lfsr_32k_s_impl.cc
+++ b/gr-blocks/lib/check_lfsr_32k_s_impl.cc
@@ -17,6 +17,8 @@
#include <cstdio>
#include <cstdlib>
+static constexpr bool CHECK_LFSR_DEBUG = false;
+
namespace gr {
namespace blocks {
@@ -112,11 +114,11 @@ void check_lfsr_32k_s_impl::enter_SEARCHING()
d_runlength = 0;
d_index = 0; // reset LFSR to beginning
- if (0)
- fprintf(stdout,
- "check_lfsr_32k: enter_SEARCHING at offset %8ld (0x%08lx)\n",
- d_ntotal,
- d_ntotal);
+ if (CHECK_LFSR_DEBUG)
+ GR_LOG_DEBUG(
+ d_debug_logger,
+ boost::format("check_lfsr_32k: enter_SEARCHING at offset %8ld (0x%08lx)") %
+ d_ntotal % d_ntotal);
enter_MATCH0();
}
@@ -136,25 +138,21 @@ void check_lfsr_32k_s_impl::enter_LOCKED()
d_index = 3; // already matched first 3 items
- if (0)
- fprintf(stdout,
- "check_lfsr_32k: enter_LOCKED at offset %8ld (0x%08lx)\n",
- d_ntotal,
- d_ntotal);
+ if (CHECK_LFSR_DEBUG)
+ GR_LOG_DEBUG(
+ d_debug_logger,
+ boost::format("check_lfsr_32k: enter_LOCKED at offset %8ld (0x%08lx)") %
+ d_ntotal % d_ntotal);
}
void check_lfsr_32k_s_impl::log_error(unsigned short expected, unsigned short actual)
{
- if (0)
- fprintf(stdout,
- "check_lfsr_32k: expected %5d (0x%04x) got %5d (0x%04x) offset %8ld "
- "(0x%08lx)\n",
- expected,
- expected,
- actual,
- actual,
- d_ntotal,
- d_ntotal);
+ if (CHECK_LFSR_DEBUG)
+ GR_LOG_DEBUG(
+ d_debug_logger,
+ boost::format("check_lfsr_32k: expected %5d (0x%04x) got %5d (0x%04x) "
+ "offset %8ld (0x%08lx)") %
+ expected % expected % actual % actual % d_ntotal % d_ntotal);
}
} /* namespace blocks */
diff --git a/gr-blocks/lib/qa_block_tags.cc b/gr-blocks/lib/qa_block_tags.cc
index 091eb3c65c..65f4c9a070 100644
--- a/gr-blocks/lib/qa_block_tags.cc
+++ b/gr-blocks/lib/qa_block_tags.cc
@@ -19,11 +19,12 @@
#include <gnuradio/blocks/keep_one_in_n.h>
#include <gnuradio/blocks/null_sink.h>
#include <gnuradio/blocks/null_source.h>
+#include <gnuradio/logger.h>
#include <gnuradio/top_block.h>
+
+#include <boost/format.hpp>
#include <boost/test/unit_test.hpp>
-// FIXME use logging
-#include <iostream>
// ----------------------------------------------------------------
@@ -113,6 +114,8 @@ BOOST_AUTO_TEST_CASE(t1)
BOOST_REQUIRE_EQUAL(tags4.size(), (size_t)8);
#if QA_TAGS_DEBUG
+ GR_LOG_GET_CONFIGURED_LOGGER(logger, "qa_block_tags::t1");
+
// Kludge together the tags that we know should result from the above graph
std::stringstream str0, str1, str2;
str0 << ann0->name() << ann0->unique_id();
@@ -139,20 +142,20 @@ BOOST_AUTO_TEST_CASE(t1)
expected_tags4[6] = make_tag(30000, pmt::mp(str2.str()), pmt::mp("seq"), pmt::mp(3));
expected_tags4[7] = make_tag(30000, pmt::mp(str0.str()), pmt::mp("seq"), pmt::mp(7));
- std::cout << std::endl << "qa_block_tags::t1" << std::endl;
-
// For annotator 3, we know it gets tags from ann0 and ann1, test this
for (size_t i = 0; i < tags3.size(); i++) {
- std::cout << "tags3[" << i << "] = " << tags3[i] << "\t\t" << expected_tags3[i]
- << std::endl;
+ GR_LOG_INFO(logger,
+ boost::format("tags3[%d] = %s\t\t%s") % i % tags3[i] %
+ expected_tags3[i]);
BOOST_REQUIRE_EQUAL(tags3[i], expected_tags3[i]);
}
// For annotator 4, we know it gets tags from ann0 and ann2, test this
- std::cout << std::endl;
+ GR_LOG_INFO(logger, "");
for (size_t i = 0; i < tags4.size(); i++) {
- std::cout << "tags4[" << i << "] = " << tags4[i] << "\t\t" << expected_tags4[i]
- << std::endl;
+ GR_LOG_INFO(logger,
+ boost::format("tags4[%d] = %s\t\t%s") % i % tags4[i] %
+ expected_tags4);
BOOST_REQUIRE_EQUAL(tags4[i], expected_tags4[i]);
}
#endif
@@ -210,6 +213,8 @@ BOOST_AUTO_TEST_CASE(t2)
#if QA_TAGS_DEBUG
+ GR_LOG_GET_CONFIGURED_LOGGER(logger, "qa_block_tags::t2");
+
// Kludge together the tags that we know should result from the above graph
std::stringstream str0, str1;
str0 << ann0->name() << ann0->unique_id();
@@ -243,22 +248,22 @@ BOOST_AUTO_TEST_CASE(t2)
expected_tags4[10] = make_tag(30000, pmt::mp(str0.str()), pmt::mp("seq"), pmt::mp(6));
expected_tags4[11] = make_tag(30000, pmt::mp(str0.str()), pmt::mp("seq"), pmt::mp(7));
- std::cout << std::endl << "qa_block_tags::t2" << std::endl;
-
// For annotator[2-4], we know it gets tags from ann0 and ann1
// but the tags from the different outputs of ann1 are different for each.
// Just testing ann2 and ann4; if they are correct it would be
// inconceivable for ann3 to have it wrong.
for (size_t i = 0; i < tags2.size(); i++) {
- std::cout << "tags2[" << i << "] = " << tags2[i] << "\t\t" << expected_tags2[i]
- << std::endl;
+ GR_LOG_INFO(logger,
+ boost::format("tags2[%d] = %s\t\t%s") % i % tags2[i] %
+ expected_tags2[i]);
BOOST_REQUIRE_EQUAL(tags2[i], expected_tags2[i]);
}
- std::cout << std::endl;
+ GR_LOG_INFO(logger, "");
for (size_t i = 0; i < tags4.size(); i++) {
- std::cout << "tags2[" << i << "] = " << tags4[i] << "\t\t" << expected_tags4[i]
- << std::endl;
+ GR_LOG_INFO(logger,
+ boost::format("tags4[%d] = %s\t\t%s") % i % tags4[i] %
+ expected_tags4[i]);
BOOST_REQUIRE_EQUAL(tags4[i], expected_tags4[i]);
}
#endif
@@ -309,6 +314,8 @@ BOOST_AUTO_TEST_CASE(t3)
BOOST_REQUIRE_EQUAL(tags4.size(), (size_t)8);
#if QA_TAGS_DEBUG
+ GR_LOG_GET_CONFIGURED_LOGGER(logger, "qa_block_tags::t3");
+
// Kludge together the tags that we know should result from the above graph
std::stringstream str0, str1, str2;
str0 << ann0->name() << ann0->unique_id();
@@ -335,20 +342,20 @@ BOOST_AUTO_TEST_CASE(t3)
expected_tags4[6] = make_tag(30000, pmt::mp(str2.str()), pmt::mp("seq"), pmt::mp(3));
expected_tags4[7] = make_tag(30000, pmt::mp(str0.str()), pmt::mp("seq"), pmt::mp(7));
- std::cout << std::endl << "qa_block_tags::t3" << std::endl;
-
// For annotator 3, we know it gets tags from ann0 and ann1, test this
for (size_t i = 0; i < tags3.size(); i++) {
- std::cout << "tags3[" << i << "] = " << tags3[i] << "\t\t" << expected_tags3[i]
- << std::endl;
+ GR_LOG_INFO(logger,
+ boost::format("tags3[%d] = %s\t\t%s") % i % tags3[i] %
+ expected_tags3[i]);
BOOST_REQUIRE_EQUAL(tags3[i], expected_tags3[i]);
}
// For annotator 4, we know it gets tags from ann0 and ann2, test this
- std::cout << std::endl;
+ GR_LOG_INFO(logger, "");
for (size_t i = 0; i < tags4.size(); i++) {
- std::cout << "tags4[" << i << "] = " << tags4[i] << "\t\t" << expected_tags4[i]
- << std::endl;
+ GR_LOG_INFO(logger,
+ boost::format("tags4[%d] = %s\t\t%s") % i % tags4[i] %
+ expected_tags4[i]);
BOOST_REQUIRE_EQUAL(tags4[i], expected_tags4[i]);
}
#endif
@@ -370,6 +377,8 @@ BOOST_AUTO_TEST_CASE(t4)
gr::block_sptr snk0(gr::blocks::null_sink::make(sizeof(int)));
gr::block_sptr snk1(gr::blocks::null_sink::make(sizeof(int)));
+ GR_LOG_GET_CONFIGURED_LOGGER(logger, "qa_block_tags::t4");
+
// using 1-to-1 tag propagation without having equal number of
// ins and outs. Make sure this works; will just exit run early.
tb->connect(src, 0, head, 0);
@@ -379,9 +388,8 @@ BOOST_AUTO_TEST_CASE(t4)
tb->connect(ann1, 0, snk0, 0);
tb->connect(ann2, 0, snk1, 0);
- std::cerr << std::endl
- << "NOTE: This is supposed to produce an error from block_executor"
- << std::endl;
+ GR_LOG_INFO(logger,
+ "NOTE: This is supposed to produce an error from block_executor!");
tb->run();
}
@@ -424,6 +432,8 @@ BOOST_AUTO_TEST_CASE(t5)
#if QA_TAGS_DEBUG
+ GR_LOG_GET_CONFIGURED_LOGGER(logger, "qa_block_tags::t5");
+
// Kludge together the tags that we know should result from the above graph
std::stringstream str0, str1, str2;
str0 << ann0->name() << ann0->unique_id();
@@ -448,22 +458,23 @@ BOOST_AUTO_TEST_CASE(t5)
expected_tags2[8] = make_tag(4000, pmt::mp(str1.str()), pmt::mp("seq"), pmt::mp(4));
expected_tags2[9] = make_tag(4000, pmt::mp(str0.str()), pmt::mp("seq"), pmt::mp(4));
- std::cout << std::endl << "qa_block_tags::t5" << std::endl;
+ GR_LOG_INFO(logger, boost::format("tags1.size(): %d") % tags1.size());
// annotator 1 gets tags from annotator 0
- std::cout << "tags1.size(): " << tags1.size() << std::endl;
for (size_t i = 0; i < tags1.size(); i++) {
- std::cout << "tags1[" << i << "] = " << tags1[i] << "\t\t" << expected_tags1[i]
- << std::endl;
+ GR_LOG_INFO(logger,
+ boost::format("tags1[%d] = %s\t\t%s") % i % tags1[i] %
+ expected_tags1[i]);
BOOST_REQUIRE_EQUAL(tags1[i], expected_tags1[i]);
}
// annotator 2 gets tags from annotators 0 and 1
- std::cout << std::endl;
- std::cout << "tags2.size(): " << tags2.size() << std::endl;
+ GR_LOG_INFO(logger, "");
+ GR_LOG_INFO(logger, boost::format("tags2.size(): %d") % tags2.size());
for (size_t i = 0; i < tags2.size(); i++) {
- std::cout << "tags2[" << i << "] = " << tags2[i] << "\t\t" << expected_tags2[i]
- << std::endl;
+ GR_LOG_INFO(logger,
+ boost::format("tags2[%d] = %s\t\t%s") % i % tags2[i] %
+ expected_tags2[i]);
BOOST_REQUIRE_EQUAL(tags2[i], expected_tags2[i]);
}
#endif
diff --git a/gr-digital/lib/constellation_receiver_cb_impl.cc b/gr-digital/lib/constellation_receiver_cb_impl.cc
index 7dfa702c87..f11de55181 100644
--- a/gr-digital/lib/constellation_receiver_cb_impl.cc
+++ b/gr-digital/lib/constellation_receiver_cb_impl.cc
@@ -18,6 +18,9 @@
#include <gnuradio/expj.h>
#include <gnuradio/io_signature.h>
#include <gnuradio/math.h>
+
+#include <boost/format.hpp>
+
#include <stdexcept>
namespace gr {
@@ -68,15 +71,12 @@ void constellation_receiver_cb_impl::phase_error_tracking(float phase_error)
frequency_limit();
#if VERBOSE_COSTAS
- printf("cl: phase_error: %f phase: %f freq: %f sample: %f+j%f constellation: "
- "%f+j%f\n",
- phase_error,
- d_phase,
- d_freq,
- sample.real(),
- sample.imag(),
- d_constellation->points()[d_current_const_point].real(),
- d_constellation->points()[d_current_const_point].imag());
+ GR_LOG_DEBUG(d_debug_logger,
+ boost::format("cl: phase_error: %f phase: %f freq: %f sample: %f+j%f "
+ " constellation: %f+j%f") %
+ phase_error % d_phase % d_freq % sample.real() % sample.imag() %
+ d_constellation->points()[d_current_const_point].real() %
+ d_constellation->points()[d_current_const_point].imag());
#endif
}
diff --git a/gr-digital/lib/fll_band_edge_cc_impl.cc b/gr-digital/lib/fll_band_edge_cc_impl.cc
index 3d69ce9d88..d974d9e500 100644
--- a/gr-digital/lib/fll_band_edge_cc_impl.cc
+++ b/gr-digital/lib/fll_band_edge_cc_impl.cc
@@ -17,6 +17,7 @@
#include <gnuradio/io_signature.h>
#include <cstdio>
#include <memory>
+#include <sstream>
namespace gr {
namespace digital {
@@ -171,17 +172,18 @@ void fll_band_edge_cc_impl::design_filter(float samps_per_sym,
void fll_band_edge_cc_impl::print_taps()
{
- printf("Upper Band-edge: [");
- for (const auto& tap : d_taps_upper) {
- printf(" %.4e + %.4ej,", tap.real(), tap.imag());
- }
- printf("]\n\n");
-
- printf("Lower Band-edge: [");
- for (const auto& tap : d_taps_lower) {
- printf(" %.4e + %.4ej,", tap.real(), tap.imag());
- }
- printf("]\n\n");
+ std::stringstream ss;
+ ss << "Upper Band-edge: [";
+ for (const auto& tap : d_taps_upper)
+ ss << boost::format(" %.4e + %.4ej,") % tap.real() % tap.imag();
+ ss << "]\n\n";
+
+ ss << "Lower Band-edge: [";
+ for (const auto& tap : d_taps_lower)
+ ss << boost::format(" %.4e + %.4ej,") % tap.real() % tap.imag();
+ ss << "]\n";
+
+ GR_LOG_INFO(d_logger, ss.str());
}
int fll_band_edge_cc_impl::work(int noutput_items,
diff --git a/gr-fec/lib/async_encoder_impl.cc b/gr-fec/lib/async_encoder_impl.cc
index 6e54617ca2..45cdf08825 100644
--- a/gr-fec/lib/async_encoder_impl.cc
+++ b/gr-fec/lib/async_encoder_impl.cc
@@ -14,8 +14,10 @@
#include "async_encoder_impl.h"
#include <gnuradio/io_signature.h>
+#include <gnuradio/logger.h>
#include <volk/volk.h>
-#include <cstdio>
+
+#include <boost/format.hpp>
namespace gr {
namespace fec {
@@ -94,10 +96,10 @@ void async_encoder_impl::encode_unpacked(pmt::pmt_t msg)
} else {
nblocks = nbits_in / d_encoder->get_input_size();
if (nblocks * d_encoder->get_input_size() != nbits_in) {
- printf("nblocks: %u, in_block_size: %d, got_input_size: %d\n",
- nblocks,
- d_encoder->get_input_size(),
- nbits_in);
+ GR_LOG_ERROR(
+ d_logger,
+ boost::format("nblocks: %u, in_block_size: %d, got_input_size: %d") %
+ nblocks % d_encoder->get_input_size() % nbits_in);
throw std::runtime_error("input does not divide into code block size!");
}
nbits_out = nblocks * d_encoder->get_output_size();
diff --git a/gr-iio/lib/pluto_utils.cc b/gr-iio/lib/pluto_utils.cc
index 2d8f2fed35..37f78f6755 100644
--- a/gr-iio/lib/pluto_utils.cc
+++ b/gr-iio/lib/pluto_utils.cc
@@ -8,7 +8,10 @@
*/
#include <gnuradio/iio/pluto_utils.h>
+#include <gnuradio/logger.h>
+
#include <iio.h>
+
#include <stdexcept>
namespace gr {
@@ -16,6 +19,7 @@ namespace iio {
std::string get_pluto_uri()
{
+ GR_LOG_GET_CONFIGURED_LOGGER(d_logger, "pluto_utils::get_pluto_uri");
iio_scan_context* ctx = iio_create_scan_context("usb", 0);
if (!ctx)
throw std::runtime_error("Unable to create scan context");
@@ -34,16 +38,16 @@ std::string get_pluto_uri()
}
if (ret > 1) {
- printf("More than one Pluto found:\n");
+ GR_LOG_INFO(d_logger, "More than one Pluto found:");
for (unsigned int i = 0; i < (size_t)ret; i++) {
- printf("\t%d: %s [%s]\n",
- i,
- iio_context_info_get_description(info[i]),
- iio_context_info_get_uri(info[i]));
+ GR_LOG_INFO(d_logger,
+ boost::format("\t%d: %s [%s]") % i %
+ iio_context_info_get_description(info[i]) %
+ iio_context_info_get_uri(info[i]));
}
- printf("We will use the first one.\n");
+ GR_LOG_INFO(d_logger, "We will use the first one.");
}
std::string uri(iio_context_info_get_uri(info[0]));
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-24 05:20:32 +0000