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

CLEANUP: applet: rename struct si_applet to applet

Browse Source 
Since this one does not depend on stream_interface anymore, remove the
"si_" prefix.
This commit is contained in:
Willy Tarreau 2015-04-13 13:50:30 +02:00
parent 8a8d83b85c
commit 3057645b37
10 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/proto/applet.h
View File

@ -42,7 +42,7 @@ static inline void appctx_init(struct appctx *appctx)
* pool_free2(connection) or appctx_free(), since it's allocated from the * pool_free2(connection) or appctx_free(), since it's allocated from the
* connection pool. <applet> is assigned as the applet, but it can be NULL. * connection pool. <applet> is assigned as the applet, but it can be NULL.
*/ */
static inline struct appctx *appctx_new(struct si_applet *applet) static inline struct appctx *appctx_new(struct applet *applet)
{ {
struct appctx *appctx; struct appctx *appctx;

2
include/proto/dumpstats.h
View File

@ -54,7 +54,7 @@ enum {
#define STAT_SCOPE_INPUT_NAME "scope" /* pattern form scope name <input> in html form */ #define STAT_SCOPE_INPUT_NAME "scope" /* pattern form scope name <input> in html form */
#define STAT_SCOPE_PATTERN "?" STAT_SCOPE_INPUT_NAME "=" #define STAT_SCOPE_PATTERN "?" STAT_SCOPE_INPUT_NAME "="
extern struct si_applet http_stats_applet; extern struct applet http_stats_applet;
void stats_io_handler(struct stream_interface *si); void stats_io_handler(struct stream_interface *si);

6
include/proto/obj_type.h
View File

@ -95,12 +95,12 @@ static inline struct server *objt_server(enum obj_type *t)
return __objt_server(t); return __objt_server(t);
} }
static inline struct si_applet *__objt_applet(enum obj_type *t) static inline struct applet *__objt_applet(enum obj_type *t)
{ {
return container_of(t, struct si_applet, obj_type); return container_of(t, struct applet, obj_type);
} }
static inline struct si_applet *objt_applet(enum obj_type *t) static inline struct applet *objt_applet(enum obj_type *t)
{ {
if (!t || *t != OBJ_TYPE_APPLET) if (!t || *t != OBJ_TYPE_APPLET)
return NULL; return NULL;

4
include/proto/stream_interface.h
View File

@ -44,7 +44,7 @@ extern struct si_ops si_conn_ops;
extern struct data_cb si_conn_cb; extern struct data_cb si_conn_cb;
extern struct data_cb si_idle_conn_cb; extern struct data_cb si_idle_conn_cb;
struct appctx *stream_int_register_handler(struct stream_interface *si, struct si_applet *app); struct appctx *stream_int_register_handler(struct stream_interface *si, struct applet *app);
void stream_int_unregister_handler(struct stream_interface *si); void stream_int_unregister_handler(struct stream_interface *si);
/* returns the channel which receives data from this stream interface (input channel) */ /* returns the channel which receives data from this stream interface (input channel) */
@ -274,7 +274,7 @@ static inline struct connection *si_alloc_conn(struct stream_interface *si, int
* and returned. NULL may be returned upon memory shortage. Applet <applet> * and returned. NULL may be returned upon memory shortage. Applet <applet>
* is assigned to the appctx, but it may be NULL. * is assigned to the appctx, but it may be NULL.
*/ */
static inline struct appctx *si_alloc_appctx(struct stream_interface *si, struct si_applet *applet) static inline struct appctx *si_alloc_appctx(struct stream_interface *si, struct applet *applet)
{ {
struct appctx *appctx; struct appctx *appctx;

4
include/types/applet.h
View File

@ -30,7 +30,7 @@
struct appctx; struct appctx;
/* Applet descriptor */ /* Applet descriptor */
struct si_applet { struct applet {
enum obj_type obj_type; /* object type = OBJ_TYPE_APPLET */ enum obj_type obj_type; /* object type = OBJ_TYPE_APPLET */
/* 3 unused bytes here */ /* 3 unused bytes here */
char *name; /* applet's name to report in logs */ char *name; /* applet's name to report in logs */
@ -45,7 +45,7 @@ struct appctx {
unsigned int st0; /* CLI state for stats, session state for peers */ unsigned int st0; /* CLI state for stats, session state for peers */
unsigned int st1; /* prompt for stats, session error for peers */ unsigned int st1; /* prompt for stats, session error for peers */
unsigned int st2; /* output state for stats, unused by peers */ unsigned int st2; /* output state for stats, unused by peers */
struct si_applet *applet; /* applet this context refers to */ struct applet *applet; /* applet this context refers to */
void *owner; /* pointer to upper layer's entity (eg: stream interface) */ void *owner; /* pointer to upper layer's entity (eg: stream interface) */
union { union {

2
include/types/obj_type.h
View File

@ -36,7 +36,7 @@ enum obj_type {
OBJ_TYPE_LISTENER, /* object is a struct listener */ OBJ_TYPE_LISTENER, /* object is a struct listener */
OBJ_TYPE_PROXY, /* object is a struct proxy */ OBJ_TYPE_PROXY, /* object is a struct proxy */
OBJ_TYPE_SERVER, /* object is a struct server */ OBJ_TYPE_SERVER, /* object is a struct server */
OBJ_TYPE_APPLET, /* object is a struct si_applet */ OBJ_TYPE_APPLET, /* object is a struct applet */
OBJ_TYPE_APPCTX, /* object is a struct appctx */ OBJ_TYPE_APPCTX, /* object is a struct appctx */
OBJ_TYPE_CONN, /* object is a struct connection */ OBJ_TYPE_CONN, /* object is a struct connection */
OBJ_TYPE_ENTRIES /* last one : number of entries */ OBJ_TYPE_ENTRIES /* last one : number of entries */

6
src/dumpstats.c
View File

@ -164,7 +164,7 @@ static void cli_release_handler(struct appctx *appctx);
* -> stats_dump_html_end() // emits HTML trailer * -> stats_dump_html_end() // emits HTML trailer
*/ */
static struct si_applet cli_applet; static struct applet cli_applet;
static const char stats_sock_usage_msg[] = static const char stats_sock_usage_msg[] =
"Unknown command. Please enter one of the following commands only :\n" "Unknown command. Please enter one of the following commands only :\n"
@ -6217,14 +6217,14 @@ static int bind_parse_level(char **args, int cur_arg, struct proxy *px, struct b
return 0; return 0;
} }
struct si_applet http_stats_applet = { struct applet http_stats_applet = {
.obj_type = OBJ_TYPE_APPLET, .obj_type = OBJ_TYPE_APPLET,
.name = "<STATS>", /* used for logging */ .name = "<STATS>", /* used for logging */
.fct = http_stats_io_handler, .fct = http_stats_io_handler,
.release = NULL, .release = NULL,
}; };
static struct si_applet cli_applet = { static struct applet cli_applet = {
.obj_type = OBJ_TYPE_APPLET, .obj_type = OBJ_TYPE_APPLET,
.name = "<CLI>", /* used for logging */ .name = "<CLI>", /* used for logging */
.fct = cli_io_handler, .fct = cli_io_handler,

2
src/hlua.c
View File

@ -2024,7 +2024,7 @@ static int hlua_socket_getsockname(struct lua_State *L)
} }
/* This struct define the applet. */ /* This struct define the applet. */
static struct si_applet update_applet = { static struct applet update_applet = {
.obj_type = OBJ_TYPE_APPLET, .obj_type = OBJ_TYPE_APPLET,
.name = "<LUA_TCP>", .name = "<LUA_TCP>",
.fct = hlua_socket_handler, .fct = hlua_socket_handler,

2
src/peers.c
View File

@ -1055,7 +1055,7 @@ full:
goto out; goto out;
} }
static struct si_applet peer_applet = { static struct applet peer_applet = {
.obj_type = OBJ_TYPE_APPLET, .obj_type = OBJ_TYPE_APPLET,
.name = "<PEER>", /* used for logging */ .name = "<PEER>", /* used for logging */
.fct = peer_io_handler, .fct = peer_io_handler,

2
src/stream_interface.c
View File

@ -372,7 +372,7 @@ static void stream_int_chk_snd(struct stream_interface *si)
* function itself. It also pre-initializes the applet's context and * function itself. It also pre-initializes the applet's context and
* returns it (or NULL in case it could not be allocated). * returns it (or NULL in case it could not be allocated).
*/ */
struct appctx *stream_int_register_handler(struct stream_interface *si, struct si_applet *app) struct appctx *stream_int_register_handler(struct stream_interface *si, struct applet *app)
{ {
struct appctx *appctx; struct appctx *appctx;