diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-29 19:26:52 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-29 19:26:52 +0000 |
| commit | b7573a00813dedcc2b1e57bac95ed91326111d23 (patch) | |
| tree | f63c3c3e5e9afee8af5fc9acb9ef103dad4ca662 | |
| parent | 60c49e94eb97da8bd8f8ad3958cc9b44bb025100 (diff) | |
* thread_pthread.c (rb_thread_create_timer_thread): destroy attr even
if pthread_create() failed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53375 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | thread_pthread.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Wed Dec 30 04:10:13 2015 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> + + * thread_pthread.c (rb_thread_create_timer_thread): destroy attr even + if pthread_create() failed. + Wed Dec 30 02:55:09 2015 Eric Wong <e@80x24.org> * thread_pthread.c (setup_communication_pipe): delay setting owner diff --git a/thread_pthread.c b/thread_pthread.c index 46cc5715c4..738ad57ce0 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -1599,6 +1599,7 @@ rb_thread_create_timer_thread(void) } #ifdef HAVE_PTHREAD_ATTR_INIT err = pthread_create(&timer_thread.id, &attr, thread_timer, &GET_VM()->gvl); + pthread_attr_destroy(&attr); #else err = pthread_create(&timer_thread.id, NULL, thread_timer, &GET_VM()->gvl); #endif @@ -1617,9 +1618,6 @@ rb_thread_create_timer_thread(void) /* validate pipe on this process */ timer_thread_pipe.owner_process = getpid(); timer_thread.created = 1; -#ifdef HAVE_PTHREAD_ATTR_INIT - pthread_attr_destroy(&attr); -#endif } } |