mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 15:17:01 +02:00
Code Issues Projects Releases Wiki Activity

DEV: haring: make haring not depend on the struct ring itself

Browse Source 
haring needs to be self-sufficient about the ring format so that it continues
to build when the ring API changes. Let's import the struct ring definition
and call it "ring_v1".
This commit is contained in:
Willy Tarreau 2024-03-04 19:04:09 +01:00
parent 758cb450a2
commit 4dddbb63a0
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dev/haring/haring.c
View File

@ -35,12 +35,19 @@
#include <haproxy/api.h> #include <haproxy/api.h>
#include <haproxy/buf.h> #include <haproxy/buf.h>
#include <haproxy/ring.h> #include <haproxy/ring-t.h>
#include <haproxy/thread.h>
int force = 0; // force access to a different layout int force = 0; // force access to a different layout
int lfremap = 0; // remap LF in traces int lfremap = 0; // remap LF in traces
int repair = 0; // repair file int repair = 0; // repair file
struct ring_v1 {
struct buffer buf; // storage area
struct list waiters; // list of waiters, for now, CLI "show event"
__decl_thread(HA_RWLOCK_T lock);
int readers_count;
};
/* display the message and exit with the code */ /* display the message and exit with the code */
__attribute__((noreturn)) void die(int code, const char *format, ...) __attribute__((noreturn)) void die(int code, const char *format, ...)
@ -78,7 +85,7 @@ __attribute__((noreturn)) void usage(int code, const char *arg0)
* called again, otherwise non-zero. It is meant to be used with * called again, otherwise non-zero. It is meant to be used with
* cli_release_show_ring() to clean up. * cli_release_show_ring() to clean up.
*/ */
int dump_ring(struct ring *ring, size_t ofs, int flags) int dump_ring(struct ring_v1 *ring, size_t ofs, int flags)
{ {
struct buffer buf; struct buffer buf;
uint64_t msg_len = 0; uint64_t msg_len = 0;
@ -212,7 +219,7 @@ int dump_ring(struct ring *ring, size_t ofs, int flags)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
struct ring *ring; void *ring;
struct stat statbuf; struct stat statbuf;
const char *arg0; const char *arg0;
int fd; int fd;