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

* st.c: use PACKED_ENT and FIND_ENTRY. patched by Sokolov

Browse Source 
Yura <funny.falcon AT gmail.com>.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34901 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-03-05 03:43:55 +00:00
parent e5ac15998d
commit 5bd91964b2
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,4 +1,7 @@
Mon Mar 5 12:43:43 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Mar 5 12:43:53 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* st.c: use PACKED_ENT and FIND_ENTRY. patched by Sokolov
Yura <funny.falcon AT gmail.com>.
* st.c (unpack_entries): reallocate bins if packed array size * st.c (unpack_entries): reallocate bins if packed array size
is not same as initial bins size. based on a patch by is not same as initial bins size. based on a patch by

15
st.c
View File

@ -525,8 +525,7 @@ st_insert(register st_table *table, register st_data_t key, st_data_t value)
} }
hash_val = do_hash(key, table); hash_val = do_hash(key, table);
bin_pos = hash_val % table->num_bins; FIND_ENTRY(table, ptr, hash_val, bin_pos);
ptr = find_entry(table, key, hash_val, bin_pos);
if (ptr == 0) { if (ptr == 0) {
add_direct(table, key, value, hash_val, bin_pos); add_direct(table, key, value, hash_val, bin_pos);
@ -557,8 +556,7 @@ st_insert2(register st_table *table, register st_data_t key, st_data_t value,
} }
hash_val = do_hash(key, table); hash_val = do_hash(key, table);
bin_pos = hash_val % table->num_bins; FIND_ENTRY(table, ptr, hash_val, bin_pos);
ptr = find_entry(table, key, hash_val, bin_pos);
if (ptr == 0) { if (ptr == 0) {
key = (*func)(key); key = (*func)(key);
@ -753,8 +751,7 @@ st_cleanup_safe(st_table *table, st_data_t never)
} }
for (j = i; ++i < table->num_entries;) { for (j = i; ++i < table->num_entries;) {
if (PKEY(table, i) == never) continue; if (PKEY(table, i) == never) continue;
PKEY_SET(table, j, PKEY(table, i)); PACKED_ENT(table, j) = PACKED_ENT(table, i);
PVAL_SET(table, j, PVAL(table, i));
j++; j++;
} }
table->num_entries = j; table->num_entries = j;
@ -791,8 +788,7 @@ st_update(st_table *table, st_data_t key, int (*func)(st_data_t key, st_data_t *
retval = (*func)(key, &value, arg); retval = (*func)(key, &value, arg);
if (!table->entries_packed) { if (!table->entries_packed) {
hash_val = do_hash(key, table); hash_val = do_hash(key, table);
bin_pos = hash_val % table->num_bins; FIND_ENTRY(table, ptr, hash_val, bin_pos);
ptr = find_entry(table, key, hash_val, bin_pos);
if (ptr == 0) return 0; if (ptr == 0) return 0;
goto unpacked; goto unpacked;
} }
@ -809,8 +805,7 @@ st_update(st_table *table, st_data_t key, int (*func)(st_data_t key, st_data_t *
} }
hash_val = do_hash(key, table); hash_val = do_hash(key, table);
bin_pos = hash_val % table->num_bins; FIND_ENTRY(table, ptr, hash_val, bin_pos);
ptr = find_entry(table, key, hash_val, bin_pos);
if (ptr == 0) { if (ptr == 0) {
return 0; return 0;