<p>Hoernchen has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/26394">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">logging: make LIBOSMOCORE_NO_LOGGING work as expected<br><br>The macro introduced in d02090bba538158c36fd838d4e50c47e40f11449 was not<br>enough: the actual logging macros are being used, i.e. by the fsm, so<br>wrap those as well, and provide a flag to disable this at build time.<br><br>Change-Id: Ia4c78abe5f198139f96ffa289998855be2477585<br>---<br>M configure.ac<br>M include/osmocom/core/logging.h<br>2 files changed, 19 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/94/26394/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure.ac b/configure.ac</span><br><span>index b36bd6f..a69f793 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -366,6 +366,17 @@</span><br><span>     AC_DEFINE([PANIC_INFLOOP],[1],[Use infinite loop on panic rather than fprintf/abort])</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+AC_ARG_ENABLE(log_macros,</span><br><span style="color: hsl(120, 100%, 40%);">+    [AS_HELP_STRING(</span><br><span style="color: hsl(120, 100%, 40%);">+              [--disable-log-macros],</span><br><span style="color: hsl(120, 100%, 40%);">+               [Disable logging macros that are also used internally to print information]</span><br><span style="color: hsl(120, 100%, 40%);">+   )],</span><br><span style="color: hsl(120, 100%, 40%);">+   [log_macros="yes"], [log_macros="no"])</span><br><span style="color: hsl(120, 100%, 40%);">+if test x"$log_macros" == x"yes"</span><br><span style="color: hsl(120, 100%, 40%);">+then</span><br><span style="color: hsl(120, 100%, 40%);">+        AC_DEFINE([LIBOSMOCORE_NO_LOGGING],[1],[Disable logging macros])</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> AC_ARG_ENABLE(sanitize,</span><br><span>    [AS_HELP_STRING(</span><br><span>             [--enable-sanitize],</span><br><span>diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h</span><br><span>index a95c478..44ff77b 100644</span><br><span>--- a/include/osmocom/core/logging.h</span><br><span>+++ b/include/osmocom/core/logging.h</span><br><span>@@ -53,11 +53,15 @@</span><br><span>  *  \param[in] fmt format string</span><br><span>  *  \param[in] args variable argument list</span><br><span>  */</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef DEBUG</span><br><span> #define LOGPC(ss, level, fmt, args...) \</span><br><span>   do { \</span><br><span>               if (log_check_level(ss, level)) \</span><br><span>                    logp2(ss, level, __FILE__, __LINE__, 1, fmt, ##args); \</span><br><span>      } while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+#define LOGPC(ss, level, fmt, args...)</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> </span><br><span> /*! Log through the Osmocom logging framework with explicit source.</span><br><span>  *  If caller_file is passed as NULL, __FILE__ and __LINE__ are used</span><br><span>@@ -87,6 +91,7 @@</span><br><span>  *  \param[in] fmt format string</span><br><span>  *  \param[in] args variable argument list</span><br><span>  */</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef DEBUG</span><br><span> #define LOGPSRCC(ss, level, caller_file, caller_line, cont, fmt, args...) \</span><br><span>       do { \</span><br><span>               if (log_check_level(ss, level)) {\</span><br><span>@@ -96,6 +101,9 @@</span><br><span>                              logp2(ss, level, __FILE__, __LINE__, cont, fmt, ##args); \</span><br><span>           }\</span><br><span>   } while(0)</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+#define LOGPSRCC(ss, level, caller_file, caller_line, cont, fmt, args...)</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> </span><br><span> /*! different log levels */</span><br><span> #define LOGL_DEBUG   1       /*!< debugging information */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/26394">change 26394</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/libosmocore/+/26394"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ia4c78abe5f198139f96ffa289998855be2477585 </div>
<div style="display:none"> Gerrit-Change-Number: 26394 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>