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) 73f9831a57: [Backport #17941]

Browse source 
POSIX timer cannot be shared in forked process [Bug #17941]

	---
	 thread_pthread.c | 1 +
	 1 file changed, 1 insertion(+)
This commit is contained in:
nagachika 2021-06-10 10:31:27 +09:00
parent 2dd18df4a3
commit d4f4ae599f
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
thread_pthread.c
View file

@ -1759,6 +1759,7 @@ ubf_timer_disarm(void)
#if UBF_TIMER == UBF_TIMER_POSIX
rb_atomic_t prev;
if (timer_posix.owner && timer_posix.owner != getpid()) return;
prev = ATOMIC_CAS(timer_posix.state, RTIMER_ARMED, RTIMER_DISARM);
switch (prev) {
case RTIMER_DISARM: return; /* likely */

4
version.h
View file

@ -12,11 +12,11 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 2
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 95
#define RUBY_PATCHLEVEL 96
#define RUBY_RELEASE_YEAR 2021
#define RUBY_RELEASE_MONTH 6
#define RUBY_RELEASE_DAY 3
#define RUBY_RELEASE_DAY 10
#include "ruby/version.h"