[前][次][番号順一覧][スレッド一覧]

ruby-changes:65774

From: usa <ko1@a...>
Date: Mon, 5 Apr 2021 08:51:07 +0900 (JST)
Subject: [ruby-changes:65774] 5f83e778cc (ruby_2_6): merge revision(s) 2a83650b0fd25719fb6c03bfec7bd895734d3ceb: [Backport #15852]

https://git.ruby-lang.org/ruby.git/commit/?id=5f83e778cc

From 5f83e778cc6cefe5982f73e3296286472b84a147 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 4 Apr 2021 23:50:56 +0000
Subject: merge revision(s) 2a83650b0fd25719fb6c03bfec7bd895734d3ceb: [Backport
 #15852]

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


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67930 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 version.h | 2 +-
 vm.c      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/version.h b/version.h
index a968829..5e65375 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L1
 #define RUBY_VERSION "2.6.7"
 #define RUBY_RELEASE_DATE "2021-04-05"
-#define RUBY_PATCHLEVEL 189
+#define RUBY_PATCHLEVEL 190
 
 #define RUBY_RELEASE_YEAR 2021
 #define RUBY_RELEASE_MONTH 4
diff --git a/vm.c b/vm.c
index 6d54a81..0954aa7 100644
--- a/vm.c
+++ b/vm.c
@@ -2292,6 +2292,8 @@ ruby_vm_destruct(rb_vm_t *vm) https://github.com/ruby/ruby/blob/trunk/vm.c#L2292
 	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;
-- 
cgit v1.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]