aboutsummaryrefslogtreecommitdiffstats
path: root/st.c
diff options
context:
space:
mode:
authortarui <tarui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-04-20 03:58:22 +0000
committertarui <tarui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-04-20 03:58:22 +0000
commitc94cb8b805843435a9cae7b1055a671c2ad9f721 (patch)
treee29984d423a40ec092942e5a1637094a23444113 /st.c
parent24252ff4348220d95a3bbaf4fff1d2ea71a20a26 (diff)
downloadruby-c94cb8b805843435a9cae7b1055a671c2ad9f721.tar.gz
* st.c (st_foreach_check): chnage start point of search at check
from top to current. [ruby-dev:48047] [Bug #9646] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45642 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'st.c')
-rw-r--r--st.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/st.c b/st.c
index ccf22eef4d..ff5bb305ab 100644
--- a/st.c
+++ b/st.c
@@ -342,9 +342,8 @@ find_entry(st_table *table, st_data_t key, st_index_t hash_val, st_index_t bin_p
}
static inline st_index_t
-find_packed_index(st_table *table, st_index_t hash_val, st_data_t key)
+find_packed_index_from(st_table *table, st_index_t hash_val, st_data_t key, st_index_t i)
{
- st_index_t i = 0;
while (i < table->real_entries &&
(PHASH(table, i) != hash_val || !EQUAL(table, key, PKEY(table, i)))) {
i++;
@@ -352,6 +351,12 @@ find_packed_index(st_table *table, st_index_t hash_val, st_data_t key)
return i;
}
+static inline st_index_t
+find_packed_index(st_table *table, st_index_t hash_val, st_data_t key)
+{
+ return find_packed_index_from(table, hash_val, key, 0);
+}
+
#define collision_check 0
int
@@ -910,9 +915,10 @@ st_foreach_check(st_table *table, int (*func)(ANYARGS), st_data_t arg, st_data_t
if (PHASH(table, i) == 0 && PKEY(table, i) == never) {
break;
}
- i = find_packed_index(table, hash, key);
- if (i == table->real_entries) {
- goto deleted;
+ i = find_packed_index_from(table, hash, key, i);
+ if (i >= table->real_entries) {
+ i = find_packed_index(table, hash, key);
+ if (i >= table->real_entries) goto deleted;
}
/* fall through */
case ST_CONTINUE: