1.1 --- a/src/share/vm/classfile/symbolTable.cpp Tue Jul 03 17:35:00 2012 -0700
1.2 +++ b/src/share/vm/classfile/symbolTable.cpp Wed Jul 04 15:55:45 2012 -0400
1.3 @@ -43,7 +43,6 @@
1.4 // Static arena for symbols that are not deallocated
1.5 Arena* SymbolTable::_arena = NULL;
1.6 bool SymbolTable::_needs_rehashing = false;
1.7 -jint SymbolTable::_seed = 0;
1.8
1.9 Symbol* SymbolTable::allocate_symbol(const u1* name, int len, bool c_heap, TRAPS) {
1.10 assert (len <= Symbol::max_length(), "should be checked by caller");
1.11 @@ -130,12 +129,6 @@
1.12 }
1.13 }
1.14
1.15 -unsigned int SymbolTable::new_hash(Symbol* sym) {
1.16 - ResourceMark rm;
1.17 - // Use alternate hashing algorithm on this symbol.
1.18 - return AltHashing::murmur3_32(seed(), (const jbyte*)sym->as_C_string(), sym->utf8_length());
1.19 -}
1.20 -
1.21 // Create a new table and using alternate hash code, populate the new table
1.22 // with the existing strings. Set flag to use the alternate hash code afterwards.
1.23 void SymbolTable::rehash_table() {
1.24 @@ -145,10 +138,6 @@
1.25 // Create a new symbol table
1.26 SymbolTable* new_table = new SymbolTable();
1.27
1.28 - // Initialize the global seed for hashing.
1.29 - _seed = AltHashing::compute_seed();
1.30 - assert(seed() != 0, "shouldn't be zero");
1.31 -
1.32 the_table()->move_to(new_table);
1.33
1.34 // Delete the table and buckets (entries are reused in new table).
1.35 @@ -620,7 +609,6 @@
1.36 StringTable* StringTable::_the_table = NULL;
1.37
1.38 bool StringTable::_needs_rehashing = false;
1.39 -jint StringTable::_seed = 0;
1.40
1.41 // Pick hashing algorithm
1.42 unsigned int StringTable::hash_string(const jchar* s, int len) {
1.43 @@ -837,14 +825,6 @@
1.44 }
1.45
1.46
1.47 -unsigned int StringTable::new_hash(oop string) {
1.48 - ResourceMark rm;
1.49 - int length;
1.50 - jchar* chars = java_lang_String::as_unicode_string(string, length);
1.51 - // Use alternate hashing algorithm on the string
1.52 - return AltHashing::murmur3_32(seed(), chars, length);
1.53 -}
1.54 -
1.55 // Create a new table and using alternate hash code, populate the new table
1.56 // with the existing strings. Set flag to use the alternate hash code afterwards.
1.57 void StringTable::rehash_table() {
1.58 @@ -853,10 +833,6 @@
1.59 if (DumpSharedSpaces) return;
1.60 StringTable* new_table = new StringTable();
1.61
1.62 - // Initialize new global seed for hashing.
1.63 - _seed = AltHashing::compute_seed();
1.64 - assert(seed() != 0, "shouldn't be zero");
1.65 -
1.66 // Rehash the table
1.67 the_table()->move_to(new_table);
1.68
