mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 23:56:57 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: ring: remove the now unused ring's offset

Browse Source 
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:
Willy Tarreau 2023-02-22 15:15:41 +01:00
parent d9c7188633
commit a2a3d5dd25
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/haproxy/ring-t.h
View File

@ -98,7 +98,6 @@
struct ring { struct ring {
struct buffer buf; // storage area 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" struct list waiters; // list of waiters, for now, CLI "show event"
__decl_thread(HA_RWLOCK_T lock); __decl_thread(HA_RWLOCK_T lock);
int readers_count; int readers_count;

2
src/ring.c
View File

@ -42,7 +42,6 @@ void ring_init(struct ring *ring, void *area, size_t size)
HA_RWLOCK_INIT(&ring->lock); HA_RWLOCK_INIT(&ring->lock);
LIST_INIT(&ring->waiters); LIST_INIT(&ring->waiters);
ring->readers_count = 0; ring->readers_count = 0;
ring->ofs = 0;
ring->buf = b_make(area, size, 0, 0); ring->buf = b_make(area, size, 0, 0);
/* write the initial RC byte */ /* write the initial RC byte */
b_putchr(&ring->buf, 0); 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); BUG_ON(b_data(buf) < 1 + dellenlen + dellen);
b_del(buf, 1 + dellenlen + dellen); b_del(buf, 1 + dellenlen + dellen);
ring->ofs += 1 + dellenlen + dellen;
} }
/* OK now we do have room */ /* OK now we do have room */