--- libelwix/src/ring.c 2026/02/10 17:24:39 1.4.4.2 +++ libelwix/src/ring.c 2026/02/11 13:36:09 1.6 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: ring.c,v 1.4.4.2 2026/02/10 17:24:39 misho Exp $ +* $Id: ring.c,v 1.6 2026/02/11 13:36:09 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -284,6 +284,7 @@ lrb_purge(lrbuf_t *lrb) atomic_store_explicit((atomic_int*) &lrb->lrb_head, 0, memory_order_relaxed); atomic_store_explicit((atomic_int*) &lrb->lrb_tail, 0, memory_order_relaxed); + atomic_store_explicit((atomic_int*) &lrb->lrb_full, 0, memory_order_relaxed); } /* @@ -323,14 +324,35 @@ lrb_isfull(lrbuf_t *lrb) return 0; t = atomic_load_explicit((atomic_int*) &lrb->lrb_tail, memory_order_acquire); - h = atomic_load_explicit((atomic_int*) &lrb->lrb_head, memory_order_relaxed) + 1; - if (h >= lrb->lrb_size) - h ^= h; - + h = atomic_load_explicit((atomic_int*) &lrb->lrb_head, memory_order_acquire); return (h == t); } /* + * lrb_getw() - Get address for write + * + * @lrb = Linear ring buffer + * @len = Return available buffer length for write + * return: NULL error or !=NULL pointer for write + * remark: After use of lrb_getw() and write to pointer. + * You should update ring buffer with lrb_enqueue(,NULL,wrote_len,) + */ +void * +lrb_getw(lrbuf_t *lrb, size_t *len) +{ + int h; + + if (!lrb || !lrb->lrb_data || !lrb->lrb_size) + return NULL; + + h = atomic_load_explicit((atomic_int*) &lrb->lrb_head, memory_order_relaxed); + if (len) + *len = lrb->lrb_size - h; + + return (lrb->lrb_data + h); +} + +/* * lrb_enqueue() - Enqueue data to buffer * * @lrb = Linear ring buffer @@ -342,7 +364,7 @@ lrb_isfull(lrbuf_t *lrb) int lrb_enqueue(lrbuf_t *lrb, void *data, size_t len, int lost) { - int h, t, n, t2, unused, drop = 0; + int h, t = 0, n, t2 = 0, unused, drop = 0; if (!lrb || !lrb->lrb_data) return -1; @@ -366,11 +388,14 @@ lrb_enqueue(lrbuf_t *lrb, void *data, size_t len, int h = atomic_load_explicit((atomic_int*) &lrb->lrb_head, memory_order_relaxed); n = lrb->lrb_size - h; if (len < n) { - memcpy(lrb->lrb_data + h, data, len); + if (data) + memcpy(lrb->lrb_data + h, data, len); n = h + len; } else { - memcpy(lrb->lrb_data + h, data, n); - memcpy(lrb->lrb_data, data + n, len - n); + if (data) { + memcpy(lrb->lrb_data + h, data, n); + memcpy(lrb->lrb_data, data + n, len - n); + } n = len - n; } @@ -392,6 +417,30 @@ lrb_enqueue(lrbuf_t *lrb, void *data, size_t len, int } /* + * lrb_getr() - Get address for read + * + * @lrb = Linear ring buffer + * @len = Return available data length for read + * return: NULL error or !=NULL pointer for read + * remark: After use of lrb_getr() and read from pointer. + * You could update ring buffer with lrb_dequeue(,NULL,read_len) + */ +void * +lrb_getr(lrbuf_t *lrb, size_t *len) +{ + int t; + + if (!lrb || !lrb->lrb_data || !lrb->lrb_size) + return NULL; + + t = atomic_load_explicit((atomic_int*) &lrb->lrb_tail, memory_order_acquire); + if (len) + lrb_queued(lrb, *len); + + return (lrb->lrb_data + t); +} + +/* * lrb_dequeue() - Dequeue data from buffer * * @lrb = Linear ring buffer @@ -402,7 +451,7 @@ lrb_enqueue(lrbuf_t *lrb, void *data, size_t len, int int lrb_dequeue(lrbuf_t *lrb, void *data, size_t len) { - int h, t, t2, n, l; + int h, t, t2, n, l, f; if (!lrb) return -1; @@ -414,12 +463,16 @@ lrb_dequeue(lrbuf_t *lrb, void *data, size_t len) while (42) { t = atomic_load_explicit((atomic_int*) &lrb->lrb_tail, memory_order_acquire); h = atomic_load_explicit((atomic_int*) &lrb->lrb_head, memory_order_acquire); + f = atomic_load_explicit((atomic_int*) &lrb->lrb_full, memory_order_acquire); l = h - t; if (l < 0) l += lrb->lrb_size; - if (!l) - return 0; + if (!l) { + if (!f) + return 0; + l = lrb->lrb_size; + } if (l > len) l = len;