mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Initialize condattr_monotonic via pthread_condattr_init
Some operating systems will work without calling pthread_condattr_init, but some won't (such as OpenBSD). Prior to r63238, pthread_condattr_init was always called before calling pthread_condattr_setclock. From: Jeremy Evans <code@jeremyevans.net> [ruby-core:87345] [Ruby trunk Bug#14807] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63548 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
24c6231e11
commit
832b601e49
1 changed files with 4 additions and 1 deletions
|
@ -399,7 +399,10 @@ Init_native_thread(rb_thread_t *th)
|
|||
{
|
||||
#if defined(HAVE_PTHREAD_CONDATTR_SETCLOCK)
|
||||
if (condattr_monotonic) {
|
||||
int r = pthread_condattr_setclock(condattr_monotonic, CLOCK_MONOTONIC);
|
||||
int r = pthread_condattr_init(condattr_monotonic);
|
||||
if (r == 0) {
|
||||
r = pthread_condattr_setclock(condattr_monotonic, CLOCK_MONOTONIC);
|
||||
}
|
||||
if (r) condattr_monotonic = NULL;
|
||||
}
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue