kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* eval.c (rb_thread_join): new API.

Browse source 
* ext/thread/thread.c (wait_mutex, lock_mutex): wait until the locking
  thread exits.  [ruby-dev:34856]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@17874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-07-04 11:31:35 +00:00
parent 972769ca8e
commit cdd1d98ef2
3 changed files with 46 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

39
ext/thread/thread.c
View file

@ -242,19 +242,22 @@ wake_all(List *list)
return Qnil;
}
extern int rb_thread_join _((VALUE thread, double limit));
#define DELAY_INFTY 1E30
static VALUE
wait_list_inner(List *list)
wait_list_inner(VALUE arg)
{
push_list(list, rb_thread_current());
push_list((List *)arg, rb_thread_current());
rb_thread_stop();
return Qnil;
}
static VALUE
wait_list_cleanup(List *list)
wait_list_cleanup(VALUE arg)
{
/* cleanup in case of spurious wakeups */
remove_one(list, rb_thread_current());
remove_one((List *)arg, rb_thread_current());
return Qnil;
}
@ -390,6 +393,25 @@ rb_mutex_try_lock(VALUE self)
return Qtrue;
}
static VALUE
wait_mutex(VALUE arg)
{
Mutex *mutex = (Mutex *)arg;
VALUE current = rb_thread_current();
push_list(&mutex->waiting, current);
do {
rb_thread_critical = 0;
rb_thread_join(mutex->owner, DELAY_INFTY);
rb_thread_critical = 1;
if (!MUTEX_LOCKED_P(mutex)) {
mutex->owner = current;
break;
}
} while (mutex->owner != current);
return Qnil;
}
/*
* Document-method: lock
* call-seq: lock
@ -410,14 +432,7 @@ lock_mutex(Mutex *mutex)
mutex->owner = current;
}
else {
do {
wait_list(&mutex->waiting);
rb_thread_critical = 1;
if (!MUTEX_LOCKED_P(mutex)) {
mutex->owner = current;
break;
}
} while (mutex->owner != current);
rb_ensure(wait_mutex, (VALUE)mutex, wait_list_cleanup, (VALUE)&mutex->waiting);
}
rb_thread_critical = 0;