RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-10 15:38:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

MEDIUM: lua: Lua initialisation "on demand"

Browse Source 
Actually, the Lua context is always initilized in each
session, even if the session doesn't use Lua. This
behavior cause 5% performances loss.

This patch initilize the Lua only if it is use by the
session. The initialization is now on demand.
This commit is contained in:
Thierry FOURNIER 2015-02-27 18:37:27 +01:00 committed by Willy Tarreau
parent 80f5fae591
commit 05ac42455f
2 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/hlua.c
View File

@ -2709,6 +2709,18 @@ static int hlua_sample_conv_wrapper(struct session *session, const struct arg *a
{
struct hlua_function *fcn = (struct hlua_function *)private;
/* In the execution wrappers linked with a session, the
* Lua context can be not initialized. This behavior
* permits to save performances because a systematic
* Lua initialization cause 5% performances loss.
*/
if (!session->hlua.T && !hlua_ctx_init(&session->hlua, session->task)) {
send_log(session->be, LOG_ERR, "Lua converter '%s': can't initialize Lua context.", fcn->name);
if (!(global.mode & MODE_QUIET) || (global.mode & MODE_VERBOSE))
Alert("Lua converter '%s': can't initialize Lua context.\n", fcn->name);
return 0;
}
/* If it is the first run, initialize the data for the call. */
if (session->hlua.state == HLUA_STOP) {
/* Check stack available size. */
@ -2796,6 +2808,18 @@ static int hlua_sample_fetch_wrapper(struct proxy *px, struct session *s, void *
{
struct hlua_function *fcn = (struct hlua_function *)private;
/* In the execution wrappers linked with a session, the
* Lua context can be not initialized. This behavior
* permits to save performances because a systematic
* Lua initialization cause 5% performances loss.
*/
if (!s->hlua.T && !hlua_ctx_init(&s->hlua, s->task)) {
send_log(s->be, LOG_ERR, "Lua sample-fetch '%s': can't initialize Lua context.", fcn->name);
if (!(global.mode & MODE_QUIET) || (global.mode & MODE_VERBOSE))
Alert("Lua sample-fetch '%s': can't initialize Lua context.\n", fcn->name);
return 0;
}
/* If it is the first run, initialize the data for the call. */
if (s->hlua.state == HLUA_STOP) {
/* Check stack available size. */
@ -3063,6 +3087,18 @@ static int hlua_request_act_wrapper(struct hlua_rule *rule, struct proxy *px,
{
char **arg;
/* In the execution wrappers linked with a session, the
* Lua context can be not initialized. This behavior
* permits to save performances because a systematic
* Lua initialization cause 5% performances loss.
*/
if (!s->hlua.T && !hlua_ctx_init(&s->hlua, s->task)) {
send_log(px, LOG_ERR, "Lua action '%s': can't initialize Lua context.", rule->fcn.name);
if (!(global.mode & MODE_QUIET) || (global.mode & MODE_VERBOSE))
Alert("Lua action '%s': can't initialize Lua context.\n", rule->fcn.name);
return 0;
}
/* If it is the first run, initialize the data for the call. */
if (s->hlua.state == HLUA_STOP) {
/* Check stack available size. */

13
src/session.c
View File

@ -545,8 +545,7 @@ int session_complete(struct session *s)
txn->rsp.chn = s->rep;
#ifdef USE_LUA
if (!hlua_ctx_init(&s->hlua, s->task))
goto out_free_rep;
s->hlua.T = NULL;
#endif
/* finish initialization of the accepted file descriptor */
@ -557,7 +556,7 @@ int session_complete(struct session *s)
* finished (=0, eg: monitoring), in both situations,
* we can release everything and close.
*/
goto out_free_lua;
goto out_free_rep;
}
/* if logs require transport layer information, note it on the connection */
@ -575,11 +574,6 @@ int session_complete(struct session *s)
return 1;
/* Error unrolling */
out_free_lua:
#ifdef USE_LUA
hlua_ctx_destroy(&s->hlua);
#endif
out_free_rep:
pool_free2(pool2_channel, s->rep);
out_free_req:
@ -642,7 +636,8 @@ static void session_free(struct session *s)
session_offer_buffers();
#ifdef USE_LUA
hlua_ctx_destroy(&s->hlua);
if (s->hlua.T)
hlua_ctx_destroy(&s->hlua);
#endif
pool_free2(pool2_channel, s->req);