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

hash.c: iteration level with reentering

Browse Source 
* hash.c (hash_foreach_iter, hash_foreach_ensure, rb_hash_foreach):
  deal with iteration level when reentering by callcc.  temporary
  measure until rollback of ensure is introduced.  [ruby-dev:47807]
  [Bug #9105]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43683 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-11-15 13:21:38 +00:00
parent ca5739979d
commit e7d29c6cda
3 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Fri Nov 15 22:21:34 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* hash.c (hash_foreach_iter, hash_foreach_ensure, rb_hash_foreach):
deal with iteration level when reentering by callcc. temporary
measure until rollback of ensure is introduced. [ruby-dev:47807]
[Bug #9105]
Fri Nov 15 17:07:31 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Nov 15 17:07:31 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/delegate.rb (Delegator#send): override to get rid of global function interference. * lib/delegate.rb (Delegator#send): override to get rid of global function interference.

14
hash.c
View File

@ -173,7 +173,7 @@ struct hash_foreach_arg {
VALUE hash; VALUE hash;
rb_foreach_func *func; rb_foreach_func *func;
VALUE arg; VALUE arg;
int iter_lev; VALUE marker;
}; };
static int static int
@ -189,6 +189,10 @@ hash_foreach_iter(st_data_t key, st_data_t value, st_data_t argp, int error)
if (RHASH(arg->hash)->ntbl != tbl) { if (RHASH(arg->hash)->ntbl != tbl) {
rb_raise(rb_eRuntimeError, "rehash occurred during iteration"); rb_raise(rb_eRuntimeError, "rehash occurred during iteration");
} }
if (DATA_PTR(arg->marker)) {
RHASH_ITER_LEV(arg->hash)++;
DATA_PTR(arg->marker) = 0;
}
switch (status) { switch (status) {
case ST_DELETE: case ST_DELETE:
FL_SET(arg->hash, HASH_DELETED); FL_SET(arg->hash, HASH_DELETED);
@ -207,7 +211,10 @@ hash_foreach_ensure(VALUE arg)
struct hash_foreach_arg *argp = (struct hash_foreach_arg *)arg; struct hash_foreach_arg *argp = (struct hash_foreach_arg *)arg;
VALUE hash = argp->hash; VALUE hash = argp->hash;
if ((RHASH_ITER_LEV(hash) = argp->iter_lev) == 0) { if (DATA_PTR(argp->marker)) return 0;
DATA_PTR(argp->marker) = (void *)-1;
if (--RHASH_ITER_LEV(hash) == 0) {
if (FL_TEST(hash, HASH_DELETED)) { if (FL_TEST(hash, HASH_DELETED)) {
st_cleanup_safe(RHASH(hash)->ntbl, (st_data_t)Qundef); st_cleanup_safe(RHASH(hash)->ntbl, (st_data_t)Qundef);
FL_UNSET(hash, HASH_DELETED); FL_UNSET(hash, HASH_DELETED);
@ -236,7 +243,8 @@ rb_hash_foreach(VALUE hash, int (*func)(ANYARGS), VALUE farg)
arg.hash = hash; arg.hash = hash;
arg.func = (rb_foreach_func *)func; arg.func = (rb_foreach_func *)func;
arg.arg = farg; arg.arg = farg;
arg.iter_lev = RHASH_ITER_LEV(hash)++; arg.marker = Data_Wrap_Struct(0, 0, 0, 0);
RHASH_ITER_LEV(hash)++;
rb_ensure(hash_foreach_call, (VALUE)&arg, hash_foreach_ensure, (VALUE)&arg); rb_ensure(hash_foreach_call, (VALUE)&arg, hash_foreach_ensure, (VALUE)&arg);
} }

18
test/ruby/test_hash.rb
View File

@ -930,7 +930,9 @@ class TestHash < Test::Unit::TestCase
h.clear h.clear
c.call c.call
end end
end
def test_callcc_iter_level
bug9105 = '[ruby-dev:47803] [Bug #9105]' bug9105 = '[ruby-dev:47803] [Bug #9105]'
h = @cls[1=>2, 3=>4] h = @cls[1=>2, 3=>4]
c = nil c = nil
@ -948,6 +950,22 @@ class TestHash < Test::Unit::TestCase
end end
end end
def test_threaded_iter_level
bug9105 = '[ruby-dev:47807] [Bug #9105]'
h = @cls[1=>2]
2.times.map {
f = false
th = Thread.start {h.each {f = true; sleep}}
Thread.pass until f
Thread.pass until th.stop?
th
}.each {|th| th.run; th.join}
assert_nothing_raised(RuntimeError, bug9105) do
h[5] = 6
end
assert_equal(6, h[5], bug9105)
end
def test_compare_by_identity def test_compare_by_identity
a = "foo" a = "foo"
assert_not_predicate(@cls[], :compare_by_identity?) assert_not_predicate(@cls[], :compare_by_identity?)