feature: add FFI implementation for ngx.arg getter (#2021)

Author: spacewander

src/ngx_http_lua_bodyfilterby.c

@@ -396,60 +396,58 @@ ngx_http_lua_body_filter_init(void)
 
 
 int
-ngx_http_lua_body_filter_param_get(lua_State *L, ngx_http_request_t *r)
+ngx_http_lua_ffi_get_body_filter_param_eof(ngx_http_request_t *r)
 {
-    u_char              *data, *p;
-    size_t               size;
     ngx_chain_t         *cl;
-    ngx_buf_t           *b;
-    int                  idx;
     ngx_chain_t         *in;
 
     ngx_http_lua_main_conf_t    *lmcf;
 
-    idx = luaL_checkint(L, 2);
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+    in = lmcf->body_filter_chain;
 
-    dd("index: %d", idx);
+    /* asking for the eof argument */
 
-    if (idx != 1 && idx != 2) {
-        lua_pushnil(L);
-        return 1;
+    for (cl = in; cl; cl = cl->next) {
+        if (cl->buf->last_buf || cl->buf->last_in_chain) {
+            return 1;
+        }
     }
 
-    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
-    in = lmcf->body_filter_chain;
+    return 0;
+}
 
-    if (idx == 2) {
-        /* asking for the eof argument */
 
-        for (cl = in; cl; cl = cl->next) {
-            if (cl->buf->last_buf || cl->buf->last_in_chain) {
-                lua_pushboolean(L, 1);
-                return 1;
-            }
-        }
+int
+ngx_http_lua_ffi_get_body_filter_param_body(ngx_http_request_t *r,
+    u_char **data_p, size_t *len_p)
+{
+    size_t               size;
+    ngx_chain_t         *cl;
+    ngx_buf_t           *b;
+    ngx_chain_t         *in;
 
-        lua_pushboolean(L, 0);
-        return 1;
-    }
+    ngx_http_lua_main_conf_t    *lmcf;
 
-    /* idx == 1 */
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+    in = lmcf->body_filter_chain;
 
     size = 0;
 
     if (in == NULL) {
         /* being a cleared chain on the Lua land */
-        lua_pushliteral(L, "");
-        return 1;
+        *len_p = 0;
+        return NGX_OK;
     }
 
     if (in->next == NULL) {
 
         dd("seen only single buffer");
 
         b = in->buf;
-        lua_pushlstring(L, (char *) b->pos, b->last - b->pos);
-        return 1;
+        *data_p = b->pos;
+        *len_p = b->last - b->pos;
+        return NGX_OK;
     }
 
     dd("seen multiple buffers");
@@ -464,7 +462,26 @@ ngx_http_lua_body_filter_param_get(lua_State *L, ngx_http_request_t *r)
         }
     }
 
-    data = (u_char *) lua_newuserdata(L, size);
+    /* the buf is need and is not allocated from Lua land yet, return with
+     * the actual size */
+    *len_p = size;
+    return NGX_AGAIN;
+}
+
+
+int
+ngx_http_lua_ffi_copy_body_filter_param_body(ngx_http_request_t *r,
+    u_char *data)
+{
+    u_char              *p;
+    ngx_chain_t         *cl;
+    ngx_buf_t           *b;
+    ngx_chain_t         *in;
+
+    ngx_http_lua_main_conf_t    *lmcf;
+
+    lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
+    in = lmcf->body_filter_chain;
 
     for (p = data, cl = in; cl; cl = cl->next) {
         b = cl->buf;
@@ -475,8 +492,7 @@ ngx_http_lua_body_filter_param_get(lua_State *L, ngx_http_request_t *r)
         }
     }
 
-    lua_pushlstring(L, (char *) data, size);
-    return 1;
+    return NGX_OK;
 }
 
 

src/ngx_http_lua_bodyfilterby.h

@@ -21,7 +21,6 @@ ngx_int_t ngx_http_lua_body_filter_inline(ngx_http_request_t *r,
     ngx_chain_t *in);
 ngx_int_t ngx_http_lua_body_filter_file(ngx_http_request_t *r,
     ngx_chain_t *in);
-int ngx_http_lua_body_filter_param_get(lua_State *L, ngx_http_request_t *r);
 int ngx_http_lua_body_filter_param_set(lua_State *L, ngx_http_request_t *r,
     ngx_http_lua_ctx_t *ctx);
 

src/ngx_http_lua_setby.c

@@ -123,16 +123,15 @@ ngx_http_lua_set_by_chunk(lua_State *L, ngx_http_request_t *r, ngx_str_t *val,
 }
 
 
-int
-ngx_http_lua_setby_param_get(lua_State *L, ngx_http_request_t *r)
+void
+ngx_http_lua_ffi_get_setby_param(ngx_http_request_t *r, int idx,
+    u_char **data_p, size_t *len_p)
 {
-    int         idx;
     int         n;
 
     ngx_http_variable_value_t       *v;
     ngx_http_lua_main_conf_t        *lmcf;
 
-    idx = luaL_checkint(L, 2);
     idx--;
 
     lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
@@ -144,13 +143,12 @@ ngx_http_lua_setby_param_get(lua_State *L, ngx_http_request_t *r)
     v = lmcf->setby_args;
 
     if (idx < 0 || idx > n - 1) {
-        lua_pushnil(L);
+        *len_p = 0;
 
     } else {
-        lua_pushlstring(L, (const char *) (v[idx].data), v[idx].len);
+        *data_p = v[idx].data;
+        *len_p = v[idx].len;
     }
-
-    return 1;
 }
 
 

src/ngx_http_lua_setby.h

@@ -7,7 +7,6 @@
 ngx_int_t ngx_http_lua_set_by_chunk(lua_State *L, ngx_http_request_t *r,
     ngx_str_t *val, ngx_http_variable_value_t *args, size_t nargs,
     ngx_str_t *script);
-int ngx_http_lua_setby_param_get(lua_State *L, ngx_http_request_t *r);
 
 
 #endif /* _NGX_HTTP_LUA_SET_BY_H_INCLUDED_ */

src/ngx_http_lua_util.c

@@ -119,7 +119,6 @@ static int ngx_http_lua_thread_traceback(lua_State *L, lua_State *co,
 static void ngx_http_lua_inject_ngx_api(lua_State *L,
     ngx_http_lua_main_conf_t *lmcf, ngx_log_t *log);
 static void ngx_http_lua_inject_arg_api(lua_State *L);
-static int ngx_http_lua_param_get(lua_State *L);
 static int ngx_http_lua_param_set(lua_State *L);
 static ngx_int_t ngx_http_lua_output_filter(ngx_http_request_t *r,
     ngx_chain_t *in);
@@ -3099,9 +3098,6 @@ ngx_http_lua_inject_arg_api(lua_State *L)
 
     lua_createtable(L, 0 /* narr */, 2 /* nrec */);    /*  the metatable */
 
-    lua_pushcfunction(L, ngx_http_lua_param_get);
-    lua_setfield(L, -2, "__index");
-
     lua_pushcfunction(L, ngx_http_lua_param_set);
     lua_setfield(L, -2, "__newindex");
 
@@ -3113,35 +3109,6 @@ ngx_http_lua_inject_arg_api(lua_State *L)
 }
 
 
-static int
-ngx_http_lua_param_get(lua_State *L)
-{
-    ngx_http_lua_ctx_t          *ctx;
-    ngx_http_request_t          *r;
-
-    r = ngx_http_lua_get_req(L);
-    if (r == NULL) {
-        return 0;
-    }
-
-    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
-    if (ctx == NULL) {
-        return luaL_error(L, "ctx not found");
-    }
-
-    ngx_http_lua_check_context(L, ctx, NGX_HTTP_LUA_CONTEXT_SET
-                               | NGX_HTTP_LUA_CONTEXT_BODY_FILTER);
-
-    if (ctx->context & (NGX_HTTP_LUA_CONTEXT_SET)) {
-        return ngx_http_lua_setby_param_get(L, r);
-    }
-
-    /* ctx->context & (NGX_HTTP_LUA_CONTEXT_BODY_FILTER) */
-
-    return ngx_http_lua_body_filter_param_get(L, r);
-}
-
-
 static int
 ngx_http_lua_param_set(lua_State *L)
 {