diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-10 11:01:59 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-10 11:01:59 +0000 |
commit | 79c3f54d784ea814be8e4163e8b13deff02ff12d (patch) | |
tree | ab46fc5508d41048345d861261979a66d974a58e | |
parent | d896aedf3d2c5832fd1218fe0b152c552c8e3e06 (diff) |
merge revision(s) 20225:
* eval.c (load_lock): makes circular require deadlock.
[ruby-core:19821]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@22205 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | eval.c | 9 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 11 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Tue Feb 10 20:00:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * eval.c (load_lock): makes circular require deadlock. + [ruby-core:19821] + Tue Feb 10 19:40:58 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * eval.c (rb_feature_p): returns found feature name if loading. @@ -1440,6 +1440,8 @@ eval_node(self, node) int ruby_in_eval; +static int rb_thread_join _((rb_thread_t, double)); + static void rb_thread_cleanup _((void)); static void rb_thread_wait_other_threads _((void)); @@ -7241,8 +7243,9 @@ load_lock(ftptr) return (char *)ftptr; } do { - if ((rb_thread_t)th == curr_thread) return 0; - CHECK_INTS; + rb_thread_t owner = (rb_thread_t)th; + if (owner == curr_thread) return 0; + rb_thread_join(owner->thread, -1.0); } while (st_lookup(loading_tbl, (st_data_t)ftptr, &th)); return 0; } @@ -11386,8 +11389,6 @@ rb_thread_select(max, read, write, except, timeout) return curr_thread->select_value; } -static int rb_thread_join _((rb_thread_t, double)); - static int rb_thread_join(th, limit) rb_thread_t th; @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-02-10" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20090210 -#define RUBY_PATCHLEVEL 112 +#define RUBY_PATCHLEVEL 113 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |