mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2025-01-04 19:19:33 +00:00
CLEANUP: ring: remove the now unused ring's offset
Since the previous patch, the ring's offset is not used anymore. The haring utility remains backward-compatible since it can trust the buffer element that's at the beginning of the map and which still contains all the valid data.
This commit is contained in:
parent
d9c7188633
commit
a2a3d5dd25
@ -98,7 +98,6 @@
|
||||
|
||||
struct ring {
|
||||
struct buffer buf; // storage area
|
||||
size_t ofs; // absolute offset in history of the buffer's head
|
||||
struct list waiters; // list of waiters, for now, CLI "show event"
|
||||
__decl_thread(HA_RWLOCK_T lock);
|
||||
int readers_count;
|
||||
|
@ -42,7 +42,6 @@ void ring_init(struct ring *ring, void *area, size_t size)
|
||||
HA_RWLOCK_INIT(&ring->lock);
|
||||
LIST_INIT(&ring->waiters);
|
||||
ring->readers_count = 0;
|
||||
ring->ofs = 0;
|
||||
ring->buf = b_make(area, size, 0, 0);
|
||||
/* write the initial RC byte */
|
||||
b_putchr(&ring->buf, 0);
|
||||
@ -221,7 +220,6 @@ ssize_t ring_write(struct ring *ring, size_t maxlen, const struct ist pfx[], siz
|
||||
BUG_ON(b_data(buf) < 1 + dellenlen + dellen);
|
||||
|
||||
b_del(buf, 1 + dellenlen + dellen);
|
||||
ring->ofs += 1 + dellenlen + dellen;
|
||||
}
|
||||
|
||||
/* OK now we do have room */
|
||||
|
Loading…
Reference in New Issue
Block a user