technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Ruby: fixed crash on thread start.

Browse Source 
Ruby threads need to be created with GVL; otherwise, an attempt to access
locked resources may occur, causing a crash.

The issue was occasionally reproduced on Ubuntu 18.04 with Ruby 2.5.1
while running test_ruby_application_threads.
This commit is contained in:
Max Romanov
2020-12-07 18:17:25 +00:00
parent c7bd96b476
commit d3796d1fb7
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/changes.xml
View File

@@ -22,6 +22,12 @@ in PHP module.
</para> </para>
</change> </change>
<change type="bugfix">
<para>
Ruby apps with configured mutlithreading could crash on start under load.
</para>
</change>
</changes> </changes>

14
src/ruby/nxt_ruby.c
View File

@@ -38,6 +38,7 @@ static int nxt_ruby_init_io(nxt_ruby_ctx_t *rctx);
static void nxt_ruby_request_handler(nxt_unit_request_info_t *req); static void nxt_ruby_request_handler(nxt_unit_request_info_t *req);
static void *nxt_ruby_request_handler_gvl(void *req); static void *nxt_ruby_request_handler_gvl(void *req);
static int nxt_ruby_ready_handler(nxt_unit_ctx_t *ctx); static int nxt_ruby_ready_handler(nxt_unit_ctx_t *ctx);
static void *nxt_ruby_thread_create_gvl(void *rctx);
static VALUE nxt_ruby_thread_func(VALUE arg); static VALUE nxt_ruby_thread_func(VALUE arg);
static void *nxt_ruby_unit_run(void *ctx); static void *nxt_ruby_unit_run(void *ctx);
static void nxt_ruby_ubf(void *ctx); static void nxt_ruby_ubf(void *ctx);
@@ -1141,7 +1142,7 @@ nxt_ruby_ready_handler(nxt_unit_ctx_t *ctx)
rctx->ctx = ctx; rctx->ctx = ctx;
res = rb_thread_create(RUBY_METHOD_FUNC(nxt_ruby_thread_func), rctx); res = (VALUE) rb_thread_call_with_gvl(nxt_ruby_thread_create_gvl, rctx);
if (nxt_fast_path(res != Qnil)) { if (nxt_fast_path(res != Qnil)) {
nxt_unit_debug(ctx, "thread #%d created", (int) (i + 1)); nxt_unit_debug(ctx, "thread #%d created", (int) (i + 1));
@@ -1159,6 +1160,17 @@ nxt_ruby_ready_handler(nxt_unit_ctx_t *ctx)
} }
static void *
nxt_ruby_thread_create_gvl(void *rctx)
{
VALUE res;
res = rb_thread_create(RUBY_METHOD_FUNC(nxt_ruby_thread_func), rctx);
return (void *) (uintptr_t) res;
}
static VALUE static VALUE
nxt_ruby_thread_func(VALUE arg) nxt_ruby_thread_func(VALUE arg)
{ {