1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* thread.c (rb_barrier_wait): gets rid of recursive deadlock.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20230 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-11-13 02:31:16 +00:00
parent 31f16d7729
commit 5136031055
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Thu Nov 13 11:31:13 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* thread.c (rb_barrier_wait): gets rid of recursive deadlock.
Thu Nov 13 06:08:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Nov 13 06:08:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* thread.c (rb_barrier_{new,wait,release,destroy}): use Mutex so that * thread.c (rb_barrier_{new,wait,release,destroy}): use Mutex so that

3
thread.c
View File

@ -3050,8 +3050,11 @@ VALUE
rb_barrier_wait(VALUE self) rb_barrier_wait(VALUE self)
{ {
VALUE mutex = (VALUE)DATA_PTR(self); VALUE mutex = (VALUE)DATA_PTR(self);
mutex_t *m;
if (!mutex) return Qfalse; if (!mutex) return Qfalse;
GetMutexPtr(mutex, m);
if (m->th == GET_THREAD()) return Qfalse;
rb_mutex_lock(mutex); rb_mutex_lock(mutex);
if (DATA_PTR(self)) return Qtrue; if (DATA_PTR(self)) return Qtrue;
rb_mutex_unlock(mutex); rb_mutex_unlock(mutex);