<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/16665">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">uhd: Introduce UHD log category and support UHD >=3.11 logging framework<br><br>Change-Id: I36f1ff7d425a2144fb512ff393af02741eb4a3d4<br>---<br>M CommonLibs/Logger.h<br>M CommonLibs/debug.c<br>M CommonLibs/debug.h<br>M Transceiver52M/device/uhd/UHDDevice.cpp<br>4 files changed, 58 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/65/16665/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/CommonLibs/Logger.h b/CommonLibs/Logger.h</span><br><span>index ab72303..b752e51 100644</span><br><span>--- a/CommonLibs/Logger.h</span><br><span>+++ b/CommonLibs/Logger.h</span><br><span>@@ -58,6 +58,9 @@</span><br><span> #define LOGLV(category, level) \</span><br><span> Log(category, level, __BASE_FILE__, __LINE__).get() << "[tid=" << pthread_self() << "] "</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define LOGSRC(category, level, file, line) \</span><br><span style="color: hsl(120, 100%, 40%);">+ Log(category, level, file, line).get() << "[tid=" << pthread_self() << "] "</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #define LOGCHAN(chan, category, level) \</span><br><span> Log(category, LOGL_##level, __BASE_FILE__, __LINE__).get() << "[tid=" << pthread_self() << "][chan=" << chan << "] "</span><br><span> </span><br><span>diff --git a/CommonLibs/debug.c b/CommonLibs/debug.c</span><br><span>index cc5be44..ee5270d 100644</span><br><span>--- a/CommonLibs/debug.c</span><br><span>+++ b/CommonLibs/debug.c</span><br><span>@@ -71,6 +71,12 @@</span><br><span> .color = NULL,</span><br><span> .enabled = 1, .loglevel = LOGL_NOTICE,</span><br><span> },</span><br><span style="color: hsl(120, 100%, 40%);">+ [DUHD] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DUHD",</span><br><span style="color: hsl(120, 100%, 40%);">+ .description = "Logging from within libuhd itself",</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = NULL,</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 1, .loglevel = LOGL_NOTICE,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> };</span><br><span> </span><br><span> const struct log_info log_info = {</span><br><span>diff --git a/CommonLibs/debug.h b/CommonLibs/debug.h</span><br><span>index 3837329..2b7be23 100644</span><br><span>--- a/CommonLibs/debug.h</span><br><span>+++ b/CommonLibs/debug.h</span><br><span>@@ -16,6 +16,7 @@</span><br><span> DTRXDUL,</span><br><span> DDEV,</span><br><span> DLMS,</span><br><span style="color: hsl(120, 100%, 40%);">+ DUHD,</span><br><span> };</span><br><span> </span><br><span> #define CLOGC(category, level, fmt, args...) do { \</span><br><span>diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>index 59eb8a7..0a47616 100644</span><br><span>--- a/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>+++ b/Transceiver52M/device/uhd/UHDDevice.cpp</span><br><span>@@ -33,11 +33,12 @@</span><br><span> #include "config.h"</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#ifndef USE_UHD_3_11</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef USE_UHD_3_11</span><br><span style="color: hsl(120, 100%, 40%);">+#include <uhd/utils/log_add.hpp></span><br><span style="color: hsl(120, 100%, 40%);">+#include <uhd/utils/thread.hpp></span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span> #include <uhd/utils/msg.hpp></span><br><span> #include <uhd/utils/thread_priority.hpp></span><br><span style="color: hsl(0, 100%, 40%);">-#else</span><br><span style="color: hsl(0, 100%, 40%);">-#include <uhd/utils/thread.hpp></span><br><span> #endif</span><br><span> </span><br><span> #define USRP_TX_AMPL 0.3</span><br><span>@@ -134,23 +135,52 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#ifndef USE_UHD_3_11</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef USE_UHD_3_11</span><br><span style="color: hsl(120, 100%, 40%);">+static void uhd_log_handler(const uhd::log::logging_info &info)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int level;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch(info.verbosity)</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ case uhd::log::trace:</span><br><span style="color: hsl(120, 100%, 40%);">+ case uhd::log::debug:</span><br><span style="color: hsl(120, 100%, 40%);">+ level = LOGL_DEBUG;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case uhd::log::info:</span><br><span style="color: hsl(120, 100%, 40%);">+ level = LOGL_INFO;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case uhd::log::warning:</span><br><span style="color: hsl(120, 100%, 40%);">+ level = LOGL_NOTICE;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case uhd::log::error:</span><br><span style="color: hsl(120, 100%, 40%);">+ level = LOGL_ERROR;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case uhd::log::fatal:</span><br><span style="color: hsl(120, 100%, 40%);">+ level = LOGL_FATAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ level = LOGL_NOTICE;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGSRC(DUHD, level, info.file.c_str(), info.line) << "[" << info.component << "] " << info.message;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span> /*</span><br><span> Catch and drop underrun 'U' and overrun 'O' messages from stdout</span><br><span> since we already report using the logging facility. Direct</span><br><span> everything else appropriately.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-void uhd_msg_handler(uhd::msg::type_t type, const std::string &msg)</span><br><span style="color: hsl(120, 100%, 40%);">+static void uhd_msg_handler(uhd::msg::type_t type, const std::string &msg)</span><br><span> {</span><br><span> switch (type) {</span><br><span> case uhd::msg::status:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, INFO) << msg;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(UHD, INFO) << msg;</span><br><span> break;</span><br><span> case uhd::msg::warning:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, WARNING) << msg;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(UHD, NOTICE) << msg;</span><br><span> break;</span><br><span> case uhd::msg::error:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGC(DDEV, ERROR) << msg;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGC(UHD, ERROR) << msg;</span><br><span> break;</span><br><span> case uhd::msg::fastpath:</span><br><span> break;</span><br><span>@@ -418,6 +448,16 @@</span><br><span> {</span><br><span> const char *refstr;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Register msg handler. Different APIs depending on UHD version */</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef USE_UHD_3_11</span><br><span style="color: hsl(120, 100%, 40%);">+ uhd::log::add_logger("OsmoTRX", &uhd_log_handler);</span><br><span style="color: hsl(120, 100%, 40%);">+ uhd::log::set_log_level(uhd::log::debug);</span><br><span style="color: hsl(120, 100%, 40%);">+ uhd::log::set_console_level(uhd::log::off);</span><br><span style="color: hsl(120, 100%, 40%);">+ uhd::log::set_logger_level("OsmoTRX", uhd::log::debug);</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+ uhd::msg::register_handler(&uhd_msg_handler);</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> // Find UHD devices</span><br><span> uhd::device_addr_t addr(args);</span><br><span> uhd::device_addrs_t dev_addrs = uhd::device::find(addr);</span><br><span>@@ -604,10 +644,6 @@</span><br><span> return false;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#ifndef USE_UHD_3_11</span><br><span style="color: hsl(0, 100%, 40%);">- // Register msg handler</span><br><span style="color: hsl(0, 100%, 40%);">- uhd::msg::register_handler(&uhd_msg_handler);</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> // Start asynchronous event (underrun check) loop</span><br><span> async_event_thrd = new Thread();</span><br><span> async_event_thrd->start((void * (*)(void*))async_event_loop, (void*)this);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/16665">change 16665</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-trx/+/16665"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I36f1ff7d425a2144fb512ff393af02741eb4a3d4 </div>
<div style="display:none"> Gerrit-Change-Number: 16665 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>