mirror of
https://git.haproxy.org/git/haproxy.git/
synced 2025-08-07 15:47:01 +02:00
MINOR: lua: remove some #define
The #define compilation directives are centralized in the hlua include files. This permits to remove ome #ifdef from the haproxy main code.
This commit is contained in:
parent
5c49aeb1b0
commit
a718b29b6d
@ -1,13 +1,28 @@
|
|||||||
#ifndef _PROTO_HLUA_H
|
#ifndef _PROTO_HLUA_H
|
||||||
#define _PROTO_HLUA_H
|
#define _PROTO_HLUA_H
|
||||||
|
|
||||||
|
#ifdef USE_LUA
|
||||||
|
|
||||||
#include <lua.h>
|
#include <lua.h>
|
||||||
|
|
||||||
#include <types/hlua.h>
|
#include <types/hlua.h>
|
||||||
|
|
||||||
|
#define HLUA_INIT(__hlua) do { (__hlua)->T = 0; } while(0)
|
||||||
|
|
||||||
/* Lua HAProxy integration functions. */
|
/* Lua HAProxy integration functions. */
|
||||||
void hlua_ctx_destroy(struct hlua *lua);
|
void hlua_ctx_destroy(struct hlua *lua);
|
||||||
void hlua_init();
|
void hlua_init();
|
||||||
int hlua_post_init();
|
int hlua_post_init();
|
||||||
|
|
||||||
|
#else /* USE_LUA */
|
||||||
|
|
||||||
|
#define HLUA_INIT(__hlua)
|
||||||
|
|
||||||
|
/* Empty function for compilation without Lua. */
|
||||||
|
static inline void hlua_init() { }
|
||||||
|
static inline int hlua_post_init() { return 1; }
|
||||||
|
static inline void hlua_ctx_destroy() { }
|
||||||
|
|
||||||
|
#endif /* USE_LUA */
|
||||||
|
|
||||||
#endif /* _PROTO_HLUA_H */
|
#endif /* _PROTO_HLUA_H */
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
#ifndef _TYPES_HLUA_H
|
#ifndef _TYPES_HLUA_H
|
||||||
#define _TYPES_HLUA_H
|
#define _TYPES_HLUA_H
|
||||||
|
|
||||||
|
#ifdef USE_LUA
|
||||||
|
|
||||||
#include <lua.h>
|
#include <lua.h>
|
||||||
#include <lauxlib.h>
|
#include <lauxlib.h>
|
||||||
|
|
||||||
@ -121,4 +123,12 @@ struct hlua_channel {
|
|||||||
struct channel *chn;
|
struct channel *chn;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#else /* USE_LUA */
|
||||||
|
|
||||||
|
/* Empty struct for compilation compatibility */
|
||||||
|
struct hlua { };
|
||||||
|
struct hlua_socket { };
|
||||||
|
|
||||||
|
#endif /* USE_LUA */
|
||||||
|
|
||||||
#endif /* _TYPES_HLUA_H */
|
#endif /* _TYPES_HLUA_H */
|
||||||
|
@ -33,10 +33,7 @@
|
|||||||
|
|
||||||
#include <types/channel.h>
|
#include <types/channel.h>
|
||||||
#include <types/compression.h>
|
#include <types/compression.h>
|
||||||
|
|
||||||
#ifdef USE_LUA
|
|
||||||
#include <types/hlua.h>
|
#include <types/hlua.h>
|
||||||
#endif
|
|
||||||
#include <types/obj_type.h>
|
#include <types/obj_type.h>
|
||||||
#include <types/proto_http.h>
|
#include <types/proto_http.h>
|
||||||
#include <types/proxy.h>
|
#include <types/proxy.h>
|
||||||
@ -164,9 +161,7 @@ struct session {
|
|||||||
struct list *current_rule_list; /* this is used to store the current executed rule list. */
|
struct list *current_rule_list; /* this is used to store the current executed rule list. */
|
||||||
struct list *current_rule; /* this is used to store the current rule to be resumed. */
|
struct list *current_rule; /* this is used to store the current rule to be resumed. */
|
||||||
|
|
||||||
#ifdef USE_LUA
|
|
||||||
struct hlua hlua; /* lua runtime context */
|
struct hlua hlua; /* lua runtime context */
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* _TYPES_SESSION_H */
|
#endif /* _TYPES_SESSION_H */
|
||||||
|
@ -27,9 +27,7 @@
|
|||||||
|
|
||||||
#include <types/channel.h>
|
#include <types/channel.h>
|
||||||
#include <types/connection.h>
|
#include <types/connection.h>
|
||||||
#ifdef USE_LUA
|
|
||||||
#include <types/hlua.h>
|
#include <types/hlua.h>
|
||||||
#endif
|
|
||||||
#include <types/obj_type.h>
|
#include <types/obj_type.h>
|
||||||
#include <common/config.h>
|
#include <common/config.h>
|
||||||
|
|
||||||
@ -153,14 +151,12 @@ struct appctx {
|
|||||||
struct pattern_expr *expr;
|
struct pattern_expr *expr;
|
||||||
struct chunk chunk;
|
struct chunk chunk;
|
||||||
} map;
|
} map;
|
||||||
#ifdef USE_LUA
|
|
||||||
struct {
|
struct {
|
||||||
int connected;
|
int connected;
|
||||||
struct hlua_socket *socket;
|
struct hlua_socket *socket;
|
||||||
struct list wake_on_read;
|
struct list wake_on_read;
|
||||||
struct list wake_on_write;
|
struct list wake_on_write;
|
||||||
} hlua;
|
} hlua;
|
||||||
#endif
|
|
||||||
} ctx; /* used by stats I/O handlers to dump the stats */
|
} ctx; /* used by stats I/O handlers to dump the stats */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -88,9 +88,7 @@
|
|||||||
#include <proto/connection.h>
|
#include <proto/connection.h>
|
||||||
#include <proto/fd.h>
|
#include <proto/fd.h>
|
||||||
#include <proto/hdr_idx.h>
|
#include <proto/hdr_idx.h>
|
||||||
#ifdef USE_LUA
|
|
||||||
#include <proto/hlua.h>
|
#include <proto/hlua.h>
|
||||||
#endif
|
|
||||||
#include <proto/listener.h>
|
#include <proto/listener.h>
|
||||||
#include <proto/log.h>
|
#include <proto/log.h>
|
||||||
#include <proto/pattern.h>
|
#include <proto/pattern.h>
|
||||||
@ -567,10 +565,8 @@ void init(int argc, char **argv)
|
|||||||
init_pendconn();
|
init_pendconn();
|
||||||
init_proto_http();
|
init_proto_http();
|
||||||
|
|
||||||
#ifdef USE_LUA
|
|
||||||
/* Initialise lua. */
|
/* Initialise lua. */
|
||||||
hlua_init();
|
hlua_init();
|
||||||
#endif
|
|
||||||
|
|
||||||
global.tune.options |= GTUNE_USE_SELECT; /* select() is always available */
|
global.tune.options |= GTUNE_USE_SELECT; /* select() is always available */
|
||||||
#if defined(ENABLE_POLL)
|
#if defined(ENABLE_POLL)
|
||||||
@ -1064,10 +1060,8 @@ void init(int argc, char **argv)
|
|||||||
if (!global.node)
|
if (!global.node)
|
||||||
global.node = strdup(hostname);
|
global.node = strdup(hostname);
|
||||||
|
|
||||||
#ifdef USE_LUA
|
|
||||||
if (!hlua_post_init())
|
if (!hlua_post_init())
|
||||||
exit(1);
|
exit(1);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void deinit_acl_cond(struct acl_cond *cond)
|
static void deinit_acl_cond(struct acl_cond *cond)
|
||||||
|
@ -526,6 +526,9 @@ int hlua_ctx_init(struct hlua *lua, struct task *task)
|
|||||||
*/
|
*/
|
||||||
void hlua_ctx_destroy(struct hlua *lua)
|
void hlua_ctx_destroy(struct hlua *lua)
|
||||||
{
|
{
|
||||||
|
if (!lua->T)
|
||||||
|
return;
|
||||||
|
|
||||||
/* Remove context. */
|
/* Remove context. */
|
||||||
hlua_delhlua(lua);
|
hlua_delhlua(lua);
|
||||||
|
|
||||||
|
@ -33,9 +33,7 @@
|
|||||||
#include <proto/freq_ctr.h>
|
#include <proto/freq_ctr.h>
|
||||||
#include <proto/frontend.h>
|
#include <proto/frontend.h>
|
||||||
#include <proto/hdr_idx.h>
|
#include <proto/hdr_idx.h>
|
||||||
#ifdef USE_LUA
|
|
||||||
#include <proto/hlua.h>
|
#include <proto/hlua.h>
|
||||||
#endif
|
|
||||||
#include <proto/listener.h>
|
#include <proto/listener.h>
|
||||||
#include <proto/log.h>
|
#include <proto/log.h>
|
||||||
#include <proto/raw_sock.h>
|
#include <proto/raw_sock.h>
|
||||||
@ -544,9 +542,7 @@ int session_complete(struct session *s)
|
|||||||
txn->req.chn = s->req;
|
txn->req.chn = s->req;
|
||||||
txn->rsp.chn = s->rep;
|
txn->rsp.chn = s->rep;
|
||||||
|
|
||||||
#ifdef USE_LUA
|
HLUA_INIT(&s->hlua);
|
||||||
s->hlua.T = NULL;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* finish initialization of the accepted file descriptor */
|
/* finish initialization of the accepted file descriptor */
|
||||||
conn_data_want_recv(conn);
|
conn_data_want_recv(conn);
|
||||||
@ -635,10 +631,7 @@ static void session_free(struct session *s)
|
|||||||
if (!LIST_ISEMPTY(&buffer_wq))
|
if (!LIST_ISEMPTY(&buffer_wq))
|
||||||
session_offer_buffers();
|
session_offer_buffers();
|
||||||
|
|
||||||
#ifdef USE_LUA
|
|
||||||
if (s->hlua.T)
|
|
||||||
hlua_ctx_destroy(&s->hlua);
|
hlua_ctx_destroy(&s->hlua);
|
||||||
#endif
|
|
||||||
|
|
||||||
pool_free2(pool2_channel, s->req);
|
pool_free2(pool2_channel, s->req);
|
||||||
pool_free2(pool2_channel, s->rep);
|
pool_free2(pool2_channel, s->rep);
|
||||||
|
Loading…
Reference in New Issue
Block a user