Mercurial > hg > truffle
annotate src/share/vm/classfile/symbolTable.cpp @ 10991:01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
Summary: Parallelize the scanning of the intern string table by having each GC worker claim a given number of buckets. Changes were also reviewed by Per Liden <per.liden@oracle.com>.
Reviewed-by: tschatzl, stefank, twisti
| author | johnc |
|---|---|
| date | Tue, 18 Jun 2013 12:31:07 -0700 |
| parents | 8dbc025ff709 |
| children | 63147986a428 2c022e432e10 |
| rev | line source |
|---|---|
| 0 | 1 /* |
|
8718
0ede345ec7c9
8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents:
7399
diff
changeset
|
2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. |
| 0 | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
| 4 * | |
| 5 * This code is free software; you can redistribute it and/or modify it | |
| 6 * under the terms of the GNU General Public License version 2 only, as | |
| 7 * published by the Free Software Foundation. | |
| 8 * | |
| 9 * This code is distributed in the hope that it will be useful, but WITHOUT | |
| 10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 12 * version 2 for more details (a copy is included in the LICENSE file that | |
| 13 * accompanied this code). | |
| 14 * | |
| 15 * You should have received a copy of the GNU General Public License version | |
| 16 * 2 along with this work; if not, write to the Free Software Foundation, | |
| 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
| 18 * | |
|
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
665
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
665
diff
changeset
|
20 * or visit www.oracle.com if you need additional information or have any |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
665
diff
changeset
|
21 * questions. |
| 0 | 22 * |
| 23 */ | |
| 24 | |
| 1972 | 25 #include "precompiled.hpp" |
| 6162 | 26 #include "classfile/altHashing.hpp" |
| 1972 | 27 #include "classfile/javaClasses.hpp" |
| 28 #include "classfile/symbolTable.hpp" | |
| 29 #include "classfile/systemDictionary.hpp" | |
| 30 #include "gc_interface/collectedHeap.inline.hpp" | |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
31 #include "memory/allocation.inline.hpp" |
| 1972 | 32 #include "memory/filemap.hpp" |
| 33 #include "memory/gcLocker.inline.hpp" | |
| 34 #include "oops/oop.inline.hpp" | |
| 35 #include "oops/oop.inline2.hpp" | |
| 36 #include "runtime/mutexLocker.hpp" | |
| 37 #include "utilities/hashtable.inline.hpp" | |
| 0 | 38 |
| 39 // -------------------------------------------------------------------------- | |
| 40 | |
| 41 SymbolTable* SymbolTable::_the_table = NULL; | |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
42 // Static arena for symbols that are not deallocated |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
43 Arena* SymbolTable::_arena = NULL; |
| 6162 | 44 bool SymbolTable::_needs_rehashing = false; |
| 0 | 45 |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
46 Symbol* SymbolTable::allocate_symbol(const u1* name, int len, bool c_heap, TRAPS) { |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
47 assert (len <= Symbol::max_length(), "should be checked by caller"); |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
48 |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
49 Symbol* sym; |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6201
diff
changeset
|
50 |
|
8718
0ede345ec7c9
8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents:
7399
diff
changeset
|
51 if (DumpSharedSpaces) { |
|
0ede345ec7c9
8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents:
7399
diff
changeset
|
52 // Allocate all symbols to CLD shared metaspace |
|
0ede345ec7c9
8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents:
7399
diff
changeset
|
53 sym = new (len, ClassLoaderData::the_null_class_loader_data(), THREAD) Symbol(name, len, -1); |
|
0ede345ec7c9
8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents:
7399
diff
changeset
|
54 } else if (c_heap) { |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
55 // refcount starts as 1 |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
56 sym = new (len, THREAD) Symbol(name, len, 1); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6201
diff
changeset
|
57 assert(sym != NULL, "new should call vm_exit_out_of_memory if C_HEAP is exhausted"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6201
diff
changeset
|
58 } else { |
|
8718
0ede345ec7c9
8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents:
7399
diff
changeset
|
59 // Allocate to global arena |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
60 sym = new (len, arena(), THREAD) Symbol(name, len, -1); |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
61 } |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
62 return sym; |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
63 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
64 |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
65 void SymbolTable::initialize_symbols(int arena_alloc_size) { |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
66 // Initialize the arena for global symbols, size passed in depends on CDS. |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
67 if (arena_alloc_size == 0) { |
| 6197 | 68 _arena = new (mtSymbol) Arena(); |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
69 } else { |
| 6197 | 70 _arena = new (mtSymbol) Arena(arena_alloc_size); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
71 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
72 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
73 |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
74 // Call function for all symbols in the symbol table. |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
75 void SymbolTable::symbols_do(SymbolClosure *cl) { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
76 const int n = the_table()->table_size(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
77 for (int i = 0; i < n; i++) { |
| 6197 | 78 for (HashtableEntry<Symbol*, mtSymbol>* p = the_table()->bucket(i); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
79 p != NULL; |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
80 p = p->next()) { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
81 cl->do_symbol(p->literal_addr()); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
82 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
83 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
84 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
85 |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
86 int SymbolTable::symbols_removed = 0; |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
87 int SymbolTable::symbols_counted = 0; |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
88 |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
89 // Remove unreferenced symbols from the symbol table |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
90 // This is done late during GC. |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
91 void SymbolTable::unlink() { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
92 int removed = 0; |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
93 int total = 0; |
|
2336
df1347358fe6
7024584: Symbol printouts shouldnt be under PrintGCDetails
coleenp
parents:
2177
diff
changeset
|
94 size_t memory_total = 0; |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
95 for (int i = 0; i < the_table()->table_size(); ++i) { |
| 6197 | 96 HashtableEntry<Symbol*, mtSymbol>** p = the_table()->bucket_addr(i); |
| 97 HashtableEntry<Symbol*, mtSymbol>* entry = the_table()->bucket(i); | |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
98 while (entry != NULL) { |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
99 // Shared entries are normally at the end of the bucket and if we run into |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
100 // a shared entry, then there is nothing more to remove. However, if we |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
101 // have rehashed the table, then the shared entries are no longer at the |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
102 // end of the bucket. |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
103 if (entry->is_shared() && !use_alternate_hashcode()) { |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
104 break; |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
105 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
106 Symbol* s = entry->literal(); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6201
diff
changeset
|
107 memory_total += s->size(); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
108 total++; |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
109 assert(s != NULL, "just checking"); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
110 // If reference count is zero, remove. |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
111 if (s->refcount() == 0) { |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
112 assert(!entry->is_shared(), "shared entries should be kept live"); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
113 delete s; |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
114 removed++; |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
115 *p = entry->next(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
116 the_table()->free_entry(entry); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
117 } else { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
118 p = entry->next_addr(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
119 } |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
120 // get next entry |
| 6197 | 121 entry = (HashtableEntry<Symbol*, mtSymbol>*)HashtableEntry<Symbol*, mtSymbol>::make_ptr(*p); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
122 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
123 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
124 symbols_removed += removed; |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
125 symbols_counted += total; |
|
2336
df1347358fe6
7024584: Symbol printouts shouldnt be under PrintGCDetails
coleenp
parents:
2177
diff
changeset
|
126 // Exclude printing for normal PrintGCDetails because people parse |
|
df1347358fe6
7024584: Symbol printouts shouldnt be under PrintGCDetails
coleenp
parents:
2177
diff
changeset
|
127 // this output. |
|
df1347358fe6
7024584: Symbol printouts shouldnt be under PrintGCDetails
coleenp
parents:
2177
diff
changeset
|
128 if (PrintGCDetails && Verbose && WizardMode) { |
|
df1347358fe6
7024584: Symbol printouts shouldnt be under PrintGCDetails
coleenp
parents:
2177
diff
changeset
|
129 gclog_or_tty->print(" [Symbols=%d size=" SIZE_FORMAT "K] ", total, |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
130 (memory_total*HeapWordSize)/1024); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
131 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
132 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
133 |
| 6162 | 134 // Create a new table and using alternate hash code, populate the new table |
| 135 // with the existing strings. Set flag to use the alternate hash code afterwards. | |
| 136 void SymbolTable::rehash_table() { | |
| 137 assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint"); | |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
138 // This should never happen with -Xshare:dump but it might in testing mode. |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
139 if (DumpSharedSpaces) return; |
| 6162 | 140 // Create a new symbol table |
| 141 SymbolTable* new_table = new SymbolTable(); | |
| 142 | |
| 143 the_table()->move_to(new_table); | |
| 144 | |
| 145 // Delete the table and buckets (entries are reused in new table). | |
| 146 delete _the_table; | |
| 147 // Don't check if we need rehashing until the table gets unbalanced again. | |
| 148 // Then rehash with a new global seed. | |
| 149 _needs_rehashing = false; | |
| 150 _the_table = new_table; | |
| 151 } | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
152 |
| 0 | 153 // Lookup a symbol in a bucket. |
| 154 | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
155 Symbol* SymbolTable::lookup(int index, const char* name, |
| 0 | 156 int len, unsigned int hash) { |
| 6162 | 157 int count = 0; |
| 6197 | 158 for (HashtableEntry<Symbol*, mtSymbol>* e = bucket(index); e != NULL; e = e->next()) { |
| 6162 | 159 count++; // count all entries in this bucket, not just ones with same hash |
| 0 | 160 if (e->hash() == hash) { |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
161 Symbol* sym = e->literal(); |
| 0 | 162 if (sym->equals(name, len)) { |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
163 // something is referencing this symbol now. |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
164 sym->increment_refcount(); |
| 0 | 165 return sym; |
| 166 } | |
| 167 } | |
| 168 } | |
| 6162 | 169 // If the bucket size is too deep check if this hash code is insufficient. |
| 6197 | 170 if (count >= BasicHashtable<mtSymbol>::rehash_count && !needs_rehashing()) { |
| 6162 | 171 _needs_rehashing = check_rehash_table(count); |
| 172 } | |
| 0 | 173 return NULL; |
| 174 } | |
| 175 | |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
176 // Pick hashing algorithm. |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
177 unsigned int SymbolTable::hash_symbol(const char* s, int len) { |
| 6162 | 178 return use_alternate_hashcode() ? |
| 179 AltHashing::murmur3_32(seed(), (const jbyte*)s, len) : | |
|
7399
2aa953165ade
8004661: Comment and function name java_lang_String::toHash is wrong
brutisso
parents:
6725
diff
changeset
|
180 java_lang_String::hash_code(s, len); |
| 6162 | 181 } |
| 182 | |
| 0 | 183 |
| 184 // We take care not to be blocking while holding the | |
| 185 // SymbolTable_lock. Otherwise, the system might deadlock, since the | |
| 186 // symboltable is used during compilation (VM_thread) The lock free | |
| 187 // synchronization is simplified by the fact that we do not delete | |
| 188 // entries in the symbol table during normal execution (only during | |
| 189 // safepoints). | |
| 190 | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
191 Symbol* SymbolTable::lookup(const char* name, int len, TRAPS) { |
| 0 | 192 unsigned int hashValue = hash_symbol(name, len); |
| 193 int index = the_table()->hash_to_index(hashValue); | |
| 194 | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
195 Symbol* s = the_table()->lookup(index, name, len, hashValue); |
| 0 | 196 |
| 197 // Found | |
| 198 if (s != NULL) return s; | |
| 199 | |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
200 // Grab SymbolTable_lock first. |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
201 MutexLocker ml(SymbolTable_lock, THREAD); |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
202 |
| 0 | 203 // Otherwise, add to symbol to table |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
204 return the_table()->basic_add(index, (u1*)name, len, hashValue, true, CHECK_NULL); |
| 0 | 205 } |
| 206 | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
207 Symbol* SymbolTable::lookup(const Symbol* sym, int begin, int end, TRAPS) { |
| 0 | 208 char* buffer; |
| 209 int index, len; | |
| 210 unsigned int hashValue; | |
| 211 char* name; | |
| 212 { | |
| 213 debug_only(No_Safepoint_Verifier nsv;) | |
| 214 | |
| 215 name = (char*)sym->base() + begin; | |
| 216 len = end - begin; | |
| 217 hashValue = hash_symbol(name, len); | |
| 218 index = the_table()->hash_to_index(hashValue); | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
219 Symbol* s = the_table()->lookup(index, name, len, hashValue); |
| 0 | 220 |
| 221 // Found | |
| 222 if (s != NULL) return s; | |
| 223 } | |
| 224 | |
| 225 // Otherwise, add to symbol to table. Copy to a C string first. | |
| 226 char stack_buf[128]; | |
| 227 ResourceMark rm(THREAD); | |
| 228 if (len <= 128) { | |
| 229 buffer = stack_buf; | |
| 230 } else { | |
| 231 buffer = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, len); | |
| 232 } | |
| 233 for (int i=0; i<len; i++) { | |
| 234 buffer[i] = name[i]; | |
| 235 } | |
| 236 // Make sure there is no safepoint in the code above since name can't move. | |
| 237 // We can't include the code in No_Safepoint_Verifier because of the | |
| 238 // ResourceMark. | |
| 239 | |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
240 // Grab SymbolTable_lock first. |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
241 MutexLocker ml(SymbolTable_lock, THREAD); |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
242 |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
243 return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, CHECK_NULL); |
| 0 | 244 } |
| 245 | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
246 Symbol* SymbolTable::lookup_only(const char* name, int len, |
| 0 | 247 unsigned int& hash) { |
| 248 hash = hash_symbol(name, len); | |
| 249 int index = the_table()->hash_to_index(hash); | |
| 250 | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
251 Symbol* s = the_table()->lookup(index, name, len, hash); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
252 return s; |
| 0 | 253 } |
| 254 | |
|
4800
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
255 // Look up the address of the literal in the SymbolTable for this Symbol* |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
256 // Do not create any new symbols |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
257 // Do not increment the reference count to keep this alive |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
258 Symbol** SymbolTable::lookup_symbol_addr(Symbol* sym){ |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
259 unsigned int hash = hash_symbol((char*)sym->bytes(), sym->utf8_length()); |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
260 int index = the_table()->hash_to_index(hash); |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
261 |
| 6197 | 262 for (HashtableEntry<Symbol*, mtSymbol>* e = the_table()->bucket(index); e != NULL; e = e->next()) { |
|
4800
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
263 if (e->hash() == hash) { |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
264 Symbol* literal_sym = e->literal(); |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
265 if (sym == literal_sym) { |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
266 return e->literal_addr(); |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
267 } |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
268 } |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
269 } |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
270 return NULL; |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
271 } |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
272 |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
273 // Suggestion: Push unicode-based lookup all the way into the hashing |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
274 // and probing logic, so there is no need for convert_to_utf8 until |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
275 // an actual new Symbol* is created. |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
276 Symbol* SymbolTable::lookup_unicode(const jchar* name, int utf16_length, TRAPS) { |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
277 int utf8_length = UNICODE::utf8_length((jchar*) name, utf16_length); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
278 char stack_buf[128]; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
279 if (utf8_length < (int) sizeof(stack_buf)) { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
280 char* chars = stack_buf; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
281 UNICODE::convert_to_utf8(name, utf16_length, chars); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
282 return lookup(chars, utf8_length, THREAD); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
283 } else { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
284 ResourceMark rm(THREAD); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
285 char* chars = NEW_RESOURCE_ARRAY(char, utf8_length + 1);; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
286 UNICODE::convert_to_utf8(name, utf16_length, chars); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
287 return lookup(chars, utf8_length, THREAD); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
288 } |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
289 } |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
290 |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
291 Symbol* SymbolTable::lookup_only_unicode(const jchar* name, int utf16_length, |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
292 unsigned int& hash) { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
293 int utf8_length = UNICODE::utf8_length((jchar*) name, utf16_length); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
294 char stack_buf[128]; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
295 if (utf8_length < (int) sizeof(stack_buf)) { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
296 char* chars = stack_buf; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
297 UNICODE::convert_to_utf8(name, utf16_length, chars); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
298 return lookup_only(chars, utf8_length, hash); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
299 } else { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
300 ResourceMark rm; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
301 char* chars = NEW_RESOURCE_ARRAY(char, utf8_length + 1);; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
302 UNICODE::convert_to_utf8(name, utf16_length, chars); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
303 return lookup_only(chars, utf8_length, hash); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
304 } |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
305 } |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
306 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6201
diff
changeset
|
307 void SymbolTable::add(ClassLoaderData* loader_data, constantPoolHandle cp, |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
308 int names_count, |
| 0 | 309 const char** names, int* lengths, int* cp_indices, |
| 310 unsigned int* hashValues, TRAPS) { | |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
311 // Grab SymbolTable_lock first. |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
312 MutexLocker ml(SymbolTable_lock, THREAD); |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
313 |
| 0 | 314 SymbolTable* table = the_table(); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6201
diff
changeset
|
315 bool added = table->basic_add(loader_data, cp, names_count, names, lengths, |
| 0 | 316 cp_indices, hashValues, CHECK); |
| 317 if (!added) { | |
| 318 // do it the hard way | |
| 319 for (int i=0; i<names_count; i++) { | |
| 320 int index = table->hash_to_index(hashValues[i]); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6201
diff
changeset
|
321 bool c_heap = !loader_data->is_the_null_class_loader_data(); |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
322 Symbol* sym = table->basic_add(index, (u1*)names[i], lengths[i], hashValues[i], c_heap, CHECK); |
| 0 | 323 cp->symbol_at_put(cp_indices[i], sym); |
| 324 } | |
| 325 } | |
| 326 } | |
| 327 | |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
328 Symbol* SymbolTable::new_permanent_symbol(const char* name, TRAPS) { |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
329 unsigned int hash; |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
330 Symbol* result = SymbolTable::lookup_only((char*)name, (int)strlen(name), hash); |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
331 if (result != NULL) { |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
332 return result; |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
333 } |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
334 // Grab SymbolTable_lock first. |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
335 MutexLocker ml(SymbolTable_lock, THREAD); |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
336 |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
337 SymbolTable* table = the_table(); |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
338 int index = table->hash_to_index(hash); |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
339 return table->basic_add(index, (u1*)name, (int)strlen(name), hash, false, THREAD); |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
340 } |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
341 |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
342 Symbol* SymbolTable::basic_add(int index_arg, u1 *name, int len, |
| 6162 | 343 unsigned int hashValue_arg, bool c_heap, TRAPS) { |
| 0 | 344 assert(!Universe::heap()->is_in_reserved(name) || GC_locker::is_active(), |
| 345 "proposed name of symbol must be stable"); | |
| 346 | |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
347 // Don't allow symbols to be created which cannot fit in a Symbol*. |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
348 if (len > Symbol::max_length()) { |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
349 THROW_MSG_0(vmSymbols::java_lang_InternalError(), |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
350 "name is too long to represent"); |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
351 } |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
352 |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
353 // Cannot hit a safepoint in this function because the "this" pointer can move. |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
354 No_Safepoint_Verifier nsv; |
| 0 | 355 |
| 6162 | 356 // Check if the symbol table has been rehashed, if so, need to recalculate |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
357 // the hash value and index. |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
358 unsigned int hashValue; |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
359 int index; |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
360 if (use_alternate_hashcode()) { |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
361 hashValue = hash_symbol((const char*)name, len); |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
362 index = hash_to_index(hashValue); |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
363 } else { |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
364 hashValue = hashValue_arg; |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
365 index = index_arg; |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
366 } |
| 6162 | 367 |
| 0 | 368 // Since look-up was done lock-free, we need to check if another |
| 369 // thread beat us in the race to insert the symbol. | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
370 Symbol* test = lookup(index, (char*)name, len, hashValue); |
| 0 | 371 if (test != NULL) { |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
372 // A race occurred and another thread introduced the symbol. |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
373 assert(test->refcount() != 0, "lookup should have incremented the count"); |
| 0 | 374 return test; |
| 375 } | |
| 376 | |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
377 // Create a new symbol. |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
378 Symbol* sym = allocate_symbol(name, len, c_heap, CHECK_NULL); |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
379 assert(sym->equals((char*)name, len), "symbol must be properly initialized"); |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
380 |
| 6197 | 381 HashtableEntry<Symbol*, mtSymbol>* entry = new_entry(hashValue, sym); |
| 0 | 382 add_entry(index, entry); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
383 return sym; |
| 0 | 384 } |
| 385 | |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
386 // This version of basic_add adds symbols in batch from the constant pool |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
387 // parsing. |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6201
diff
changeset
|
388 bool SymbolTable::basic_add(ClassLoaderData* loader_data, constantPoolHandle cp, |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
389 int names_count, |
| 0 | 390 const char** names, int* lengths, |
| 391 int* cp_indices, unsigned int* hashValues, | |
| 392 TRAPS) { | |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
393 |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
394 // Check symbol names are not too long. If any are too long, don't add any. |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
395 for (int i = 0; i< names_count; i++) { |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
396 if (lengths[i] > Symbol::max_length()) { |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
397 THROW_MSG_0(vmSymbols::java_lang_InternalError(), |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
398 "name is too long to represent"); |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
399 } |
| 0 | 400 } |
| 401 | |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
402 // Cannot hit a safepoint in this function because the "this" pointer can move. |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
403 No_Safepoint_Verifier nsv; |
| 0 | 404 |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
405 for (int i=0; i<names_count; i++) { |
| 6162 | 406 // Check if the symbol table has been rehashed, if so, need to recalculate |
| 407 // the hash value. | |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
408 unsigned int hashValue; |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
409 if (use_alternate_hashcode()) { |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
410 hashValue = hash_symbol(names[i], lengths[i]); |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
411 } else { |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
412 hashValue = hashValues[i]; |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
413 } |
| 0 | 414 // Since look-up was done lock-free, we need to check if another |
| 415 // thread beat us in the race to insert the symbol. | |
| 6162 | 416 int index = hash_to_index(hashValue); |
| 417 Symbol* test = lookup(index, names[i], lengths[i], hashValue); | |
| 0 | 418 if (test != NULL) { |
| 605 | 419 // A race occurred and another thread introduced the symbol, this one |
| 0 | 420 // will be dropped and collected. Use test instead. |
| 421 cp->symbol_at_put(cp_indices[i], test); | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
422 assert(test->refcount() != 0, "lookup should have incremented the count"); |
| 0 | 423 } else { |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
424 // Create a new symbol. The null class loader is never unloaded so these |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
425 // are allocated specially in a permanent arena. |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6201
diff
changeset
|
426 bool c_heap = !loader_data->is_the_null_class_loader_data(); |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
427 Symbol* sym = allocate_symbol((const u1*)names[i], lengths[i], c_heap, CHECK_(false)); |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
428 assert(sym->equals(names[i], lengths[i]), "symbol must be properly initialized"); // why wouldn't it be??? |
| 6197 | 429 HashtableEntry<Symbol*, mtSymbol>* entry = new_entry(hashValue, sym); |
| 0 | 430 add_entry(index, entry); |
| 431 cp->symbol_at_put(cp_indices[i], sym); | |
| 432 } | |
| 433 } | |
| 434 return true; | |
| 435 } | |
| 436 | |
| 437 | |
| 438 void SymbolTable::verify() { | |
| 439 for (int i = 0; i < the_table()->table_size(); ++i) { | |
| 6197 | 440 HashtableEntry<Symbol*, mtSymbol>* p = the_table()->bucket(i); |
| 0 | 441 for ( ; p != NULL; p = p->next()) { |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
442 Symbol* s = (Symbol*)(p->literal()); |
| 0 | 443 guarantee(s != NULL, "symbol is NULL"); |
| 444 unsigned int h = hash_symbol((char*)s->bytes(), s->utf8_length()); | |
| 445 guarantee(p->hash() == h, "broken hash in symbol table entry"); | |
| 446 guarantee(the_table()->hash_to_index(h) == i, | |
| 447 "wrong index in symbol table"); | |
| 448 } | |
| 449 } | |
| 450 } | |
| 451 | |
| 6162 | 452 void SymbolTable::dump(outputStream* st) { |
|
10312
a5d6f0c3585f
8014262: PrintStringTableStatistics should include more footprint info
iklam
parents:
10155
diff
changeset
|
453 the_table()->dump_table(st, "SymbolTable"); |
| 6162 | 454 } |
| 455 | |
| 0 | 456 |
| 457 //--------------------------------------------------------------------------- | |
| 458 // Non-product code | |
| 459 | |
| 460 #ifndef PRODUCT | |
| 461 | |
| 462 void SymbolTable::print_histogram() { | |
| 463 MutexLocker ml(SymbolTable_lock); | |
| 464 const int results_length = 100; | |
| 465 int results[results_length]; | |
| 466 int i,j; | |
| 467 | |
| 468 // initialize results to zero | |
| 469 for (j = 0; j < results_length; j++) { | |
| 470 results[j] = 0; | |
| 471 } | |
| 472 | |
| 473 int total = 0; | |
| 474 int max_symbols = 0; | |
| 475 int out_of_range = 0; | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
476 int memory_total = 0; |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
477 int count = 0; |
| 0 | 478 for (i = 0; i < the_table()->table_size(); i++) { |
| 6197 | 479 HashtableEntry<Symbol*, mtSymbol>* p = the_table()->bucket(i); |
| 0 | 480 for ( ; p != NULL; p = p->next()) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6201
diff
changeset
|
481 memory_total += p->literal()->size(); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
482 count++; |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
483 int counter = p->literal()->utf8_length(); |
| 0 | 484 total += counter; |
| 485 if (counter < results_length) { | |
| 486 results[counter]++; | |
| 487 } else { | |
| 488 out_of_range++; | |
| 489 } | |
| 490 max_symbols = MAX2(max_symbols, counter); | |
| 491 } | |
| 492 } | |
| 493 tty->print_cr("Symbol Table:"); | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
494 tty->print_cr("Total number of symbols %5d", count); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
495 tty->print_cr("Total size in memory %5dK", |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
496 (memory_total*HeapWordSize)/1024); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
497 tty->print_cr("Total counted %5d", symbols_counted); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
498 tty->print_cr("Total removed %5d", symbols_removed); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
499 if (symbols_counted > 0) { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
500 tty->print_cr("Percent removed %3.2f", |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
501 ((float)symbols_removed/(float)symbols_counted)* 100); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
502 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
503 tty->print_cr("Reference counts %5d", Symbol::_total_count); |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
504 tty->print_cr("Symbol arena size %5d used %5d", |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
505 arena()->size_in_bytes(), arena()->used()); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
506 tty->print_cr("Histogram of symbol length:"); |
| 0 | 507 tty->print_cr("%8s %5d", "Total ", total); |
| 508 tty->print_cr("%8s %5d", "Maximum", max_symbols); | |
| 509 tty->print_cr("%8s %3.2f", "Average", | |
| 510 ((float) total / (float) the_table()->table_size())); | |
| 511 tty->print_cr("%s", "Histogram:"); | |
| 512 tty->print_cr(" %s %29s", "Length", "Number chains that length"); | |
| 513 for (i = 0; i < results_length; i++) { | |
| 514 if (results[i] > 0) { | |
| 515 tty->print_cr("%6d %10d", i, results[i]); | |
| 516 } | |
| 517 } | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
518 if (Verbose) { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
519 int line_length = 70; |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
520 tty->print_cr("%s %30s", " Length", "Number chains that length"); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
521 for (i = 0; i < results_length; i++) { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
522 if (results[i] > 0) { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
523 tty->print("%4d", i); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
524 for (j = 0; (j < results[i]) && (j < line_length); j++) { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
525 tty->print("%1s", "*"); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
526 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
527 if (j == line_length) { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
528 tty->print("%1s", "+"); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
529 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
530 tty->cr(); |
| 0 | 531 } |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
532 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
533 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
534 tty->print_cr(" %s %d: %d\n", "Number chains longer than", |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
535 results_length, out_of_range); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
536 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
537 |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
538 void SymbolTable::print() { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
539 for (int i = 0; i < the_table()->table_size(); ++i) { |
| 6197 | 540 HashtableEntry<Symbol*, mtSymbol>** p = the_table()->bucket_addr(i); |
| 541 HashtableEntry<Symbol*, mtSymbol>* entry = the_table()->bucket(i); | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
542 if (entry != NULL) { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
543 while (entry != NULL) { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
544 tty->print(PTR_FORMAT " ", entry->literal()); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
545 entry->literal()->print(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
546 tty->print(" %d", entry->literal()->refcount()); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
547 p = entry->next_addr(); |
| 6197 | 548 entry = (HashtableEntry<Symbol*, mtSymbol>*)HashtableEntry<Symbol*, mtSymbol>::make_ptr(*p); |
| 0 | 549 } |
| 550 tty->cr(); | |
| 551 } | |
| 552 } | |
| 553 } | |
| 554 #endif // PRODUCT | |
| 555 | |
| 556 // -------------------------------------------------------------------------- | |
| 557 | |
| 558 #ifdef ASSERT | |
| 559 class StableMemoryChecker : public StackObj { | |
| 560 enum { _bufsize = wordSize*4 }; | |
| 561 | |
| 562 address _region; | |
| 563 jint _size; | |
| 564 u1 _save_buf[_bufsize]; | |
| 565 | |
| 566 int sample(u1* save_buf) { | |
| 567 if (_size <= _bufsize) { | |
| 568 memcpy(save_buf, _region, _size); | |
| 569 return _size; | |
| 570 } else { | |
| 571 // copy head and tail | |
| 572 memcpy(&save_buf[0], _region, _bufsize/2); | |
| 573 memcpy(&save_buf[_bufsize/2], _region + _size - _bufsize/2, _bufsize/2); | |
| 574 return (_bufsize/2)*2; | |
| 575 } | |
| 576 } | |
| 577 | |
| 578 public: | |
| 579 StableMemoryChecker(const void* region, jint size) { | |
| 580 _region = (address) region; | |
| 581 _size = size; | |
| 582 sample(_save_buf); | |
| 583 } | |
| 584 | |
| 585 bool verify() { | |
| 586 u1 check_buf[sizeof(_save_buf)]; | |
| 587 int check_size = sample(check_buf); | |
| 588 return (0 == memcmp(_save_buf, check_buf, check_size)); | |
| 589 } | |
| 590 | |
| 591 void set_region(const void* region) { _region = (address) region; } | |
| 592 }; | |
| 593 #endif | |
| 594 | |
| 595 | |
| 596 // -------------------------------------------------------------------------- | |
| 597 StringTable* StringTable::_the_table = NULL; | |
| 598 | |
| 6162 | 599 bool StringTable::_needs_rehashing = false; |
| 600 | |
|
10991
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
601 volatile int StringTable::_parallel_claimed_idx = 0; |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
602 |
| 6162 | 603 // Pick hashing algorithm |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
604 unsigned int StringTable::hash_string(const jchar* s, int len) { |
| 6162 | 605 return use_alternate_hashcode() ? AltHashing::murmur3_32(seed(), s, len) : |
|
7399
2aa953165ade
8004661: Comment and function name java_lang_String::toHash is wrong
brutisso
parents:
6725
diff
changeset
|
606 java_lang_String::hash_code(s, len); |
| 6162 | 607 } |
| 608 | |
| 0 | 609 oop StringTable::lookup(int index, jchar* name, |
| 610 int len, unsigned int hash) { | |
| 6162 | 611 int count = 0; |
| 6197 | 612 for (HashtableEntry<oop, mtSymbol>* l = bucket(index); l != NULL; l = l->next()) { |
| 6162 | 613 count++; |
| 0 | 614 if (l->hash() == hash) { |
| 615 if (java_lang_String::equals(l->literal(), name, len)) { | |
| 616 return l->literal(); | |
| 617 } | |
| 618 } | |
| 619 } | |
| 6162 | 620 // If the bucket size is too deep check if this hash code is insufficient. |
| 6197 | 621 if (count >= BasicHashtable<mtSymbol>::rehash_count && !needs_rehashing()) { |
| 6162 | 622 _needs_rehashing = check_rehash_table(count); |
| 623 } | |
| 0 | 624 return NULL; |
| 625 } | |
| 626 | |
| 627 | |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
628 oop StringTable::basic_add(int index_arg, Handle string, jchar* name, |
| 6162 | 629 int len, unsigned int hashValue_arg, TRAPS) { |
| 0 | 630 |
| 631 assert(java_lang_String::equals(string(), name, len), | |
| 632 "string must be properly initialized"); | |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
633 // Cannot hit a safepoint in this function because the "this" pointer can move. |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
634 No_Safepoint_Verifier nsv; |
| 0 | 635 |
| 6162 | 636 // Check if the symbol table has been rehashed, if so, need to recalculate |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
637 // the hash value and index before second lookup. |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
638 unsigned int hashValue; |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
639 int index; |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
640 if (use_alternate_hashcode()) { |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
641 hashValue = hash_string(name, len); |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
642 index = hash_to_index(hashValue); |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
643 } else { |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
644 hashValue = hashValue_arg; |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
645 index = index_arg; |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
646 } |
| 6162 | 647 |
| 0 | 648 // Since look-up was done lock-free, we need to check if another |
| 649 // thread beat us in the race to insert the symbol. | |
| 650 | |
| 651 oop test = lookup(index, name, len, hashValue); // calls lookup(u1*, int) | |
| 652 if (test != NULL) { | |
| 653 // Entry already added | |
| 654 return test; | |
| 655 } | |
| 656 | |
| 6197 | 657 HashtableEntry<oop, mtSymbol>* entry = new_entry(hashValue, string()); |
| 0 | 658 add_entry(index, entry); |
| 659 return string(); | |
| 660 } | |
| 661 | |
| 662 | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
663 oop StringTable::lookup(Symbol* symbol) { |
| 0 | 664 ResourceMark rm; |
| 665 int length; | |
| 666 jchar* chars = symbol->as_unicode(length); | |
| 8850 | 667 return lookup(chars, length); |
| 668 } | |
| 669 | |
| 670 | |
| 671 oop StringTable::lookup(jchar* name, int len) { | |
| 672 unsigned int hash = hash_string(name, len); | |
| 673 int index = the_table()->hash_to_index(hash); | |
| 674 return the_table()->lookup(index, name, len, hash); | |
| 0 | 675 } |
| 676 | |
| 677 | |
| 678 oop StringTable::intern(Handle string_or_null, jchar* name, | |
| 679 int len, TRAPS) { | |
| 6162 | 680 unsigned int hashValue = hash_string(name, len); |
| 0 | 681 int index = the_table()->hash_to_index(hashValue); |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
682 oop found_string = the_table()->lookup(index, name, len, hashValue); |
| 0 | 683 |
| 684 // Found | |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
685 if (found_string != NULL) return found_string; |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
686 |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
687 debug_only(StableMemoryChecker smc(name, len * sizeof(name[0]))); |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
688 assert(!Universe::heap()->is_in_reserved(name) || GC_locker::is_active(), |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
689 "proposed name of symbol must be stable"); |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
690 |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
691 Handle string; |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
692 // try to reuse the string if possible |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6201
diff
changeset
|
693 if (!string_or_null.is_null()) { |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
694 string = string_or_null; |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
695 } else { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6201
diff
changeset
|
696 string = java_lang_String::create_from_unicode(name, len, CHECK_NULL); |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
697 } |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
698 |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
699 // Grab the StringTable_lock before getting the_table() because it could |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
700 // change at safepoint. |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
701 MutexLocker ml(StringTable_lock, THREAD); |
| 0 | 702 |
| 703 // Otherwise, add to symbol to table | |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
704 return the_table()->basic_add(index, string, name, len, |
| 0 | 705 hashValue, CHECK_NULL); |
| 706 } | |
| 707 | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
708 oop StringTable::intern(Symbol* symbol, TRAPS) { |
| 0 | 709 if (symbol == NULL) return NULL; |
| 710 ResourceMark rm(THREAD); | |
| 711 int length; | |
| 712 jchar* chars = symbol->as_unicode(length); | |
| 713 Handle string; | |
| 714 oop result = intern(string, chars, length, CHECK_NULL); | |
| 715 return result; | |
| 716 } | |
| 717 | |
| 718 | |
| 719 oop StringTable::intern(oop string, TRAPS) | |
| 720 { | |
| 721 if (string == NULL) return NULL; | |
| 722 ResourceMark rm(THREAD); | |
| 723 int length; | |
| 724 Handle h_string (THREAD, string); | |
|
10155
f258c5828eb8
8011773: Some tests on Interned String crashed JVM with OOM
hseigel
parents:
8850
diff
changeset
|
725 jchar* chars = java_lang_String::as_unicode_string(string, length, CHECK_NULL); |
| 0 | 726 oop result = intern(h_string, chars, length, CHECK_NULL); |
| 727 return result; | |
| 728 } | |
| 729 | |
| 730 | |
| 731 oop StringTable::intern(const char* utf8_string, TRAPS) { | |
| 732 if (utf8_string == NULL) return NULL; | |
| 733 ResourceMark rm(THREAD); | |
| 734 int length = UTF8::unicode_length(utf8_string); | |
| 735 jchar* chars = NEW_RESOURCE_ARRAY(jchar, length); | |
| 736 UTF8::convert_to_unicode(utf8_string, chars, length); | |
| 737 Handle string; | |
| 738 oop result = intern(string, chars, length, CHECK_NULL); | |
| 739 return result; | |
| 740 } | |
| 741 | |
|
10363
8dbc025ff709
8015422: Large performance hit when the StringTable is walked twice in Parallel Scavenge
stefank
parents:
10362
diff
changeset
|
742 void StringTable::unlink_or_oops_do(BoolObjectClosure* is_alive, OopClosure* f) { |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
743 // Readers of the table are unlocked, so we should only be removing |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
744 // entries at a safepoint. |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
745 assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint"); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
746 for (int i = 0; i < the_table()->table_size(); ++i) { |
| 6197 | 747 HashtableEntry<oop, mtSymbol>** p = the_table()->bucket_addr(i); |
| 748 HashtableEntry<oop, mtSymbol>* entry = the_table()->bucket(i); | |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
749 while (entry != NULL) { |
|
10362
95c00927be11
8015428: Remove unused CDS support from StringTable
stefank
parents:
10312
diff
changeset
|
750 assert(!entry->is_shared(), "CDS not used for the StringTable"); |
|
95c00927be11
8015428: Remove unused CDS support from StringTable
stefank
parents:
10312
diff
changeset
|
751 |
|
95c00927be11
8015428: Remove unused CDS support from StringTable
stefank
parents:
10312
diff
changeset
|
752 if (is_alive->do_object_b(entry->literal())) { |
|
10363
8dbc025ff709
8015422: Large performance hit when the StringTable is walked twice in Parallel Scavenge
stefank
parents:
10362
diff
changeset
|
753 if (f != NULL) { |
|
8dbc025ff709
8015422: Large performance hit when the StringTable is walked twice in Parallel Scavenge
stefank
parents:
10362
diff
changeset
|
754 f->do_oop((oop*)entry->literal_addr()); |
|
8dbc025ff709
8015422: Large performance hit when the StringTable is walked twice in Parallel Scavenge
stefank
parents:
10362
diff
changeset
|
755 } |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
756 p = entry->next_addr(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
757 } else { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
758 *p = entry->next(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
759 the_table()->free_entry(entry); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
760 } |
|
10362
95c00927be11
8015428: Remove unused CDS support from StringTable
stefank
parents:
10312
diff
changeset
|
761 entry = *p; |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
762 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
763 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
764 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
765 |
|
10991
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
766 void StringTable::buckets_do(OopClosure* f, int start_idx, int end_idx) { |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
767 const int limit = the_table()->table_size(); |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
768 |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
769 assert(0 <= start_idx && start_idx <= limit, |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
770 err_msg("start_idx (" INT32_FORMAT ") oob?", start_idx)); |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
771 assert(0 <= end_idx && end_idx <= limit, |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
772 err_msg("end_idx (" INT32_FORMAT ") oob?", end_idx)); |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
773 assert(start_idx <= end_idx, |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
774 err_msg("Ordering: start_idx=" INT32_FORMAT", end_idx=" INT32_FORMAT, |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
775 start_idx, end_idx)); |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
776 |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
777 for (int i = start_idx; i < end_idx; i += 1) { |
| 6197 | 778 HashtableEntry<oop, mtSymbol>* entry = the_table()->bucket(i); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
779 while (entry != NULL) { |
|
10362
95c00927be11
8015428: Remove unused CDS support from StringTable
stefank
parents:
10312
diff
changeset
|
780 assert(!entry->is_shared(), "CDS not used for the StringTable"); |
|
95c00927be11
8015428: Remove unused CDS support from StringTable
stefank
parents:
10312
diff
changeset
|
781 |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
782 f->do_oop((oop*)entry->literal_addr()); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
783 |
|
10362
95c00927be11
8015428: Remove unused CDS support from StringTable
stefank
parents:
10312
diff
changeset
|
784 entry = entry->next(); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
785 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
786 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
787 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
788 |
|
10991
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
789 void StringTable::oops_do(OopClosure* f) { |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
790 buckets_do(f, 0, the_table()->table_size()); |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
791 } |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
792 |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
793 void StringTable::possibly_parallel_oops_do(OopClosure* f) { |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
794 const int ClaimChunkSize = 32; |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
795 const int limit = the_table()->table_size(); |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
796 |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
797 for (;;) { |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
798 // Grab next set of buckets to scan |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
799 int start_idx = Atomic::add(ClaimChunkSize, &_parallel_claimed_idx) - ClaimChunkSize; |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
800 if (start_idx >= limit) { |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
801 // End of table |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
802 break; |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
803 } |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
804 |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
805 int end_idx = MIN2(limit, start_idx + ClaimChunkSize); |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
806 buckets_do(f, start_idx, end_idx); |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
807 } |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
808 } |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
809 |
| 0 | 810 void StringTable::verify() { |
| 811 for (int i = 0; i < the_table()->table_size(); ++i) { | |
| 6197 | 812 HashtableEntry<oop, mtSymbol>* p = the_table()->bucket(i); |
| 0 | 813 for ( ; p != NULL; p = p->next()) { |
| 814 oop s = p->literal(); | |
| 815 guarantee(s != NULL, "interned string is NULL"); | |
|
2418
352622fd140a
7032129: Native memory usage grow unexpectedly for vm/oom/*InternedString tests
never
parents:
2379
diff
changeset
|
816 unsigned int h = java_lang_String::hash_string(s); |
| 0 | 817 guarantee(p->hash() == h, "broken hash in string table entry"); |
| 818 guarantee(the_table()->hash_to_index(h) == i, | |
| 819 "wrong index in string table"); | |
| 820 } | |
| 821 } | |
| 822 } | |
| 6162 | 823 |
| 824 void StringTable::dump(outputStream* st) { | |
|
10312
a5d6f0c3585f
8014262: PrintStringTableStatistics should include more footprint info
iklam
parents:
10155
diff
changeset
|
825 the_table()->dump_table(st, "StringTable"); |
| 6162 | 826 } |
| 827 | |
| 828 | |
| 829 // Create a new table and using alternate hash code, populate the new table | |
| 830 // with the existing strings. Set flag to use the alternate hash code afterwards. | |
| 831 void StringTable::rehash_table() { | |
| 832 assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint"); | |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
833 // This should never happen with -Xshare:dump but it might in testing mode. |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
834 if (DumpSharedSpaces) return; |
| 6162 | 835 StringTable* new_table = new StringTable(); |
| 836 | |
| 837 // Rehash the table | |
| 838 the_table()->move_to(new_table); | |
| 839 | |
| 840 // Delete the table and buckets (entries are reused in new table). | |
| 841 delete _the_table; | |
| 842 // Don't check if we need rehashing until the table gets unbalanced again. | |
| 843 // Then rehash with a new global seed. | |
| 844 _needs_rehashing = false; | |
| 845 _the_table = new_table; | |
| 846 } |