mirror of
https://git.haproxy.org/git/haproxy.git/
synced 2025-09-21 22:01:31 +02:00
REORG: include: split common/xref.h into haproxy/xref{,-t}.h
The type is the only element needed by applet.h and hlua.h, while hlua.c needs the various functions. XREF_BUSY was placed into the types as well since it's better to have the special values there.
This commit is contained in:
parent
7cd8b6e3a4
commit
374b442cbc
45
include/haproxy/xref-t.h
Normal file
45
include/haproxy/xref-t.h
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
/*
|
||||||
|
* include/haproxy/xref-t.h
|
||||||
|
* Atomic cross-references between two elements - types
|
||||||
|
*
|
||||||
|
* Copyright (C) 2017 Thierry Fournier <thierry.fournier@ozon.io>
|
||||||
|
* Copyright (C) 2020 Willy Tarreau - w@1wt.eu
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining
|
||||||
|
* a copy of this software and associated documentation files (the
|
||||||
|
* "Software"), to deal in the Software without restriction, including
|
||||||
|
* without limitation the rights to use, copy, modify, merge, publish,
|
||||||
|
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||||
|
* permit persons to whom the Software is furnished to do so, subject to
|
||||||
|
* the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be
|
||||||
|
* included in all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||||
|
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||||
|
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||||
|
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||||
|
* OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
#ifndef __HAPROXY_XREF_T_H__
|
||||||
|
#define __HAPROXY_XREF_T_H__
|
||||||
|
|
||||||
|
/* xref is used to create relation between two elements.
|
||||||
|
* Once an element is released, it breaks the relation. If the
|
||||||
|
* relation is already broken, it frees the xref struct.
|
||||||
|
* The pointer between two elements is sort of a refcount with
|
||||||
|
* max value 1. The relation is only between two elements.
|
||||||
|
* The pointer and the type of elements a and b are conventional.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define XREF_BUSY ((struct xref *)1)
|
||||||
|
|
||||||
|
struct xref {
|
||||||
|
struct xref *peer;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif /* __HAPROXY_XREF_T_H__ */
|
@ -1,7 +1,35 @@
|
|||||||
#ifndef __XREF_H__
|
/*
|
||||||
#define __XREF_H__
|
* include/haproxy/xref.h
|
||||||
|
* Atomic cross-references between two elements - functions
|
||||||
|
*
|
||||||
|
* Copyright (C) 2017 Thierry Fournier <thierry.fournier@ozon.io>
|
||||||
|
* Copyright (C) 2020 Willy Tarreau - w@1wt.eu
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining
|
||||||
|
* a copy of this software and associated documentation files (the
|
||||||
|
* "Software"), to deal in the Software without restriction, including
|
||||||
|
* without limitation the rights to use, copy, modify, merge, publish,
|
||||||
|
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||||
|
* permit persons to whom the Software is furnished to do so, subject to
|
||||||
|
* the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be
|
||||||
|
* included in all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||||
|
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||||
|
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||||
|
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||||
|
* OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
#ifndef __HAPROXY_XREF_H__
|
||||||
|
#define __HAPROXY_XREF_H__
|
||||||
|
|
||||||
#include <haproxy/atomic.h>
|
#include <haproxy/atomic.h>
|
||||||
|
#include <haproxy/xref-t.h>
|
||||||
|
|
||||||
/* xref is used to create relation between two elements.
|
/* xref is used to create relation between two elements.
|
||||||
* Once an element is released, it breaks the relation. If the
|
* Once an element is released, it breaks the relation. If the
|
||||||
@ -11,12 +39,6 @@
|
|||||||
* The pointer and the type of elements a and b are conventional.
|
* The pointer and the type of elements a and b are conventional.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
struct xref {
|
|
||||||
struct xref *peer;
|
|
||||||
};
|
|
||||||
|
|
||||||
#define XREF_BUSY ((struct xref *)1)
|
|
||||||
|
|
||||||
static inline void xref_create(struct xref *xref_a, struct xref *xref_b)
|
static inline void xref_create(struct xref *xref_a, struct xref *xref_b)
|
||||||
{
|
{
|
||||||
xref_a->peer = xref_b;
|
xref_a->peer = xref_b;
|
||||||
@ -81,4 +103,4 @@ static inline void xref_disconnect(struct xref *xref, struct xref *peer)
|
|||||||
xref->peer = NULL;
|
xref->peer = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* __XREF_H__ */
|
#endif /* __HAPROXY_XREF_H__ */
|
@ -26,11 +26,11 @@
|
|||||||
#include <haproxy/buf.h>
|
#include <haproxy/buf.h>
|
||||||
#include <haproxy/dynbuf-t.h>
|
#include <haproxy/dynbuf-t.h>
|
||||||
#include <haproxy/freq_ctr-t.h>
|
#include <haproxy/freq_ctr-t.h>
|
||||||
|
#include <haproxy/xref-t.h>
|
||||||
#include <types/hlua.h>
|
#include <types/hlua.h>
|
||||||
#include <types/obj_type.h>
|
#include <types/obj_type.h>
|
||||||
#include <types/proxy.h>
|
#include <types/proxy.h>
|
||||||
#include <types/stream.h>
|
#include <types/stream.h>
|
||||||
#include <common/xref.h>
|
|
||||||
|
|
||||||
struct appctx;
|
struct appctx;
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
#include <lauxlib.h>
|
#include <lauxlib.h>
|
||||||
|
|
||||||
#include <haproxy/regex-t.h>
|
#include <haproxy/regex-t.h>
|
||||||
#include <common/xref.h>
|
#include <haproxy/xref-t.h>
|
||||||
|
|
||||||
#include <types/http_ana.h>
|
#include <types/http_ana.h>
|
||||||
#include <types/proxy.h>
|
#include <types/proxy.h>
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
#include <common/cfgparse.h>
|
#include <common/cfgparse.h>
|
||||||
#include <haproxy/thread.h>
|
#include <haproxy/thread.h>
|
||||||
#include <haproxy/regex.h>
|
#include <haproxy/regex.h>
|
||||||
#include <common/xref.h>
|
#include <haproxy/xref.h>
|
||||||
#include <common/h1.h>
|
#include <common/h1.h>
|
||||||
#include <common/standard.h>
|
#include <common/standard.h>
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user