aboutsummaryrefslogtreecommitdiffstats
path: root/thread_pthread.c
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-08-14 06:49:25 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-08-14 06:49:25 +0000
commit84973e2b2f8a5f350552ee0aa68e74bdcaa19ec6 (patch)
treec9f7216246c4cce9dca2438ed83e21fba2a51e0d /thread_pthread.c
parente08fcceac7d582644a2c5738d90577b7a6e844bf (diff)
downloadruby-84973e2b2f8a5f350552ee0aa68e74bdcaa19ec6.tar.gz
thread_pthread.c: use UBF_TIMER_PTHREAD on Solaris
I'm not sure what's causing this failure in Solaris and only on rubyspec, since rb_io_wait_readable is a well-exercised code path in other places. But maybe using a pthread for timing (similar to old timer-thread) can solve the issue. cf. http://rubyci.s3.amazonaws.com/unstable11s/ruby-trunk/log/20180814T042506Z.fail.html.gz git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64357 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread_pthread.c')
-rw-r--r--thread_pthread.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/thread_pthread.c b/thread_pthread.c
index 75ce110063..0fbd670c38 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -55,7 +55,12 @@
#ifndef UBF_TIMER
# if defined(HAVE_TIMER_SETTIME) && defined(HAVE_TIMER_CREATE) && \
- defined(CLOCK_MONOTONIC) && defined(USE_UBF_LIST)
+ defined(CLOCK_MONOTONIC) && defined(USE_UBF_LIST) && \
+ !defined(__sun)
+ /*
+ * XXX somebody with Solaris experience should be able to fix this:
+ * http://rubyci.s3.amazonaws.com/unstable11s/ruby-trunk/log/20180814T042506Z.fail.html.gz
+ */
/* preferred */
# define UBF_TIMER UBF_TIMER_POSIX
# elif defined(USE_UBF_LIST)