Revert "[wip] make TEST 10 pass by avoiding FFI returns. TEST 9 still…

… fails..." This reverts commit efe1c31.
Kong · Nov 8, 2023 · d72f8de · d72f8de
1 parent c7fa536
commit d72f8de
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 37 deletions.
diff --git a/lib/resty/wasmx/proxy_wasm.lua b/lib/resty/wasmx/proxy_wasm.lua
@@ -49,14 +49,12 @@ if subsystem == "http" then
                                                 ngx_wasm_plan_t *plan,
                                                 unsigned int isolation);
         ngx_int_t ngx_http_wasm_ffi_start(ngx_http_request_t *r);
-        void ngx_http_wasm_ffi_set_property(ngx_http_request_t *r,
-                                            ngx_str_t *key,
-                                            ngx_str_t *value,
-                                            ngx_int_t *rc);
-        void ngx_http_wasm_ffi_get_property(ngx_http_request_t *r,
-                                            ngx_str_t *key,
-                                            ngx_str_t *out,
-                                            ngx_int_t *rc);
+        ngx_int_t ngx_http_wasm_ffi_set_property(ngx_http_request_t *r,
+                                                 ngx_str_t *key,
+                                                 ngx_str_t *value);
+        ngx_int_t ngx_http_wasm_ffi_get_property(ngx_http_request_t *r,
+                                                 ngx_str_t *key,
+                                                 ngx_str_t *out);
         ngx_int_t ngx_http_wasm_ffi_enable_property_setter(ngx_http_request_t *r);
         ngx_int_t ngx_http_wasm_ffi_enable_property_getter(ngx_http_request_t *r);
     ]]
@@ -250,11 +248,8 @@ function _M.set_property(key, value)
         data = value,
         len = value and #value or 0
     })
-    local rcp = ffi_new("ngx_int_t[1]", { 0 })
 
-    C.ngx_http_wasm_ffi_set_property(r, ckey, cvalue, rcp)
-
-    local rc = rcp[0]
+    local rc = C.ngx_http_wasm_ffi_set_property(r, ckey, cvalue)
     if rc == FFI_ERROR then
         return nil, "unknown error"
     end
@@ -279,11 +274,8 @@ function _M.get_property(key)
 
     local ckey = ffi_new("ngx_str_t", { data = key, len = #key })
     local cvalue = ffi_new("ngx_str_t", { data = nil, len = 0 })
-    local rcp = ffi_new("ngx_int_t[1]", { 0 })
-
-    C.ngx_http_wasm_ffi_get_property(r, ckey, cvalue, rcp)
 
-    local rc = tonumber(rcp[0])
+    local rc = C.ngx_http_wasm_ffi_get_property(r, ckey, cvalue)
     if rc == FFI_ERROR then
         return nil, "unknown error", ERROR
     end

diff --git a/src/common/lua/ngx_wasm_lua_ffi.c b/src/common/lua/ngx_wasm_lua_ffi.c
@@ -196,34 +196,31 @@ get_pwctx(ngx_http_request_t *r)
 }
 
 
-void
+ngx_int_t
 ngx_http_wasm_ffi_set_property(ngx_http_request_t *r,
-    ngx_str_t *key, ngx_str_t *value, ngx_int_t *rc)
+    ngx_str_t *key, ngx_str_t *value)
 {
     ngx_http_wasm_req_ctx_t  *rctx;
     ngx_proxy_wasm_ctx_t     *pwctx;
 
     if (ngx_http_wasm_rctx(r, &rctx) != NGX_OK) {
-        *rc = NGX_ERROR;
-        return;
+        return NGX_ERROR;
     }
 
     pwctx = ngx_proxy_wasm_ctx(NULL, 0,
                                NGX_PROXY_WASM_ISOLATION_STREAM,
                                &ngx_http_proxy_wasm, rctx);
     if (pwctx == NULL) {
-        *rc = NGX_ERROR;
-        return;
+        return NGX_ERROR;
     }
 
-    *rc = ngx_proxy_wasm_properties_set(pwctx, key, value);
-    return;
+    return ngx_proxy_wasm_properties_set(pwctx, key, value);
 }
 
 
-void
+ngx_int_t
 ngx_http_wasm_ffi_get_property(ngx_http_request_t *r,
-    ngx_str_t *key, ngx_str_t *value, ngx_int_t *rc)
+    ngx_str_t *key, ngx_str_t *value)
 {
     ngx_http_wasm_req_ctx_t  *rctx;
     ngx_proxy_wasm_ctx_t     *pwctx;
@@ -233,20 +230,17 @@ ngx_http_wasm_ffi_get_property(ngx_http_request_t *r,
          * TODO: return code signifying "no plan attached to request" and co.
          * return associated constant as err/code from Lua lib
          */
-        *rc = NGX_ERROR;
-        return;
+        return NGX_ERROR;
     }
 
     pwctx = ngx_proxy_wasm_ctx(NULL, 0,
                                NGX_PROXY_WASM_ISOLATION_STREAM,
                                &ngx_http_proxy_wasm, rctx);
     if (pwctx == NULL) {
-        *rc = NGX_ERROR;
-        return;
+        return NGX_ERROR;
     }
 
-    *rc = ngx_proxy_wasm_properties_get(pwctx, key, value);
-    return;
+    return ngx_proxy_wasm_properties_get(pwctx, key, value);
 }
 
 

diff --git a/src/common/lua/ngx_wasm_lua_ffi.h b/src/common/lua/ngx_wasm_lua_ffi.h
@@ -45,10 +45,10 @@ ngx_int_t ngx_http_wasm_ffi_plan_load(ngx_wasm_ops_plan_t *plan);
 ngx_int_t ngx_http_wasm_ffi_plan_attach(ngx_http_request_t *r,
     ngx_wasm_ops_plan_t *plan, ngx_uint_t isolation);
 ngx_int_t ngx_http_wasm_ffi_start(ngx_http_request_t *r);
-void ngx_http_wasm_ffi_set_property(ngx_http_request_t *r,
-    ngx_str_t *key, ngx_str_t *value, ngx_int_t *rc);
-void ngx_http_wasm_ffi_get_property(ngx_http_request_t *r,
-    ngx_str_t *key, ngx_str_t *value, ngx_int_t *rc);
+ngx_int_t ngx_http_wasm_ffi_set_property(ngx_http_request_t *r,
+    ngx_str_t *key, ngx_str_t *value);
+ngx_int_t ngx_http_wasm_ffi_get_property(ngx_http_request_t *r,
+    ngx_str_t *key, ngx_str_t *value);
 ngx_int_t ngx_http_wasm_ffi_set_host_property(ngx_http_request_t *r,
     ngx_str_t *key, ngx_str_t *value, unsigned is_const, unsigned retrieve);
 ngx_int_t ngx_http_wasm_ffi_set_property_setter(ngx_http_request_t *r,

diff --git a/t/04-openresty/ffi/304-proxy_wasm_set_property_getter.t b/t/04-openresty/ffi/304-proxy_wasm_set_property_getter.t
@@ -398,7 +398,6 @@ ok
 
 
 === TEST 9: set_property_getter() - getter returning nil produces property not found
---- ONLY
 --- wasm_modules: hostcalls
 --- http_config
     init_worker_by_lua_block {