upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-02-20 16:30:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

MINOR: ring: re-work ring attach generic API.

Browse source 
Attach is now independent on appctx, which was unused anyway.
This commit is contained in:
Emeric Brun 2020-05-28 14:39:30 +02:00 committed by Willy Tarreau
parent 6fab3e6d91
commit dcd58afaf1
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/proto/ring.h
View file

@ -30,7 +30,7 @@ struct ring *ring_new(size_t size);
struct ring *ring_resize(struct ring *ring, size_t size);
void ring_free(struct ring *ring);
ssize_t ring_write(struct ring *ring, size_t maxlen, const struct ist pfx[], size_t npfx, const struct ist msg[], size_t nmsg);
int ring_attach_appctx(struct ring *ring, struct appctx *appctx);
int ring_attach(struct ring *ring);
void ring_detach_appctx(struct ring *ring, struct appctx *appctx, size_t ofs);
int ring_attach_cli(struct ring *ring, struct appctx *appctx);
int cli_io_handler_show_ring(struct appctx *appctx);

4
src/ring.c
View file

@ -206,7 +206,7 @@ ssize_t ring_write(struct ring *ring, size_t maxlen, const struct ist pfx[], siz
* already attached. On success, the caller MUST call ring_detach_appctx()
* to detach itself, even if it was never woken up.
*/
int ring_attach_appctx(struct ring *ring, struct appctx *appctx)
int ring_attach(struct ring *ring)
{
int users = ring->readers_count;
@ -245,7 +245,7 @@ void ring_detach_appctx(struct ring *ring, struct appctx *appctx, size_t ofs)
*/
int ring_attach_cli(struct ring *ring, struct appctx *appctx)
{
if (!ring_attach_appctx(ring, appctx))
if (!ring_attach(ring))
return cli_err(appctx,
"Sorry, too many watchers (255) on this ring buffer. "
"What could it have so interesting to attract so many watchers ?");