diff options
| author | Martin Braun <martin.braun@kit.edu> | 2013-03-22 17:09:00 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@kit.edu> | 2013-03-22 17:27:24 +0100 |
| commit | 2866af427e343c12abacd1e7454234d73c3e6a84 (patch) | |
| tree | 144bb2b1ee9b4c7a867578e556cb39b4e603d2ea | |
| parent | 1bb10d9023fbade8244d843273c24d849467385a (diff) | |
core/digital: added more logging
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_tagged_stream_block.cc | 4 | ||||
| -rw-r--r-- | gr-digital/lib/packet_headergenerator_bb_impl.cc | 2 | ||||
| -rw-r--r-- | gr-digital/lib/packet_headerparser_b_impl.cc | 2 | ||||
| -rwxr-xr-x | gr-digital/python/qa_ofdm_txrx.py | 5 |
4 files changed, 11 insertions, 2 deletions
diff --git a/gnuradio-core/src/lib/runtime/gr_tagged_stream_block.cc b/gnuradio-core/src/lib/runtime/gr_tagged_stream_block.cc index 3c4a75fd37..26ce2231aa 100644 --- a/gnuradio-core/src/lib/runtime/gr_tagged_stream_block.cc +++ b/gnuradio-core/src/lib/runtime/gr_tagged_stream_block.cc @@ -24,6 +24,7 @@ #include "config.h" #endif +#include <boost/format.hpp> #include <gr_tagged_stream_block.h> gr_tagged_stream_block::gr_tagged_stream_block (const std::string &name, @@ -111,7 +112,8 @@ gr_tagged_stream_block::general_work (int noutput_items, } for (unsigned i = 0; i < input_items.size(); i++) { if (d_n_input_items_reqd[i] == -1) { - throw std::runtime_error("Missing length tag."); + GR_LOG_FATAL(d_logger, boost::format("Missing a required length tag on port %1% at item #%2%") % i % nitems_read(i)); + throw std::runtime_error("Missing length tag."); } if (d_n_input_items_reqd[i] > ninput_items[i]) { return 0; diff --git a/gr-digital/lib/packet_headergenerator_bb_impl.cc b/gr-digital/lib/packet_headergenerator_bb_impl.cc index 2698977728..b543cd7a05 100644 --- a/gr-digital/lib/packet_headergenerator_bb_impl.cc +++ b/gr-digital/lib/packet_headergenerator_bb_impl.cc @@ -23,6 +23,7 @@ #include "config.h" #endif +#include <boost/format.hpp> #include <gr_io_signature.h> #include "packet_headergenerator_bb_impl.h" @@ -79,6 +80,7 @@ namespace gr { { unsigned char *out = (unsigned char *) output_items[0]; if (!d_formatter->header_formatter(ninput_items[0], out)) { + GR_LOG_FATAL(d_logger, boost::format("header_formatter() returned false (this shouldn't happen). Offending header started at %1%") % nitems_read(0)); throw std::runtime_error("header formatter returned false."); } diff --git a/gr-digital/lib/packet_headerparser_b_impl.cc b/gr-digital/lib/packet_headerparser_b_impl.cc index 65883f5515..5f8f0cd560 100644 --- a/gr-digital/lib/packet_headerparser_b_impl.cc +++ b/gr-digital/lib/packet_headerparser_b_impl.cc @@ -23,6 +23,7 @@ #include "config.h" #endif +#include <boost/format.hpp> #include <gr_io_signature.h> #include "packet_headerparser_b_impl.h" @@ -73,6 +74,7 @@ namespace gr { std::vector<gr_tag_t> tags; if (!d_header_formatter->header_parser(in, tags)) { + GR_LOG_INFO(d_logger, boost::format("Detected an invalid packet at item %1%") % nitems_read(0)); message_port_pub(msg_port_id, pmt::PMT_F); } else { pmt::pmt_t dict(pmt::pmt_make_dict()); diff --git a/gr-digital/python/qa_ofdm_txrx.py b/gr-digital/python/qa_ofdm_txrx.py index 778f03f515..ad5a996b2c 100755 --- a/gr-digital/python/qa_ofdm_txrx.py +++ b/gr-digital/python/qa_ofdm_txrx.py @@ -21,8 +21,11 @@ # import numpy +import random from gnuradio import gr, gr_unittest -import digital_swig +import digital_swig as digital +from ofdm_txrx import ofdm_tx, ofdm_rx +from utils import tagged_streams class test_ofdm_txrx (gr_unittest.TestCase): |