feature: ngx.thread.spawn(f, ...) can now take multiple arguments for the "light thread" coroutine's first resume.

Author: agentzh

src/ngx_http_lua_uthread.c

@@ -33,10 +33,13 @@ ngx_http_lua_inject_uthread_api(ngx_log_t *log, lua_State *L)
 static int
 ngx_http_lua_uthread_spawn(lua_State *L)
 {
+    int                           n;
     ngx_http_request_t           *r;
     ngx_http_lua_ctx_t           *ctx;
     ngx_http_lua_co_ctx_t        *coctx = NULL;
 
+    n = lua_gettop(L);
+
     ngx_http_lua_coroutine_create_helper(L, &r, &ctx, &coctx);
 
     /* anchor the newly created coroutine into the Lua registry */
@@ -47,6 +50,11 @@ ngx_http_lua_uthread_spawn(lua_State *L)
     coctx->co_ref = luaL_ref(L, -2);
     lua_pop(L, 1);
 
+    if (n > 1) {
+        lua_replace(L, 1);
+        lua_xmove(L, coctx->co, n - 1);
+    }
+
     coctx->is_uthread = 1;
     ctx->uthreads++;
 

src/ngx_http_lua_util.c

@@ -1035,7 +1035,8 @@ ngx_http_lua_run_thread(lua_State *L, ngx_http_request_t *r,
                                    "lua user thread resume");
 
                     ctx->co_op = NGX_HTTP_LUA_USER_CORO_NOP;
-                    nrets = 0;
+                    nrets = lua_gettop(ctx->cur_co_ctx->co) - 1;
+                    dd("nrets = %d", nrets);
 
                     break;
 

t/093-uthread-spawn.t

@@ -1095,3 +1095,37 @@ body: hello world)$
 --- no_error_log
 [error]
 
+
+
+=== TEST 24: simple user thread with args
+--- config
+    location /lua {
+        content_by_lua '
+            function f(a, b)
+                ngx.say("hello ", a, " and ", b)
+            end
+
+            ngx.say("before")
+            ngx.thread.spawn(f, "foo", 3.14)
+            ngx.say("after")
+        ';
+    }
+--- request
+GET /lua
+--- stap2 eval: $::StapScript
+--- stap eval: $::GCScript
+--- stap_out
+create 2 in 1
+spawn user thread 2 in 1
+terminate 2: ok
+terminate 1: ok
+delete thread 2
+delete thread 1
+
+--- response_body
+before
+hello foo and 3.14
+after
+--- no_error_log
+[error]
+