diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ring_buffer.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/ring_buffer.c b/src/ring_buffer.c index 5c4307f..84300b6 100644 --- a/src/ring_buffer.c +++ b/src/ring_buffer.c @@ -25,20 +25,20 @@ static inline void add(struct al_ring_buffer *buf, u8 **v, u8 *ptr, ptrdiff_t n) ptr += n; al_assert(ptr <= buf->end); if (ptr == buf->end) ptr = buf->start; - al_atomic_store(void)(v, ptr, AL_ATOMIC_RELEASE); + atomic_store(void)(v, ptr, AL_ATOMIC_RELEASE); } ptrdiff_t al_ring_buffer_space(struct al_ring_buffer *buf) { - u8 *wp = (u8 *)al_atomic_load(void)(&buf->write, AL_ATOMIC_RELAXED); - u8 *rp = previous(buf, (u8 *)al_atomic_load(void)(&buf->read, AL_ATOMIC_RELAXED)); + u8 *wp = (u8 *)atomic_load(void)(&buf->write, AL_ATOMIC_RELAXED); + u8 *rp = previous(buf, (u8 *)atomic_load(void)(&buf->read, AL_ATOMIC_RELAXED)); return (wp <= rp) ? rp - wp : (buf->end - wp) + (rp - buf->start); } u8 *al_ring_buffer_write_chunk(struct al_ring_buffer *buf, ptrdiff_t *size) { - u8 *wp = (u8 *)al_atomic_load(void)(&buf->write, AL_ATOMIC_ACQUIRE); - u8 *rp = previous(buf, (u8 *)al_atomic_load(void)(&buf->read, AL_ATOMIC_RELAXED)); + u8 *wp = (u8 *)atomic_load(void)(&buf->write, AL_ATOMIC_ACQUIRE); + u8 *rp = previous(buf, (u8 *)atomic_load(void)(&buf->read, AL_ATOMIC_RELAXED)); *size = ((wp <= rp) ? rp : buf->end) - wp; return wp; } @@ -50,15 +50,15 @@ void al_ring_buffer_append(struct al_ring_buffer *buf, u8 *ptr, ptrdiff_t n) ptrdiff_t al_ring_buffer_occupied(struct al_ring_buffer *buf) { - u8 *rp = (u8 *)al_atomic_load(void)(&buf->read, AL_ATOMIC_RELAXED); - u8 *wp = (u8 *)al_atomic_load(void)(&buf->write, AL_ATOMIC_RELAXED); + u8 *rp = (u8 *)atomic_load(void)(&buf->read, AL_ATOMIC_RELAXED); + u8 *wp = (u8 *)atomic_load(void)(&buf->write, AL_ATOMIC_RELAXED); return (rp <= wp) ? wp - rp : (buf->end - rp) + (wp - buf->start); } u8 *al_ring_buffer_read_chunk(struct al_ring_buffer *buf, ptrdiff_t *size) { - u8 *rp = (u8 *)al_atomic_load(void)(&buf->read, AL_ATOMIC_ACQUIRE); - u8 *wp = (u8 *)al_atomic_load(void)(&buf->write, AL_ATOMIC_RELAXED); + u8 *rp = (u8 *)atomic_load(void)(&buf->read, AL_ATOMIC_ACQUIRE); + u8 *wp = (u8 *)atomic_load(void)(&buf->write, AL_ATOMIC_RELAXED); *size = ((rp <= wp) ? wp : buf->end) - rp; return rp; } @@ -70,8 +70,8 @@ void al_ring_buffer_consume(struct al_ring_buffer *buf, u8 *ptr, ptrdiff_t n) ptrdiff_t al_ring_buffer_write(struct al_ring_buffer *buf, u8 *data, ptrdiff_t n) { - u8 *wp = (u8 *)al_atomic_load(void)(&buf->write, AL_ATOMIC_ACQUIRE); - u8 *rp = previous(buf, (u8 *)al_atomic_load(void)(&buf->read, AL_ATOMIC_RELAXED)); + u8 *wp = (u8 *)atomic_load(void)(&buf->write, AL_ATOMIC_ACQUIRE); + u8 *rp = previous(buf, (u8 *)atomic_load(void)(&buf->read, AL_ATOMIC_RELAXED)); ptrdiff_t size = MIN(((wp <= rp) ? rp : buf->end) - wp, n); al_memcpy(wp, data, (size_t)size); @@ -84,15 +84,15 @@ ptrdiff_t al_ring_buffer_write(struct al_ring_buffer *buf, u8 *data, ptrdiff_t n size += wrap; } - al_atomic_store(void)(&buf->write, wp, AL_ATOMIC_RELEASE); + atomic_store(void)(&buf->write, wp, AL_ATOMIC_RELEASE); return size; } ptrdiff_t al_ring_buffer_read(struct al_ring_buffer *buf, u8 *ptr, ptrdiff_t n) { - u8 *rp = (u8 *)al_atomic_load(void)(&buf->read, AL_ATOMIC_ACQUIRE); - u8 *wp = (u8 *)al_atomic_load(void)(&buf->write, AL_ATOMIC_RELAXED); + u8 *rp = (u8 *)atomic_load(void)(&buf->read, AL_ATOMIC_ACQUIRE); + u8 *wp = (u8 *)atomic_load(void)(&buf->write, AL_ATOMIC_RELAXED); ptrdiff_t size = MIN(((rp <= wp) ? wp : buf->end) - rp, n); al_memcpy(ptr, rp, (size_t)size); @@ -105,15 +105,15 @@ ptrdiff_t al_ring_buffer_read(struct al_ring_buffer *buf, u8 *ptr, ptrdiff_t n) size += wrap; } - al_atomic_store(void)(&buf->read, rp, AL_ATOMIC_RELEASE); + atomic_store(void)(&buf->read, rp, AL_ATOMIC_RELEASE); return size; } ptrdiff_t al_ring_buffer_peek(struct al_ring_buffer *buf, u8 *ptr, ptrdiff_t offset, ptrdiff_t n) { - u8 *rp = (u8 *)al_atomic_load(void)(&buf->read, AL_ATOMIC_RELAXED); - u8 *wp = (u8 *)al_atomic_load(void)(&buf->write, AL_ATOMIC_RELAXED); + u8 *rp = (u8 *)atomic_load(void)(&buf->read, AL_ATOMIC_RELAXED); + u8 *wp = (u8 *)atomic_load(void)(&buf->write, AL_ATOMIC_RELAXED); ptrdiff_t size; if (rp <= wp) { @@ -144,8 +144,8 @@ ptrdiff_t al_ring_buffer_peek(struct al_ring_buffer *buf, u8 *ptr, ptrdiff_t off ptrdiff_t al_ring_buffer_discard(struct al_ring_buffer *buf, ptrdiff_t n) { - u8 *rp = (u8 *)al_atomic_load(void)(&buf->read, AL_ATOMIC_ACQUIRE); - u8 *wp = (u8 *)al_atomic_load(void)(&buf->write, AL_ATOMIC_RELAXED); + u8 *rp = (u8 *)atomic_load(void)(&buf->read, AL_ATOMIC_ACQUIRE); + u8 *wp = (u8 *)atomic_load(void)(&buf->write, AL_ATOMIC_RELAXED); ptrdiff_t discard = MIN(((rp <= wp) ? wp : buf->end) - rp, n); rp += discard; @@ -156,7 +156,7 @@ ptrdiff_t al_ring_buffer_discard(struct al_ring_buffer *buf, ptrdiff_t n) discard += wrap; } - al_atomic_store(void)(&buf->read, rp, AL_ATOMIC_RELEASE); + atomic_store(void)(&buf->read, rp, AL_ATOMIC_RELEASE); return discard; } @@ -164,6 +164,6 @@ ptrdiff_t al_ring_buffer_discard(struct al_ring_buffer *buf, ptrdiff_t n) // Not thread-safe. void al_ring_buffer_reset(struct al_ring_buffer *buf) { - al_atomic_store(void)(&buf->read, buf->start, AL_ATOMIC_RELAXED); - al_atomic_store(void)(&buf->write, buf->start, AL_ATOMIC_RELAXED); + atomic_store(void)(&buf->read, buf->start, AL_ATOMIC_RELAXED); + atomic_store(void)(&buf->write, buf->start, AL_ATOMIC_RELAXED); } |