kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 2a83650b0f: [Backport #15852]

Browse source 
Destroy VM-wise locks before freeing [Bug #15852]

	---
	 thread.c | 7 -------
	 vm.c     | 2 ++
	 2 files changed, 2 insertions(+), 7 deletions(-)
This commit is contained in:
nagachika 2021-03-20 12:49:24 +09:00
parent bad623558e
commit 30942fc4d8
3 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
thread.c
View file

@ -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

6
version.h
View file

@ -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"

2
vm.c
View file

@ -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;