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

MEDIUM: lua: change the objects configuration

Browse Source 
Actually an object is just a userdata value with a metatable.
This mode causes some problems like I can't add lua own data.
This new model uses an array as object base, and affect the
userdata at the index 0.
This commit is contained in:
Thierry FOURNIER 2015-03-11 17:43:33 +01:00 committed by Willy Tarreau
parent a2d8c650c1
commit 2297bc2fb9
1 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/hlua.c
View File

@ -182,12 +182,8 @@ __LJMP static inline void check_args(lua_State *L, int nb, char *fcn)
/* Return true if the data in stack[<ud>] is an object of /* Return true if the data in stack[<ud>] is an object of
* type <class_ref>. * type <class_ref>.
*/ */
static int hlua_udataistype(lua_State *L, int ud, int class_ref) static int hlua_metaistype(lua_State *L, int ud, int class_ref)
{ {
void *p = lua_touserdata(L, ud);
if (!p)
return 0;
if (!lua_getmetatable(L, ud)) if (!lua_getmetatable(L, ud))
return 0; return 0;
@ -204,9 +200,24 @@ static int hlua_udataistype(lua_State *L, int ud, int class_ref)
/* Return an object of the expected type, or throws an error. */ /* Return an object of the expected type, or throws an error. */
__LJMP static void *hlua_checkudata(lua_State *L, int ud, int class_ref) __LJMP static void *hlua_checkudata(lua_State *L, int ud, int class_ref)
{ {
if (!hlua_udataistype(L, ud, class_ref)) void *p;
WILL_LJMP(luaL_argerror(L, 1, NULL));
return lua_touserdata(L, ud); /* Check if the stack entry is an array. */
if (!lua_istable(L, ud))
WILL_LJMP(luaL_argerror(L, ud, NULL));
/* Check if the metadata have the expected type. */
if (!hlua_metaistype(L, ud, class_ref))
WILL_LJMP(luaL_argerror(L, ud, NULL));
/* Push on the stack at the entry [0] of the table. */
lua_rawgeti(L, ud, 0);
/* Check if this entry is userdata. */
p = lua_touserdata(L, -1);
if (!p)
WILL_LJMP(luaL_argerror(L, ud, NULL));
/* Remove the entry returned by lua_rawgeti(). */
lua_pop(L, 1);
/* Return the associated struct. */
return p;
} }
/* This fucntion push an error string prefixed by the file name /* This fucntion push an error string prefixed by the file name
@ -1743,12 +1754,15 @@ __LJMP static int hlua_socket_new(lua_State *L)
struct appctx *appctx; struct appctx *appctx;
/* Check stack size. */ /* Check stack size. */
if (!lua_checkstack(L, 2)) { if (!lua_checkstack(L, 3)) {
hlua_pusherror(L, "socket: full stack"); hlua_pusherror(L, "socket: full stack");
goto out_fail_conf; goto out_fail_conf;
} }
/* Create the object: obj[0] = userdata. */
lua_newtable(L);
socket = MAY_LJMP(lua_newuserdata(L, sizeof(*socket))); socket = MAY_LJMP(lua_newuserdata(L, sizeof(*socket)));
lua_rawseti(L, -2, 0);
memset(socket, 0, sizeof(*socket)); memset(socket, 0, sizeof(*socket));
/* Check if the various memory pools are intialized. */ /* Check if the various memory pools are intialized. */
@ -2025,13 +2039,15 @@ static int hlua_channel_new(lua_State *L, struct session *s, struct channel *cha
struct hlua_channel *chn; struct hlua_channel *chn;
/* Check stack size. */ /* Check stack size. */
if (!lua_checkstack(L, 2)) if (!lua_checkstack(L, 3))
return 0; return 0;
/* NOTE: The allocation never fails. The failure /* NOTE: The allocation never fails. The failure
* throw an error, and the function never returns. * throw an error, and the function never returns.
*/ */
chn = lua_newuserdata(L, sizeof(*chn)); lua_newtable(L);
chn = MAY_LJMP(lua_newuserdata(L, sizeof(*chn)));
lua_rawseti(L, -2, 0);
chn->chn = channel; chn->chn = channel;
chn->s = s; chn->s = s;
@ -2515,14 +2531,18 @@ static int hlua_txn_new(lua_State *L, struct session *s, struct proxy *p, void *
struct hlua_txn *hs; struct hlua_txn *hs;
/* Check stack size. */ /* Check stack size. */
if (!lua_checkstack(L, 2)) if (!lua_checkstack(L, 3))
return 0; return 0;
/* NOTE: The allocation never fails. The failure /* NOTE: The allocation never fails. The failure
* throw an error, and the function never returns. * throw an error, and the function never returns.
* if the throw is not avalaible, the process is aborted. * if the throw is not avalaible, the process is aborted.
*/ */
/* Create the object: obj[0] = userdata. */
lua_newtable(L);
hs = lua_newuserdata(L, sizeof(struct hlua_txn)); hs = lua_newuserdata(L, sizeof(struct hlua_txn));
lua_rawseti(L, -2, 0);
hs->s = s; hs->s = s;
hs->p = p; hs->p = p;
hs->l7 = l7; hs->l7 = l7;