diff options
| author | Marcus Müller <mmueller@gnuradio.org> | 2021-08-03 13:05:37 +0200 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-11-19 14:00:08 -0500 |
| commit | 1bb08e8004aa8ba6637db3f06abdc283ea56c18a (patch) | |
| tree | 39140de01d77dee6999f85e90d9fa9dc7cf8471f /gr-blocks | |
| parent | cb60862fd493a0141946ff9dddc5a98c9c67690b (diff) | |
logging core: replace log4cpp by spdlog
also: enable formerly disabled qa_logger tests
This replaces log4cpp with spdlog.
Signed-off-by: Marcus Müller <mmueller@gnuradio.org>
Diffstat (limited to 'gr-blocks')
| -rw-r--r-- | gr-blocks/lib/qa_block_tags.cc | 11 | ||||
| -rw-r--r-- | gr-blocks/python/blocks/qa_logger.py | 44 |
2 files changed, 28 insertions, 27 deletions
diff --git a/gr-blocks/lib/qa_block_tags.cc b/gr-blocks/lib/qa_block_tags.cc index 65f4c9a070..92392f4d98 100644 --- a/gr-blocks/lib/qa_block_tags.cc +++ b/gr-blocks/lib/qa_block_tags.cc @@ -25,6 +25,7 @@ #include <boost/format.hpp> #include <boost/test/unit_test.hpp> +#include <memory> // ---------------------------------------------------------------- @@ -114,7 +115,7 @@ 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"); + auto logger = std::make_shared<gr::logger>("qa_block_tags::t1"); // Kludge together the tags that we know should result from the above graph std::stringstream str0, str1, str2; @@ -213,7 +214,7 @@ BOOST_AUTO_TEST_CASE(t2) #if QA_TAGS_DEBUG - GR_LOG_GET_CONFIGURED_LOGGER(logger, "qa_block_tags::t2"); + auto logger = std::make_shared<gr::logger>("qa_block_tags::t2"); // Kludge together the tags that we know should result from the above graph std::stringstream str0, str1; @@ -314,7 +315,7 @@ 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"); + auto logger = std::make_shared<gr::logger>("qa_block_tags::t3"); // Kludge together the tags that we know should result from the above graph std::stringstream str0, str1, str2; @@ -377,7 +378,7 @@ 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"); + auto logger = std::make_shared<gr::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. @@ -432,7 +433,7 @@ BOOST_AUTO_TEST_CASE(t5) #if QA_TAGS_DEBUG - GR_LOG_GET_CONFIGURED_LOGGER(logger, "qa_block_tags::t5"); + auto logger = std::make_shared<gr::logger>("qa_block_tags::t5"); // Kludge together the tags that we know should result from the above graph std::stringstream str0, str1, str2; diff --git a/gr-blocks/python/blocks/qa_logger.py b/gr-blocks/python/blocks/qa_logger.py index f3714afbb3..aa36e02562 100644 --- a/gr-blocks/python/blocks/qa_logger.py +++ b/gr-blocks/python/blocks/qa_logger.py @@ -1,6 +1,7 @@ #!/usr/bin/env python # # Copyright 2016 Free Software Foundation, Inc. +# Copyright 2021 Marcus Müller # # This file is part of GNU Radio # @@ -20,31 +21,30 @@ class test_logger (gr_unittest.TestCase): def tearDown(self): pass - def set_and_assert_log_level(self, block, level): + def set_and_assert_log_level(self, block, level, ref=None): + if ref is None: + ref = level block.set_log_level(level) - self.assertEqual(block.log_level(), level) + self.assertEqual(block.log_level(), ref) def test_log_level_for_block(self): # Test the python API for getting and setting log levels of individual block # go through all of the documented log_levels ns = blocks.null_source(1) - self.set_and_assert_log_level(ns, "notset") self.set_and_assert_log_level(ns, "debug") self.set_and_assert_log_level(ns, "info") - self.set_and_assert_log_level(ns, "notice") - self.set_and_assert_log_level(ns, "warn") + self.set_and_assert_log_level(ns, "notice", "info") + self.set_and_assert_log_level(ns, "warn", "warning") + self.set_and_assert_log_level(ns, "warning") self.set_and_assert_log_level(ns, "error") - self.set_and_assert_log_level(ns, "crit") - self.set_and_assert_log_level(ns, "alert") - self.set_and_assert_log_level(ns, "emerg") + self.set_and_assert_log_level(ns, "crit", "critical") + self.set_and_assert_log_level(ns, "critical") + self.set_and_assert_log_level(ns, "alert", "critical") + self.set_and_assert_log_level(ns, "emerg", "critical") # There's a couple of special cases. "off" == "notset" (specific to gr) # and "fatal" == "emerg" (built in to log4cpp) ns.set_log_level("off") - self.assertEqual(ns.log_level(), "notset") - ns.set_log_level("fatal") - self.assertEqual(ns.log_level(), "emerg") - # Make sure exception is throw on bogus data - self.assertRaises(RuntimeError, ns.set_log_level, "11") + self.assertEqual(ns.log_level(), "off") def test_log_level_for_tb(self): # Test the python API for getting and setting log levels for a @@ -59,10 +59,10 @@ class test_logger (gr_unittest.TestCase): # confirm that the tb has log_level of first block self.assertEqual(tb.log_level(), "debug") # confirm that changing tb log_level propagates to connected blocks - tb.set_log_level("alert") - self.assertEqual(tb.log_level(), "alert") - self.assertEqual(nsrc.log_level(), "alert") - self.assertEqual(nsnk.log_level(), "alert") + tb.set_log_level("critical") + self.assertEqual(tb.log_level(), "critical") + self.assertEqual(nsrc.log_level(), "critical") + self.assertEqual(nsnk.log_level(), "critical") def test_log_level_for_hier_block(self): # Test the python API for getting and setting log levels for hier @@ -78,11 +78,11 @@ class test_logger (gr_unittest.TestCase): self.assertEqual(nsrc.log_level(), "debug") self.assertEqual(nsnk.log_level(), "debug") self.assertEqual(b.one_in_n.log_level(), "debug") - tb.set_log_level("alert") - self.assertEqual(tb.log_level(), "alert") - self.assertEqual(nsrc.log_level(), "alert") - self.assertEqual(nsnk.log_level(), "alert") - self.assertEqual(b.one_in_n.log_level(), "alert") + tb.set_log_level("critical") + self.assertEqual(tb.log_level(), "critical") + self.assertEqual(nsrc.log_level(), "critical") + self.assertEqual(nsnk.log_level(), "critical") + self.assertEqual(b.one_in_n.log_level(), "critical") if __name__ == '__main__': |