From ddcd5c2939771129c779bad077bbacc59cd7679a Mon Sep 17 00:00:00 2001 From: kosaki Date: Sat, 7 May 2011 13:22:12 +0000 Subject: r31460 is wrong fix. fix it again. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31464 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index f6c9c03ef6..42651858b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat May 7 15:18:06 2011 KOSAKI Motohiro + fix incorrect native_cond_signal call when deadlock was detected. + + * thread.c (lock_func): decrement cond_waiting if timeout was happen. + Sat May 7 18:28:37 2011 Nobuyoshi Nakada * thread_pthread.c (USE_MONOTONIC_COND): check the availability @@ -5,12 +10,6 @@ Sat May 7 18:28:37 2011 Nobuyoshi Nakada * thread_pthread.h (rb_thread_cond_t): ditto. -Sat May 7 15:18:06 2011 KOSAKI Motohiro - fix incorrect native_cond_signal call when deadlock was detected. - - * thread.c (lock_func): timedwait don't touch cond_waiting and - cond_notified variables. - Sat May 7 15:15:10 2011 KOSAKI Motohiro fix win32 native_cond_timedwait() makes SIGSEGV. -- cgit v1.2.3