Skip to content

Commit aba591e

Browse files
committed
optimize: fixed the pre-allocated number of keys in the 'ngx.req' and 'ngx.req.socket' tables.
1 parent 0cceeec commit aba591e

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

src/subsys/ngx_subsys_lua_socket_tcp.c.tt2

+7-4
Original file line numberDiff line numberDiff line change
@@ -332,11 +332,11 @@ ngx_[% subsys %]_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
332332
/* {{{raw req socket object metatable */
333333
lua_pushlightuserdata(L, ngx_[% subsys %]_lua_lightudata_mask(
334334
raw_req_socket_metatable_key));
335-
lua_createtable(L, 0 /* narr */, 7 /* nrec */);
335+
[% IF http_subsys %]
336+
lua_createtable(L, 0 /* narr */, 6 /* nrec */);
336337

337-
[% IF stream_subsys %]
338-
lua_pushcfunction(L, ngx_stream_lua_socket_tcp_peek);
339-
lua_setfield(L, -2, "peek");
338+
[% ELSIF stream_subsys %]
339+
lua_createtable(L, 0 /* narr */, 8 /* nrec */);
340340
[% END %]
341341

342342
lua_pushcfunction(L, ngx_[% subsys %]_lua_socket_tcp_receive);
@@ -355,6 +355,9 @@ ngx_[% subsys %]_lua_inject_socket_tcp_api(ngx_log_t *log, lua_State *L)
355355
lua_setfield(L, -2, "settimeouts"); /* ngx socket mt */
356356

357357
[% IF stream_subsys %]
358+
lua_pushcfunction(L, ngx_stream_lua_socket_tcp_peek);
359+
lua_setfield(L, -2, "peek");
360+
358361
lua_pushcfunction(L, ngx_[% subsys %]_lua_socket_tcp_shutdown);
359362
lua_setfield(L, -2, "shutdown");
360363
[% END %]

src/subsys/ngx_subsys_lua_util.c.tt2

+5-2
Original file line numberDiff line numberDiff line change
@@ -2347,9 +2347,12 @@ ngx_[% subsys %]_lua_inject_req_api(ngx_log_t *log, lua_State *L)
23472347
{
23482348
/* ngx.req table */
23492349

2350-
lua_createtable(L, 0 /* narr */, 24 /* nrec */); /* .req */
2350+
[% IF stream_subsys %]
2351+
lua_createtable(L, 0 /* narr */, 1 /* nrec */); /* .req */
2352+
2353+
[% ELSIF http_subsys %]
2354+
lua_createtable(L, 0 /* narr */, 24 /* nrec */); /* .req */
23512355

2352-
[% IF http_subsys %]
23532356
ngx_[% subsys %]_lua_inject_req_header_api(L);
23542357
ngx_[% subsys %]_lua_inject_req_uri_api(log, L);
23552358
ngx_[% subsys %]_lua_inject_req_args_api(L);

0 commit comments

Comments
 (0)