<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9859">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ringbuffer: Don't print/TRAC from ringbuffer<br><br>In commit eac1bec4285a48b466e9fd09b0513b3c49d393b3 we start to use the<br>ringbuffer inside the console printing code.  As a result, we must not<br>use TRACE_*() or printf() from within ringbuffer.c code to avoid<br>infinite recursion.<br><br>Instead, let rbuf_write() return a negative return value in case the<br>ring buffer overflows.  This way, the callers (outside the<br>console/stdout code) can print an error message themselves.<br><br>Change-Id: Ib009f013be119dbad22fa2b7d60ec8dee59baee5<br>---<br>M firmware/libcommon/include/ringbuffer.h<br>M firmware/libcommon/source/mode_cardemu.c<br>M firmware/libcommon/source/ringbuffer.c<br>3 files changed, 10 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/libcommon/include/ringbuffer.h b/firmware/libcommon/include/ringbuffer.h</span><br><span>index 1d29760..efc557c 100644</span><br><span>--- a/firmware/libcommon/include/ringbuffer.h</span><br><span>+++ b/firmware/libcommon/include/ringbuffer.h</span><br><span>@@ -16,7 +16,7 @@</span><br><span> void rbuf_reset(volatile ringbuf * rb);</span><br><span> uint8_t rbuf_read(volatile ringbuf * rb);</span><br><span> uint8_t rbuf_peek(volatile ringbuf * rb);</span><br><span style="color: hsl(0, 100%, 40%);">-void rbuf_write(volatile ringbuf * rb, uint8_t item);</span><br><span style="color: hsl(120, 100%, 40%);">+int rbuf_write(volatile ringbuf * rb, uint8_t item);</span><br><span> bool rbuf_is_empty(volatile ringbuf * rb);</span><br><span> bool rbuf_is_full(volatile ringbuf * rb);</span><br><span> </span><br><span>diff --git a/firmware/libcommon/source/mode_cardemu.c b/firmware/libcommon/source/mode_cardemu.c</span><br><span>index 7de67df..2d9af99 100644</span><br><span>--- a/firmware/libcommon/source/mode_cardemu.c</span><br><span>+++ b/firmware/libcommon/source/mode_cardemu.c</span><br><span>@@ -186,7 +186,8 @@</span><br><span> </span><br><span>      if (csr & US_CSR_RXRDY) {</span><br><span>                byte = (usart->US_RHR) & 0xFF;</span><br><span style="color: hsl(0, 100%, 40%);">-           rbuf_write(&ci->rb, byte);</span><br><span style="color: hsl(120, 100%, 40%);">+             if (rbuf_write(&ci->rb, byte) < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+                  TRACE_ERROR("rbuf overrun\r\n");</span><br><span>   }</span><br><span> </span><br><span>        if (csr & US_CSR_TXRDY) {</span><br><span>diff --git a/firmware/libcommon/source/ringbuffer.c b/firmware/libcommon/source/ringbuffer.c</span><br><span>index 4d980d7..b8cd5c6 100644</span><br><span>--- a/firmware/libcommon/source/ringbuffer.c</span><br><span>+++ b/firmware/libcommon/source/ringbuffer.c</span><br><span>@@ -2,6 +2,10 @@</span><br><span> #include "trace.h"</span><br><span> #include "utils.h"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* WARNINGI: Since console output is internally using this ringbuffer to implement</span><br><span style="color: hsl(120, 100%, 40%);">+ * buffered writes, we cannot use any TRACE_*() or printf() style functions here,</span><br><span style="color: hsl(120, 100%, 40%);">+ * as it would create infinite recursion! */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void rbuf_reset(volatile ringbuf * rb)</span><br><span> {</span><br><span>      unsigned long state;</span><br><span>@@ -52,7 +56,7 @@</span><br><span>     return rc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void rbuf_write(volatile ringbuf * rb, uint8_t item)</span><br><span style="color: hsl(120, 100%, 40%);">+int rbuf_write(volatile ringbuf * rb, uint8_t item)</span><br><span> {</span><br><span>    unsigned long state;</span><br><span> </span><br><span>@@ -61,9 +65,10 @@</span><br><span>                rb->buf[rb->iwr] = item;</span><br><span>               rb->iwr = (rb->iwr + 1) % RING_BUFLEN;</span><br><span>                 local_irq_restore(state);</span><br><span style="color: hsl(120, 100%, 40%);">+             return 0;</span><br><span>    } else {</span><br><span>             local_irq_restore(state);</span><br><span style="color: hsl(0, 100%, 40%);">-               TRACE_ERROR("Ringbuffer full, losing bytes!");</span><br><span style="color: hsl(120, 100%, 40%);">+              return -1;</span><br><span>   }</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9859">change 9859</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/9859"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ib009f013be119dbad22fa2b7d60ec8dee59baee5 </div>
<div style="display:none"> Gerrit-Change-Number: 9859 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>