RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-08 18:23:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: lua: minor cleanup in hlua_socket_new()

Browse Source 
Just limit the number of dereferences of socket-> since we allocate
the stream at the beginning.
This commit is contained in:
Willy Tarreau 2015-04-06 00:48:33 +02:00
parent d420a975d7
commit 61cf7c885d
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/hlua.c
View File

@ -1999,6 +1999,7 @@ __LJMP static int hlua_socket_new(lua_State *L)
struct hlua_socket *socket; struct hlua_socket *socket;
struct appctx *appctx; struct appctx *appctx;
struct session *sess; struct session *sess;
struct stream *strm;
struct task *task; struct task *task;
/* Check stack size. */ /* Check stack size. */
@ -2025,8 +2026,10 @@ __LJMP static int hlua_socket_new(lua_State *L)
/* Create the applet context */ /* Create the applet context */
appctx = appctx_new(&update_applet); appctx = appctx_new(&update_applet);
if (!appctx) if (!appctx) {
hlua_pusherror(L, "socket: out of memory");
goto out_fail_conf; goto out_fail_conf;
}
appctx->ctx.hlua.socket = socket; appctx->ctx.hlua.socket = socket;
appctx->ctx.hlua.connected = 0; appctx->ctx.hlua.connected = 0;
@ -2040,41 +2043,44 @@ __LJMP static int hlua_socket_new(lua_State *L)
goto out_fail_sess; goto out_fail_sess;
} }
if ((task = task_new()) == NULL) { task = task_new();
if (!task) {
hlua_pusherror(L, "socket: out of memory"); hlua_pusherror(L, "socket: out of memory");
goto out_fail_task; goto out_fail_task;
} }
task->nice = 0; task->nice = 0;
if ((socket->s = stream_new(sess, task)) == NULL) { strm = stream_new(sess, task);
if (!strm) {
hlua_pusherror(L, "socket: out of memory"); hlua_pusherror(L, "socket: out of memory");
goto out_fail_stream; goto out_fail_stream;
} }
/* Configure an empty Lua for the stream. */ /* Configure an empty Lua for the stream. */
socket->s->hlua.T = NULL; socket->s = strm;
socket->s->hlua.Tref = LUA_REFNIL; strm->hlua.T = NULL;
socket->s->hlua.Mref = LUA_REFNIL; strm->hlua.Tref = LUA_REFNIL;
socket->s->hlua.nargs = 0; strm->hlua.Mref = LUA_REFNIL;
socket->s->hlua.flags = 0; strm->hlua.nargs = 0;
LIST_INIT(&socket->s->hlua.com); strm->hlua.flags = 0;
LIST_INIT(&strm->hlua.com);
/* Adjust the stream's timeouts */ /* Adjust the stream's timeouts */
socket->s->req.rto = socket_proxy.timeout.client; strm->req.rto = socket_proxy.timeout.client;
socket->s->req.wto = socket_proxy.timeout.server; strm->req.wto = socket_proxy.timeout.server;
socket->s->res.rto = socket_proxy.timeout.server; strm->res.rto = socket_proxy.timeout.server;
socket->s->res.wto = socket_proxy.timeout.client; strm->res.wto = socket_proxy.timeout.client;
/* Configure "right" stream interface. this "si" is used to connect /* Configure "right" stream interface. this "si" is used to connect
* and retrieve data from the server. The connection is initialized * and retrieve data from the server. The connection is initialized
* with the "struct server". * with the "struct server".
*/ */
si_set_state(&socket->s->si[1], SI_ST_ASS); si_set_state(&strm->si[1], SI_ST_ASS);
socket->s->si[1].conn_retries = socket_proxy.conn_retries; strm->si[1].conn_retries = socket_proxy.conn_retries;
/* Force destination server. */ /* Force destination server. */
socket->s->flags |= SF_DIRECT | SF_ASSIGNED | SF_ADDR_SET | SF_BE_ASSIGNED; strm->flags |= SF_DIRECT | SF_ASSIGNED | SF_ADDR_SET | SF_BE_ASSIGNED;
socket->s->target = &socket_tcp.obj_type; strm->target = &socket_tcp.obj_type;
/* Update statistics counters. */ /* Update statistics counters. */
socket_proxy.feconn++; /* beconn will be increased later */ socket_proxy.feconn++; /* beconn will be increased later */