<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12093">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Log: add stdout target<br><br>This is useful for code testing internal library functions which allows<br>to automatically fail tests due to output mismatch.<br><br>As a side-effect this also simplifies #if-#else logic due to both<br>_stdout() and _stderr() now being simple wrappers around static<br>function.<br><br>No user-visible changes are introduced because stdout is ignored by vty<br>code to avoid messing up vty output.<br><br>Change-Id: Ia786361f5f687e43b27d87a45b4630bca58bcfe8<br>---<br>M include/osmocom/core/logging.h<br>M src/logging.c<br>M src/vty/logging_vty.c<br>3 files changed, 37 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/93/12093/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h</span><br><span>index 295e5a8..4a835ff 100644</span><br><span>--- a/include/osmocom/core/logging.h</span><br><span>+++ b/include/osmocom/core/logging.h</span><br><span>@@ -218,6 +218,7 @@</span><br><span> LOG_TGT_TYPE_SYSLOG, /*!< syslog based logging */</span><br><span> LOG_TGT_TYPE_FILE, /*!< text file logging */</span><br><span> LOG_TGT_TYPE_STDERR, /*!< stderr logging */</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_TGT_TYPE_STDOUT, /*!< stdout logging */</span><br><span> LOG_TGT_TYPE_STRRB, /*!< osmo_strrb-backed logging */</span><br><span> LOG_TGT_TYPE_GSMTAP, /*!< GSMTAP network logging */</span><br><span> };</span><br><span>@@ -361,6 +362,7 @@</span><br><span> struct log_target *log_target_create(void);</span><br><span> void log_target_destroy(struct log_target *target);</span><br><span> struct log_target *log_target_create_stderr(void);</span><br><span style="color: hsl(120, 100%, 40%);">+struct log_target *log_target_create_stdout(void);</span><br><span> struct log_target *log_target_create_file(const char *fname);</span><br><span> struct log_target *log_target_create_syslog(const char *ident, int option,</span><br><span> int facility);</span><br><span>diff --git a/src/logging.c b/src/logging.c</span><br><span>index 908ba54..31345d1 100644</span><br><span>--- a/src/logging.c</span><br><span>+++ b/src/logging.c</span><br><span>@@ -810,24 +810,45 @@</span><br><span> return target;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! Create the STDERR log target</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns dynamically-allocated \ref log_target for STDERR */</span><br><span style="color: hsl(0, 100%, 40%);">-struct log_target *log_target_create_stderr(void)</span><br><span style="color: hsl(120, 100%, 40%);">+static struct log_target *_log_target_create_std(FILE *out, enum log_target_type lt)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-/* since C89/C99 says stderr is a macro, we can safely do this! */</span><br><span style="color: hsl(0, 100%, 40%);">-#if !EMBEDDED && defined(stderr)</span><br><span style="color: hsl(120, 100%, 40%);">+#if !EMBEDDED</span><br><span> struct log_target *target;</span><br><span> </span><br><span> target = log_target_create();</span><br><span> if (!target)</span><br><span> return NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- target->type = LOG_TGT_TYPE_STDERR;</span><br><span style="color: hsl(0, 100%, 40%);">- target->tgt_file.out = stderr;</span><br><span style="color: hsl(120, 100%, 40%);">+ target->type = lt;</span><br><span style="color: hsl(120, 100%, 40%);">+ target->tgt_file.out = out;</span><br><span> target->output = _file_output;</span><br><span> return target;</span><br><span> #else</span><br><span> return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</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%);">+/*! Create the STDOUT log target</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns dynamically-allocated \ref log_target for STDOUT */</span><br><span style="color: hsl(120, 100%, 40%);">+struct log_target *log_target_create_stdout(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+/* since C89/C99 says stdout is a macro, we can safely do this! */</span><br><span style="color: hsl(120, 100%, 40%);">+#if defined(stdout)</span><br><span style="color: hsl(120, 100%, 40%);">+ return _log_target_create_std(stdout, LOG_TGT_TYPE_STDOUT);</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif /* stdout */</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%);">+/*! Create the STDERR log target</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns dynamically-allocated \ref log_target for STDERR */</span><br><span style="color: hsl(120, 100%, 40%);">+struct log_target *log_target_create_stderr(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+/* since C89/C99 says stderr is a macro, we can safely do this! */</span><br><span style="color: hsl(120, 100%, 40%);">+#if defined(stderr)</span><br><span style="color: hsl(120, 100%, 40%);">+ return _log_target_create_std(stderr, LOG_TGT_TYPE_STDERR);</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span> #endif /* stderr */</span><br><span> }</span><br><span> </span><br><span>@@ -900,6 +921,10 @@</span><br><span> /* don't close stderr */</span><br><span> if (target->tgt_file.out != stderr)</span><br><span> #endif</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef stdout</span><br><span style="color: hsl(120, 100%, 40%);">+ /* don't close stdout */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (target->tgt_file.out != stdout)</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> {</span><br><span> fclose(target->tgt_file.out);</span><br><span> target->tgt_file.out = NULL;</span><br><span>diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c</span><br><span>index f3e1419..e2d2b57 100644</span><br><span>--- a/src/vty/logging_vty.c</span><br><span>+++ b/src/vty/logging_vty.c</span><br><span>@@ -877,6 +877,9 @@</span><br><span> case LOG_TGT_TYPE_STDERR:</span><br><span> vty_out(vty, "log stderr%s", VTY_NEWLINE);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case LOG_TGT_TYPE_STDOUT:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* we don't support vty logging to stdout to avoid messing up vty prompt and user input */</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case LOG_TGT_TYPE_SYSLOG:</span><br><span> #ifdef HAVE_SYSLOG_H</span><br><span> vty_out(vty, "log syslog %s%s",</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12093">change 12093</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/12093"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ia786361f5f687e43b27d87a45b4630bca58bcfe8 </div>
<div style="display:none"> Gerrit-Change-Number: 12093 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>