diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/array.c | 3 | ||||
| -rw-r--r-- | src/log.c | 8 | ||||
| -rw-r--r-- | src/ring_buffer.c | 20 |
3 files changed, 16 insertions, 15 deletions
diff --git a/src/array.c b/src/array.c index 9920267..40e5577 100644 --- a/src/array.c +++ b/src/array.c @@ -1,4 +1,5 @@ #include "../include/al/lib.h" +#include "../include/al/macros.h" #include "../include/al/array_sort.h" // https://github.com/lifthrasiir/angolmois/blob/master/angolmois.c#L79 @@ -8,7 +9,7 @@ struct { \ u32 size; \ u32 alloc; \ - type *__al_sized_by(alloc) data; \ + type *__sized_by(alloc) data; \ } #define al_array_init(arr) ((arr).size = 0, (arr).alloc = 0, (arr).data = NULL) @@ -1,6 +1,6 @@ #include "../include/al/log.h" -#define AL_LOG_SKIP +//#define AL_LOG_SKIP #define AL_LOG_USE_SECTION #ifdef AL_LOG_USE_SECTION #define AL_LOG_TEMPLATE "%s:%d %s(): %s -> (%s) " @@ -11,11 +11,11 @@ #define AL_LOG_MESSAGE_MAX 511 #ifndef AL_LOG_SKIP -static s32 al_print_default(void *userdata, char *s) +static s32 al_print_default(void *userdata, char *message) { (void)userdata; - s32 ret = al_printf("%*.*s\n", 0, AL_LOG_MESSAGE_MAX, s); - al_free(s); + s32 ret = al_printf("%*.*s\n", 0, AL_LOG_MESSAGE_MAX, message); + al_free(message); return ret; } diff --git a/src/ring_buffer.c b/src/ring_buffer.c index adb22ad..a96584f 100644 --- a/src/ring_buffer.c +++ b/src/ring_buffer.c @@ -1,6 +1,6 @@ #include "../include/al/ring_buffer.h" #include "../include/al/atomic.h" -#include "../include/al/lib.h" +#include "../include/al/macros.h" // https://github.com/MusicPlayerDaemon/MPD/blob/master/src/util/RingBuffer.hxx // https://andrea.lattuada.me/blog/2019/the-design-and-implementation-of-a-lock-free-ring-buffer-with-contiguous-reservations.html @@ -71,13 +71,13 @@ size_t al_ring_buffer_write(struct al_ring_buffer *buf, u8 *data, size_t n) u8 *wp = al_atomic_load(void)(&buf->write, AL_ATOMIC_ACQUIRE); u8 *rp = previous(buf, al_atomic_load(void)(&buf->read, AL_ATOMIC_RELAXED)); - size_t size = AL_MIN((wp <= rp ? rp : buf->end) - wp, (ptrdiff_t)n); + size_t size = MIN((wp <= rp ? rp : buf->end) - wp, (ptrdiff_t)n); al_memcpy(wp, data, size); wp += size; if (wp >= buf->end) { - size_t wrap = AL_MIN(rp - buf->start, (ptrdiff_t)(n - size)); + size_t wrap = MIN(rp - buf->start, (ptrdiff_t)(n - size)); al_memcpy(buf->start, data + size, wrap); wp = buf->start + wrap; size += wrap; @@ -93,13 +93,13 @@ size_t al_ring_buffer_read(struct al_ring_buffer *buf, u8 *ptr, size_t n) u8 *rp = al_atomic_load(void)(&buf->read, AL_ATOMIC_ACQUIRE); u8 *wp = al_atomic_load(void)(&buf->write, AL_ATOMIC_RELAXED); - size_t size = AL_MIN((rp <= wp ? wp : buf->end) - rp, (ptrdiff_t)n); + size_t size = MIN((rp <= wp ? wp : buf->end) - rp, (ptrdiff_t)n); al_memcpy(ptr, rp, size); rp += size; if (rp >= buf->end) { - size_t wrap = AL_MIN(wp - buf->start, (ptrdiff_t)(n - size)); + size_t wrap = MIN(wp - buf->start, (ptrdiff_t)(n - size)); al_memcpy(ptr + size, buf->start, wrap); rp = buf->start + wrap; size += wrap; @@ -119,12 +119,12 @@ size_t al_ring_buffer_peek(struct al_ring_buffer *buf, u8 *ptr, size_t offset, s if (rp <= wp) { rp += offset; - size = AL_MIN(wp - rp, (ptrdiff_t)n); + size = MIN(wp - rp, (ptrdiff_t)n); if (size < 0) return 0; al_memcpy(ptr, rp, size); } else { rp += offset; - size = AL_MIN(buf->end - rp, (ptrdiff_t)n); + size = MIN(buf->end - rp, (ptrdiff_t)n); if (size > 0) { al_memcpy(ptr, rp, size); n -= size; @@ -133,7 +133,7 @@ size_t al_ring_buffer_peek(struct al_ring_buffer *buf, u8 *ptr, size_t offset, s rp = buf->start - size; size = 0; } - ptrdiff_t wrap = AL_MIN(wp - rp, (ptrdiff_t)n); + ptrdiff_t wrap = MIN(wp - rp, (ptrdiff_t)n); if (wrap > 0) { al_memcpy(ptr + size, rp, wrap); size += wrap; @@ -148,11 +148,11 @@ size_t al_ring_buffer_discard(struct al_ring_buffer *buf, size_t n) u8 *rp = al_atomic_load(void)(&buf->read, AL_ATOMIC_ACQUIRE); u8 *wp = al_atomic_load(void)(&buf->write, AL_ATOMIC_RELAXED); - size_t discard = AL_MIN((rp <= wp ? wp : buf->end) - rp, (ptrdiff_t)n); + size_t discard = MIN((rp <= wp ? wp : buf->end) - rp, (ptrdiff_t)n); rp += discard; if (rp >= buf->end) { - size_t wrap = AL_MIN(wp - buf->start, (ptrdiff_t)(n - discard)); + size_t wrap = MIN(wp - buf->start, (ptrdiff_t)(n - discard)); rp = buf->start + wrap; discard += wrap; } |