From 30cce03efe9635a1c2f2be287cd159b034cbb807 Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 28 Oct 2009 16:06:26 +0000 Subject: merges r24637 from trunk into ruby_1_9_1. -- * st.c (st_delete_safe): deals with packed entries. [ruby-core:25080] * st.c (st_cleanup_safe): ditto. [ruby-core:25081] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25543 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ st.c | 28 ++++++++++++++++++++++++++++ version.h | 2 +- 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 97319d3617..6fe33daef1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Mon Aug 24 16:35:57 2009 Nobuyoshi Nakada + + * st.c (st_delete_safe): deals with packed entries. + [ruby-core:25080] + + * st.c (st_cleanup_safe): ditto. [ruby-core:25081] + Sun Aug 23 00:56:13 2009 Tanaka Akira * thread.c (rb_thread_schedule): don't recur infinitely. diff --git a/st.c b/st.c index 6e42270a96..c6821467b3 100644 --- a/st.c +++ b/st.c @@ -573,6 +573,19 @@ st_delete_safe(register st_table *table, register st_data_t *key, st_data_t *val unsigned int hash_val; register st_table_entry *ptr; + if (table->entries_packed) { + st_index_t i; + for (i = 0; i < table->num_entries; i++) { + if ((st_data_t)table->bins[i*2] == *key) { + if (value != 0) *value = (st_data_t)table->bins[i*2+1]; + table->bins[i*2] = (void *)never; + return 1; + } + } + if (value != 0) *value = 0; + return 0; + } + hash_val = do_hash_bin(*key, table); ptr = table->bins[hash_val]; @@ -596,6 +609,21 @@ st_cleanup_safe(st_table *table, st_data_t never) st_table_entry *ptr, **last, *tmp; int i; + if (table->entries_packed) { + st_index_t i = 0, j = 0; + while ((st_data_t)table->bins[i*2] != never) { + if (i++ == table->num_entries) return; + } + for (j = i; ++i < table->num_entries;) { + if ((st_data_t)table->bins[i*2] == never) continue; + table->bins[j*2] = table->bins[i*2]; + table->bins[j*2+1] = table->bins[i*2+1]; + j++; + } + table->num_entries = j; + return; + } + for (i = 0; i < table->num_bins; i++) { ptr = *(last = &table->bins[i]); while (ptr != 0) { diff --git a/version.h b/version.h index f7340ce393..93f40c73a1 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 302 +#define RUBY_PATCHLEVEL 303 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit v1.2.3