diff options
| author | nagachika <nagachika@ruby-lang.org> | 2021-06-10 10:31:27 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2021-06-10 10:31:27 +0900 |
| commit | d4f4ae599f650feb0a9da6fa486ce425dbe8a81a (patch) | |
| tree | 46ddb53188b4ff41c0a92137b51cad1472b1a99e | |
| parent | 2dd18df4a35a4b2dd0cf2dec7759898246fc6935 (diff) | |
merge revision(s) 73f9831a57e133ab5645221df862a176a42f6685: [Backport #17941]
POSIX timer cannot be shared in forked process [Bug #17941]
---
thread_pthread.c | 1 +
1 file changed, 1 insertion(+)
| -rw-r--r-- | thread_pthread.c | 1 | ||||
| -rw-r--r-- | version.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/thread_pthread.c b/thread_pthread.c index 97879f559a..134d1875cb 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -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 */ @@ -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" |