catarrh/simtrace2
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/simtrace2.git synced 2026-03-23 08:48:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

ringbuffer: Don't print/TRAC from ringbuffer

Browse Source 
In commit eac1bec428 we start to use the
ringbuffer inside the console printing code.  As a result, we must not
use TRACE_*() or printf() from within ringbuffer.c code to avoid
infinite recursion.

Instead, let rbuf_write() return a negative return value in case the
ring buffer overflows.  This way, the callers (outside the
console/stdout code) can print an error message themselves.

Change-Id: Ib009f013be119dbad22fa2b7d60ec8dee59baee5
This commit is contained in:
Harald Welte
2018-07-04 04:39:40 +02:00
parent 46893451de
commit 05cc7f6531
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/libcommon/include/ringbuffer.h
View File

@@ -16,7 +16,7 @@ typedef struct ringbuf {
void rbuf_reset(volatile ringbuf * rb); void rbuf_reset(volatile ringbuf * rb);
uint8_t rbuf_read(volatile ringbuf * rb); uint8_t rbuf_read(volatile ringbuf * rb);
uint8_t rbuf_peek(volatile ringbuf * rb); uint8_t rbuf_peek(volatile ringbuf * rb);
void rbuf_write(volatile ringbuf * rb, uint8_t item); int rbuf_write(volatile ringbuf * rb, uint8_t item);
bool rbuf_is_empty(volatile ringbuf * rb); bool rbuf_is_empty(volatile ringbuf * rb);
bool rbuf_is_full(volatile ringbuf * rb); bool rbuf_is_full(volatile ringbuf * rb);

3
firmware/libcommon/source/mode_cardemu.c
View File

@@ -186,7 +186,8 @@ static void usart_irq_rx(uint8_t inst_num)
if (csr & US_CSR_RXRDY) { if (csr & US_CSR_RXRDY) {
byte = (usart->US_RHR) & 0xFF; byte = (usart->US_RHR) & 0xFF;
rbuf_write(&ci->rb, byte); if (rbuf_write(&ci->rb, byte) < 0)
TRACE_ERROR("rbuf overrun\r\n");
} }
if (csr & US_CSR_TXRDY) { if (csr & US_CSR_TXRDY) {

9
firmware/libcommon/source/ringbuffer.c
View File

@@ -2,6 +2,10 @@
#include "trace.h" #include "trace.h"
#include "utils.h" #include "utils.h"
/* WARNINGI: Since console output is internally using this ringbuffer to implement
* buffered writes, we cannot use any TRACE_*() or printf() style functions here,
* as it would create infinite recursion! */
void rbuf_reset(volatile ringbuf * rb) void rbuf_reset(volatile ringbuf * rb)
{ {
unsigned long state; unsigned long state;
@@ -52,7 +56,7 @@ bool rbuf_is_full(volatile ringbuf * rb)
return rc; return rc;
} }
void rbuf_write(volatile ringbuf * rb, uint8_t item) int rbuf_write(volatile ringbuf * rb, uint8_t item)
{ {
unsigned long state; unsigned long state;
@@ -61,9 +65,10 @@ void rbuf_write(volatile ringbuf * rb, uint8_t item)
rb->buf[rb->iwr] = item; rb->buf[rb->iwr] = item;
rb->iwr = (rb->iwr + 1) % RING_BUFLEN; rb->iwr = (rb->iwr + 1) % RING_BUFLEN;
local_irq_restore(state); local_irq_restore(state);
return 0;
} else { } else {
local_irq_restore(state); local_irq_restore(state);
TRACE_ERROR("Ringbuffer full, losing bytes!"); return -1;
} }
} }