mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 13:51:26 +02:00
Code Issues Projects Releases Wiki Activity

REORG: move applet.h to haproxy/applet{,-t}.h

Browse Source 
The type file was slightly tidied. The cli-specific APPCTX_CLI_ST1_* flag
definitions were moved to cli.h. The type file was adjusted to include
buf-t.h and not the huge buf.h. A few call places were fixed because they
did not need this include.
This commit is contained in:
Willy Tarreau 2020-06-04 19:42:41 +02:00
parent 8c42b8a147
commit 3f0f82e7a9
27 changed files with 44 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/prometheus-exporter/service-prometheus.c
View File

@ -14,6 +14,7 @@
*/
#include <haproxy/action-t.h>
#include <haproxy/applet.h>
#include <haproxy/api.h>
#include <common/cfgparse.h>
#include <haproxy/frontend.h>
@ -25,7 +26,6 @@
#include <haproxy/pool.h>
#include <haproxy/list.h>
#include <proto/applet.h>
#include <proto/backend.h>
#include <haproxy/compression.h>
#include <haproxy/pipe.h>

2
include/haproxy/action-t.h
View File

@ -24,7 +24,7 @@
#include <haproxy/regex-t.h>
#include <types/applet.h>
#include <haproxy/applet-t.h>
#include <haproxy/stick_table-t.h>
enum act_from {

24
include/types/applet.h → include/haproxy/applet-t.h
View File

@ -1,8 +1,8 @@
/*
* include/types/applet.h
* include/haproxy/applet-t.h
* This file describes the applet struct and associated constants.
*
* Copyright (C) 2000-2015 Willy Tarreau - w@1wt.eu
* Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -19,19 +19,23 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _TYPES_APPLET_H
#define _TYPES_APPLET_H
#ifndef _HAPROXY_APPLET_T_H
#define _HAPROXY_APPLET_T_H
#include <haproxy/api-t.h>
#include <haproxy/buf.h>
#include <haproxy/buf-t.h>
#include <haproxy/dynbuf-t.h>
#include <haproxy/freq_ctr-t.h>
#include <haproxy/hlua-t.h>
#include <haproxy/obj_type-t.h>
#include <haproxy/api-t.h>
#include <haproxy/xref-t.h>
#include <types/proxy.h>
#include <types/stream.h>
/* flags for appctx->state */
#define APPLET_WANT_DIE 0x01 /* applet was running and requested to die */
struct appctx;
/* Applet descriptor */
@ -46,12 +50,6 @@ struct applet {
unsigned int timeout; /* execution timeout. */
};
#define APPLET_WANT_DIE 0x01 /* applet was running and requested to die */
#define APPCTX_CLI_ST1_PROMPT (1 << 0)
#define APPCTX_CLI_ST1_PAYLOAD (1 << 1)
#define APPCTX_CLI_ST1_NOLF (1 << 2)
/* Context of a running applet. */
struct appctx {
enum obj_type obj_type; /* OBJ_TYPE_APPCTX */
@ -188,7 +186,7 @@ struct appctx {
} ctx; /* context-specific variables used by any applet */
};
#endif /* _TYPES_APPLET_H */
#endif /* _HAPROXY_APPLET_T_H */
/*
* Local variables:

13
include/proto/applet.h → include/haproxy/applet.h
View File

@ -1,5 +1,5 @@
/*
* include/proto/applet.h
* include/haproxy/applet.h
* This file contains applet function prototypes
*
* Copyright (C) 2000-2015 Willy Tarreau - w@1wt.eu
@ -19,22 +19,21 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _PROTO_APPLET_H
#define _PROTO_APPLET_H
#ifndef _HAPROXY_APPLET_H
#define _HAPROXY_APPLET_H
#include <stdlib.h>
#include <haproxy/applet-t.h>
#include <haproxy/api.h>
#include <haproxy/pool.h>
#include <haproxy/list.h>
#include <types/applet.h>
#include <haproxy/pool.h>
#include <haproxy/task.h>
extern unsigned int nb_applets;
extern struct pool_head *pool_head_appctx;
struct task *task_run_applet(struct task *t, void *context, unsigned short state);
int appctx_buf_available(void *arg);
@ -117,7 +116,7 @@ static inline void appctx_wakeup(struct appctx *appctx)
task_wakeup(appctx->t, TASK_WOKEN_OTHER);
}
#endif /* _PROTO_APPLET_H */
#endif /* _HAPROXY_APPLET_H */
/*
* Local variables:

2
include/haproxy/obj_type.h
View File

@ -22,13 +22,13 @@
#ifndef _HAPROXY_OBJ_TYPE_H
#define _HAPROXY_OBJ_TYPE_H
#include <haproxy/applet-t.h>
#include <haproxy/api.h>
#include <haproxy/check-t.h>
#include <haproxy/connection-t.h>
#include <haproxy/listener-t.h>
#include <haproxy/obj_type-t.h>
#include <haproxy/pool.h>
#include <types/applet.h>
#include <types/proxy.h>
#include <types/server.h>
#include <types/stream.h>

2
include/proto/cli.h
View File

@ -23,8 +23,8 @@
#ifndef _PROTO_CLI_H
#define _PROTO_CLI_H
#include <haproxy/applet-t.h>
#include <haproxy/global.h>
#include <types/applet.h>
#include <types/channel.h>
#include <types/cli.h>
#include <types/stream.h>

2
include/proto/proxy.h
View File

@ -22,11 +22,11 @@
#ifndef _PROTO_PROXY_H
#define _PROTO_PROXY_H
#include <haproxy/applet-t.h>
#include <haproxy/api.h>
#include <haproxy/listener-t.h>
#include <haproxy/ticks.h>
#include <haproxy/time.h>
#include <types/applet.h>
#include <haproxy/global-t.h>
#include <types/proxy.h>
#include <haproxy/freq_ctr.h>

2
include/proto/server.h
View File

@ -24,10 +24,10 @@
#include <unistd.h>
#include <haproxy/applet-t.h>
#include <haproxy/api.h>
#include <haproxy/dns-t.h>
#include <haproxy/time.h>
#include <types/applet.h>
#include <types/proxy.h>
#include <types/queue.h>
#include <types/server.h>

2
include/proto/stats.h
View File

@ -23,9 +23,9 @@
#ifndef _PROTO_STATS_H
#define _PROTO_STATS_H
#include <haproxy/applet-t.h>
#include <haproxy/tools.h>
#include <haproxy/api.h>
#include <types/applet.h>
#include <types/stream_interface.h>
#include <types/stats.h>

2
include/proto/stream_interface.h
View File

@ -24,11 +24,11 @@
#include <stdlib.h>
#include <haproxy/applet.h>
#include <haproxy/api.h>
#include <haproxy/connection.h>
#include <types/stream.h>
#include <types/stream_interface.h>
#include <proto/applet.h>
#include <proto/channel.h>

7
include/types/cli.h
View File

@ -20,8 +20,8 @@
#ifndef _TYPES_CLI_H
#define _TYPES_CLI_H
#include <haproxy/applet-t.h>
#include <haproxy/list-t.h>
#include <types/applet.h>
/* Access level for a stats socket */
#define ACCESS_LVL_NONE 0
@ -36,6 +36,11 @@
#define ACCESS_EXPERT 0x20 /* access to dangerous commands reserved to experts */
/* flags for appctx->st1 */
#define APPCTX_CLI_ST1_PROMPT (1 << 0)
#define APPCTX_CLI_ST1_PAYLOAD (1 << 1)
#define APPCTX_CLI_ST1_NOLF (1 << 2)
struct cli_kw {
const char *str_kw[5]; /* keywords ended by NULL, limited to 5
separated keywords combination */

2
src/applet.c
View File

@ -13,10 +13,10 @@
#include <stdio.h>
#include <stdlib.h>
#include <haproxy/applet.h>
#include <haproxy/api.h>
#include <haproxy/list.h>
#include <haproxy/task.h>
#include <proto/applet.h>
#include <proto/channel.h>
#include <proto/stream.h>
#include <proto/stream_interface.h>

2
src/cli.c
View File

@ -26,6 +26,7 @@
#include <net/if.h>
#include <haproxy/applet-t.h>
#include <haproxy/api.h>
#include <common/cfgparse.h>
#include <haproxy/check.h>
@ -45,7 +46,6 @@
#include <haproxy/version.h>
#include <haproxy/base64.h>
#include <types/applet.h>
#include <haproxy/global.h>
#include <types/stats.h>

1
src/dns.c
View File

@ -34,7 +34,6 @@
#include <haproxy/net_helper.h>
#include <haproxy/vars.h>
#include <types/applet.h>
#include <types/cli.h>
#include <haproxy/global.h>
#include <types/stats.h>

2
src/hlua.c
View File

@ -21,6 +21,7 @@
#error "Requires Lua 5.3 or later."
#endif
#include <haproxy/applet.h>
#include <haproxy/api.h>
#include <import/ebpttree.h>
@ -51,7 +52,6 @@
#include <types/stats.h>
#include <haproxy/arg.h>
#include <proto/applet.h>
#include <proto/channel.h>
#include <proto/cli.h>
#include <proto/stats.h>

2
src/log.c
View File

@ -24,6 +24,7 @@
#include <sys/time.h>
#include <sys/uio.h>
#include <haproxy/applet-t.h>
#include <haproxy/api.h>
#include <haproxy/frontend.h>
#include <haproxy/http.h>
@ -35,7 +36,6 @@
#include <haproxy/global.h>
#include <types/log.h>
#include <proto/applet.h>
#include <proto/cli.h>
#include <haproxy/fd.h>
#include <proto/log.h>

3
src/map.c
View File

@ -12,17 +12,16 @@
#include <stdio.h>
#include <haproxy/applet-t.h>
#include <haproxy/api.h>
#include <haproxy/map.h>
#include <haproxy/pattern.h>
#include <haproxy/regex.h>
#include <haproxy/tools.h>
#include <types/applet.h>
#include <types/cli.h>
#include <types/stats.h>
#include <proto/applet.h>
#include <haproxy/arg.h>
#include <proto/cli.h>
#include <proto/log.h>

2
src/peers.c
View File

@ -20,6 +20,7 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <haproxy/applet.h>
#include <haproxy/api.h>
#include <haproxy/dict.h>
#include <haproxy/frontend.h>
@ -35,7 +36,6 @@
#include <types/stats.h>
#include <proto/applet.h>
#include <proto/channel.h>
#include <proto/cli.h>
#include <haproxy/fd.h>

3
src/pool.c
View File

@ -11,8 +11,8 @@
*/
#include <errno.h>
#include <haproxy/applet-t.h>
#include <haproxy/api.h>
#include <types/applet.h>
#include <types/cli.h>
#include <haproxy/global.h>
#include <types/stats.h>
@ -25,7 +25,6 @@
#include <haproxy/activity-t.h>
#include <proto/applet.h>
#include <proto/cli.h>
#include <proto/channel.h>
#include <proto/log.h>

2
src/proxy.c
View File

@ -17,6 +17,7 @@
#include <sys/socket.h>
#include <sys/stat.h>
#include <haproxy/applet-t.h>
#include <haproxy/api.h>
#include <common/cfgparse.h>
#include <haproxy/errors.h>
@ -35,7 +36,6 @@
#include <types/cli.h>
#include <types/stats.h>
#include <proto/applet.h>
#include <proto/cli.h>
#include <proto/backend.h>
#include <haproxy/fd.h>

2
src/ring.c
View File

@ -19,10 +19,10 @@
*/
#include <stdlib.h>
#include <haproxy/applet.h>
#include <haproxy/api.h>
#include <haproxy/buf.h>
#include <haproxy/thread.h>
#include <types/applet.h>
#include <proto/cli.h>
#include <haproxy/ring.h>
#include <proto/stream_interface.h>

3
src/server.c
View File

@ -14,6 +14,7 @@
#include <ctype.h>
#include <errno.h>
#include <haproxy/applet-t.h>
#include <haproxy/api.h>
#include <import/xxhash.h>
@ -29,12 +30,10 @@
#include <haproxy/task.h>
#include <haproxy/time.h>
#include <types/applet.h>
#include <types/cli.h>
#include <types/cli.h>
#include <types/stats.h>
#include <proto/applet.h>
#include <proto/cli.h>
#include <haproxy/port_range.h>
#include <haproxy/protocol.h>

1
src/ssl_sock.c
View File

@ -67,7 +67,6 @@
#include <import/ebpttree.h>
#include <import/ebsttree.h>
#include <types/applet.h>
#include <types/cli.h>
#include <types/ssl_sock.h>
#include <types/stats.h>

2
src/stats.c
View File

@ -24,6 +24,7 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <haproxy/applet-t.h>
#include <haproxy/api.h>
#include <common/cfgparse.h>
#include <haproxy/check.h>
@ -49,7 +50,6 @@
#include <haproxy/version.h>
#include <haproxy/base64.h>
#include <types/applet.h>
#include <types/cli.h>
#include <types/stats.h>

2
src/stream.c
View File

@ -16,6 +16,7 @@
#include <haproxy/acl.h>
#include <haproxy/action.h>
#include <haproxy/applet.h>
#include <haproxy/api.h>
#include <haproxy/capture.h>
#include <common/cfgparse.h>
@ -37,7 +38,6 @@
#include <haproxy/tcp_rules.h>
#include <haproxy/vars.h>
#include <types/applet.h>
#include <types/cli.h>
#include <types/filters.h>
#include <types/stats.h>

2
src/stream_interface.c
View File

@ -19,6 +19,7 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <haproxy/applet.h>
#include <haproxy/api.h>
#include <haproxy/connection.h>
#include <haproxy/dynbuf.h>
@ -28,7 +29,6 @@
#include <haproxy/time.h>
#include <haproxy/task.h>
#include <proto/applet.h>
#include <proto/channel.h>
#include <haproxy/pipe.h>
#include <proto/proxy.h>

1
src/tools.c
View File

@ -48,7 +48,6 @@
#include <haproxy/namespace.h>
#include <haproxy/task.h>
#include <haproxy/tools.h>
#include <proto/applet.h>
#include <haproxy/proto_udp.h>
#include <proto/ssl_sock.h>
#include <proto/stream_interface.h>