1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CLEANUP: applet/lua: create a dedicated ->fcn entry in hlua_cli context

Browse Source 
We have very few users of the appctx's private field which was introduced
prior to the split of the CLI. Unfortunately it was not removed after the
end. This commit simply introduces hlua_cli->fcn which is the pointer to
the Lua function that the Lua code used to store in this private pointer.
This commit is contained in:
Willy Tarreau 2016-12-14 15:41:45 +01:00
parent 8cf9c8e663
commit 8ae4f7533d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/types/applet.h
View File

@ -126,6 +126,7 @@ struct appctx {
struct {
struct hlua hlua;
struct task *task;
struct hlua_function *fcn;
} hlua_cli;
struct {
struct hlua hlua;

4
src/hlua.c
View File

@ -6620,8 +6620,8 @@ static int hlua_cli_parse_fct(char **args, struct appctx *appctx, void *private)
const char *error;
hlua = &appctx->ctx.hlua_cli.hlua;
appctx->ctx.hlua_cli.fcn = private;
fcn = private;
appctx->private = private;
/* Create task used by signal to wakeup applets.
* We use the same wakeup fonction than the Lua applet_tcp and
@ -6707,7 +6707,7 @@ static int hlua_cli_io_handler_fct(struct appctx *appctx)
hlua = &appctx->ctx.hlua_cli.hlua;
si = appctx->owner;
fcn = appctx->private;
fcn = appctx->ctx.hlua_cli.fcn;
/* If the stream is disconnect or closed, ldo nothing. */
if (unlikely(si->state == SI_ST_DIS || si->state == SI_ST_CLO))