diff options
author | nagachika <nagachika@ruby-lang.org> | 2021-03-20 12:49:24 +0900 |
---|---|---|
committer | nagachika <nagachika@ruby-lang.org> | 2021-03-20 12:49:24 +0900 |
commit | 30942fc4d89a04792e9eba7d3c4e5009c54e81da (patch) | |
tree | 76f664f78fb7d8d827b57968c79c2b27d1ac30ca | |
parent | bad623558eafde1f2ea23d27afdfa6b1690ee16f (diff) |
merge revision(s) 2a83650b0fd25719fb6c03bfec7bd895734d3ceb: [Backport #15852]
Destroy VM-wise locks before freeing [Bug #15852]
---
thread.c | 7 -------
vm.c | 2 ++
2 files changed, 2 insertions(+), 7 deletions(-)
-rw-r--r-- | thread.c | 5 | ||||
-rw-r--r-- | version.h | 6 | ||||
-rw-r--r-- | vm.c | 2 |
3 files changed, 5 insertions, 8 deletions
@@ -422,11 +422,6 @@ rb_vm_gvl_destroy(rb_vm_t *vm) { gvl_release(vm); gvl_destroy(vm); - if (0) { - /* may be held by running threads */ - rb_native_mutex_destroy(&vm->waitpid_lock); - rb_native_mutex_destroy(&vm->workqueue_lock); - } } void @@ -2,11 +2,11 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 3 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 161 +#define RUBY_PATCHLEVEL 162 #define RUBY_RELEASE_YEAR 2021 -#define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 27 +#define RUBY_RELEASE_MONTH 3 +#define RUBY_RELEASE_DAY 20 #include "ruby/version.h" @@ -2354,6 +2354,8 @@ ruby_vm_destruct(rb_vm_t *vm) if (objspace) { rb_objspace_free(objspace); } + rb_native_mutex_destroy(&vm->waitpid_lock); + rb_native_mutex_destroy(&vm->workqueue_lock); /* after freeing objspace, you *can't* use ruby_xfree() */ ruby_mimfree(vm); ruby_current_vm_ptr = NULL; |