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

* load.c (load_lock): reverted.

Browse Source 
* thread.c (rb_barrier_wait): check for recursive wait.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14593 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-12-24 08:59:31 +00:00
parent 162cc94d15
commit 97cdb5ac25
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Mon Dec 24 17:59:29 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* load.c (load_lock): reverted.
* thread.c (rb_barrier_wait): check for recursive wait.
Mon Dec 24 17:50:54 2007 Tanaka Akira <akr@fsij.org>
* eval.c (function_call_may_return_twice_jmp_buf): removed.

3
load.c
View File

@ -345,8 +345,7 @@ load_lock(const char *ftptr)
st_insert(loading_tbl, (st_data_t)ftptr, data);
return (char *)ftptr;
}
rb_barrier_wait((VALUE)data);
return 0;
return RTEST(rb_barrier_wait((VALUE)data)) ? (char *)ftptr : 0;
}
static void

3
thread.c
View File

@ -2555,6 +2555,9 @@ rb_barrier_wait(VALUE self)
if (thlist_signal(&barrier->waiting, 1, &barrier->owner)) return Qfalse;
return Qtrue;
}
else if (barrier->owner == GET_THREAD()) {
return Qfalse;
}
else {
*barrier->tail = q = ALLOC(rb_thread_list_t);
q->th = GET_THREAD();