Mercurial > hg > graal-compiler
annotate src/share/vm/classfile/symbolTable.cpp @ 6172:246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
Summary: Cannot delete _buckets and HashtableEntries in shared space (CDS)
Reviewed-by: acorn, kvn, dlong, dcubed, kamg
author | coleenp |
---|---|
date | Mon, 25 Jun 2012 21:33:35 -0400 |
parents | e9140bf80b4a |
children | d2a62e0f25eb |
rev | line source |
---|---|
0 | 1 /* |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
2 * Copyright (c) 1997, 2012, 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" | |
6162 | 38 #include "utilities/numberSeq.hpp" |
0 | 39 |
40 // -------------------------------------------------------------------------- | |
41 | |
42 SymbolTable* SymbolTable::_the_table = NULL; | |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
43 // 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
|
44 Arena* SymbolTable::_arena = NULL; |
6162 | 45 bool SymbolTable::_needs_rehashing = false; |
46 jint SymbolTable::_seed = 0; | |
0 | 47 |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
48 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
|
49 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
|
50 |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
51 Symbol* sym; |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
52 // Allocate symbols in the C heap when dumping shared spaces in case there |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
53 // are temporary symbols we can remove. |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
54 if (c_heap || DumpSharedSpaces) { |
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); |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
57 } else { |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
58 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
|
59 } |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
60 assert(sym != NULL, "new should call vm_exit_out_of_memory if C_HEAP is exhausted"); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
61 return sym; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
62 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
63 |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
64 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
|
65 // 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
|
66 if (arena_alloc_size == 0) { |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
67 _arena = new Arena(); |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
68 } else { |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
69 _arena = new Arena(arena_alloc_size); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
70 } |
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 // 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
|
74 void SymbolTable::symbols_do(SymbolClosure *cl) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
75 const int n = the_table()->table_size(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
76 for (int i = 0; i < n; i++) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
77 for (HashtableEntry<Symbol*>* p = the_table()->bucket(i); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
78 p != NULL; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
79 p = p->next()) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
80 cl->do_symbol(p->literal_addr()); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
81 } |
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 int SymbolTable::symbols_removed = 0; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
86 int SymbolTable::symbols_counted = 0; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
87 |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
88 // 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
|
89 // This is done late during GC. |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
90 void SymbolTable::unlink() { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
91 int removed = 0; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
92 int total = 0; |
2336
df1347358fe6
7024584: Symbol printouts shouldnt be under PrintGCDetails
coleenp
parents:
2177
diff
changeset
|
93 size_t memory_total = 0; |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
94 for (int i = 0; i < the_table()->table_size(); ++i) { |
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
95 HashtableEntry<Symbol*>** p = the_table()->bucket_addr(i); |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
96 HashtableEntry<Symbol*>* entry = the_table()->bucket(i); |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
97 while (entry != NULL) { |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
98 // 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
|
99 // 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
|
100 // 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
|
101 // end of the bucket. |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
102 if (entry->is_shared() && !use_alternate_hashcode()) { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
103 break; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
104 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
105 Symbol* s = entry->literal(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
106 memory_total += s->object_size(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
107 total++; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
108 assert(s != NULL, "just checking"); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
109 // If reference count is zero, remove. |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
110 if (s->refcount() == 0) { |
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
111 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
|
112 delete s; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
113 removed++; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
114 *p = entry->next(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
115 the_table()->free_entry(entry); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
116 } else { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
117 p = entry->next_addr(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
118 } |
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
119 // get next entry |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
120 entry = (HashtableEntry<Symbol*>*)HashtableEntry<Symbol*>::make_ptr(*p); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
121 } |
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 symbols_removed += removed; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
124 symbols_counted += total; |
2336
df1347358fe6
7024584: Symbol printouts shouldnt be under PrintGCDetails
coleenp
parents:
2177
diff
changeset
|
125 // Exclude printing for normal PrintGCDetails because people parse |
df1347358fe6
7024584: Symbol printouts shouldnt be under PrintGCDetails
coleenp
parents:
2177
diff
changeset
|
126 // this output. |
df1347358fe6
7024584: Symbol printouts shouldnt be under PrintGCDetails
coleenp
parents:
2177
diff
changeset
|
127 if (PrintGCDetails && Verbose && WizardMode) { |
df1347358fe6
7024584: Symbol printouts shouldnt be under PrintGCDetails
coleenp
parents:
2177
diff
changeset
|
128 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
|
129 (memory_total*HeapWordSize)/1024); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
130 } |
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 |
6162 | 133 unsigned int SymbolTable::new_hash(Symbol* sym) { |
134 ResourceMark rm; | |
135 // Use alternate hashing algorithm on this symbol. | |
136 return AltHashing::murmur3_32(seed(), (const jbyte*)sym->as_C_string(), sym->utf8_length()); | |
137 } | |
138 | |
139 // Create a new table and using alternate hash code, populate the new table | |
140 // with the existing strings. Set flag to use the alternate hash code afterwards. | |
141 void SymbolTable::rehash_table() { | |
142 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
|
143 // 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
|
144 if (DumpSharedSpaces) return; |
6162 | 145 // Create a new symbol table |
146 SymbolTable* new_table = new SymbolTable(); | |
147 | |
148 // Initialize the global seed for hashing. | |
149 _seed = AltHashing::compute_seed(); | |
150 assert(seed() != 0, "shouldn't be zero"); | |
151 | |
152 the_table()->move_to(new_table); | |
153 | |
154 // Delete the table and buckets (entries are reused in new table). | |
155 delete _the_table; | |
156 // Don't check if we need rehashing until the table gets unbalanced again. | |
157 // Then rehash with a new global seed. | |
158 _needs_rehashing = false; | |
159 _the_table = new_table; | |
160 } | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
161 |
0 | 162 // Lookup a symbol in a bucket. |
163 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
164 Symbol* SymbolTable::lookup(int index, const char* name, |
0 | 165 int len, unsigned int hash) { |
6162 | 166 int count = 0; |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
167 for (HashtableEntry<Symbol*>* e = bucket(index); e != NULL; e = e->next()) { |
6162 | 168 count++; // count all entries in this bucket, not just ones with same hash |
0 | 169 if (e->hash() == hash) { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
170 Symbol* sym = e->literal(); |
0 | 171 if (sym->equals(name, len)) { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
172 // something is referencing this symbol now. |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
173 sym->increment_refcount(); |
0 | 174 return sym; |
175 } | |
176 } | |
177 } | |
6162 | 178 // If the bucket size is too deep check if this hash code is insufficient. |
179 if (count >= BasicHashtable::rehash_count && !needs_rehashing()) { | |
180 _needs_rehashing = check_rehash_table(count); | |
181 } | |
0 | 182 return NULL; |
183 } | |
184 | |
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
185 // Pick hashing algorithm. |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
186 unsigned int SymbolTable::hash_symbol(const char* s, int len) { |
6162 | 187 return use_alternate_hashcode() ? |
188 AltHashing::murmur3_32(seed(), (const jbyte*)s, len) : | |
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
189 java_lang_String::to_hash(s, len); |
6162 | 190 } |
191 | |
0 | 192 |
193 // We take care not to be blocking while holding the | |
194 // SymbolTable_lock. Otherwise, the system might deadlock, since the | |
195 // symboltable is used during compilation (VM_thread) The lock free | |
196 // synchronization is simplified by the fact that we do not delete | |
197 // entries in the symbol table during normal execution (only during | |
198 // safepoints). | |
199 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
200 Symbol* SymbolTable::lookup(const char* name, int len, TRAPS) { |
0 | 201 unsigned int hashValue = hash_symbol(name, len); |
202 int index = the_table()->hash_to_index(hashValue); | |
203 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
204 Symbol* s = the_table()->lookup(index, name, len, hashValue); |
0 | 205 |
206 // Found | |
207 if (s != NULL) return s; | |
208 | |
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
209 // Grab SymbolTable_lock first. |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
210 MutexLocker ml(SymbolTable_lock, THREAD); |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
211 |
0 | 212 // 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
|
213 return the_table()->basic_add(index, (u1*)name, len, hashValue, true, CHECK_NULL); |
0 | 214 } |
215 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
216 Symbol* SymbolTable::lookup(const Symbol* sym, int begin, int end, TRAPS) { |
0 | 217 char* buffer; |
218 int index, len; | |
219 unsigned int hashValue; | |
220 char* name; | |
221 { | |
222 debug_only(No_Safepoint_Verifier nsv;) | |
223 | |
224 name = (char*)sym->base() + begin; | |
225 len = end - begin; | |
226 hashValue = hash_symbol(name, len); | |
227 index = the_table()->hash_to_index(hashValue); | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
228 Symbol* s = the_table()->lookup(index, name, len, hashValue); |
0 | 229 |
230 // Found | |
231 if (s != NULL) return s; | |
232 } | |
233 | |
234 // Otherwise, add to symbol to table. Copy to a C string first. | |
235 char stack_buf[128]; | |
236 ResourceMark rm(THREAD); | |
237 if (len <= 128) { | |
238 buffer = stack_buf; | |
239 } else { | |
240 buffer = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, len); | |
241 } | |
242 for (int i=0; i<len; i++) { | |
243 buffer[i] = name[i]; | |
244 } | |
245 // Make sure there is no safepoint in the code above since name can't move. | |
246 // We can't include the code in No_Safepoint_Verifier because of the | |
247 // ResourceMark. | |
248 | |
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
249 // Grab SymbolTable_lock first. |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
250 MutexLocker ml(SymbolTable_lock, THREAD); |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
251 |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
252 return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, CHECK_NULL); |
0 | 253 } |
254 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
255 Symbol* SymbolTable::lookup_only(const char* name, int len, |
0 | 256 unsigned int& hash) { |
257 hash = hash_symbol(name, len); | |
258 int index = the_table()->hash_to_index(hash); | |
259 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
260 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
|
261 return s; |
0 | 262 } |
263 | |
4800
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
264 // 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
|
265 // Do not create any new symbols |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
266 // 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
|
267 Symbol** SymbolTable::lookup_symbol_addr(Symbol* sym){ |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
268 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
|
269 int index = the_table()->hash_to_index(hash); |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
270 |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
271 for (HashtableEntry<Symbol*>* e = the_table()->bucket(index); e != NULL; e = e->next()) { |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
272 if (e->hash() == hash) { |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
273 Symbol* literal_sym = e->literal(); |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
274 if (sym == literal_sym) { |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
275 return e->literal_addr(); |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
276 } |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
277 } |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
278 } |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
279 return NULL; |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
280 } |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
281 |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
282 // Suggestion: Push unicode-based lookup all the way into the hashing |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
283 // 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
|
284 // an actual new Symbol* is created. |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
285 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
|
286 int utf8_length = UNICODE::utf8_length((jchar*) name, utf16_length); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
287 char stack_buf[128]; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
288 if (utf8_length < (int) sizeof(stack_buf)) { |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
289 char* chars = stack_buf; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
290 UNICODE::convert_to_utf8(name, utf16_length, chars); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
291 return lookup(chars, utf8_length, THREAD); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
292 } else { |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
293 ResourceMark rm(THREAD); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
294 char* chars = NEW_RESOURCE_ARRAY(char, utf8_length + 1);; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
295 UNICODE::convert_to_utf8(name, utf16_length, chars); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
296 return lookup(chars, utf8_length, THREAD); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
297 } |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
298 } |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
299 |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
300 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
|
301 unsigned int& hash) { |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
302 int utf8_length = UNICODE::utf8_length((jchar*) name, utf16_length); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
303 char stack_buf[128]; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
304 if (utf8_length < (int) sizeof(stack_buf)) { |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
305 char* chars = stack_buf; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
306 UNICODE::convert_to_utf8(name, utf16_length, chars); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
307 return lookup_only(chars, utf8_length, hash); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
308 } else { |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
309 ResourceMark rm; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
310 char* chars = NEW_RESOURCE_ARRAY(char, utf8_length + 1);; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
311 UNICODE::convert_to_utf8(name, utf16_length, chars); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
312 return lookup_only(chars, utf8_length, hash); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
313 } |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
314 } |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
315 |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
316 void SymbolTable::add(Handle class_loader, constantPoolHandle cp, |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
317 int names_count, |
0 | 318 const char** names, int* lengths, int* cp_indices, |
319 unsigned int* hashValues, TRAPS) { | |
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
320 // Grab SymbolTable_lock first. |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
321 MutexLocker ml(SymbolTable_lock, THREAD); |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
322 |
0 | 323 SymbolTable* table = the_table(); |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
324 bool added = table->basic_add(class_loader, cp, names_count, names, lengths, |
0 | 325 cp_indices, hashValues, CHECK); |
326 if (!added) { | |
327 // do it the hard way | |
328 for (int i=0; i<names_count; i++) { | |
329 int index = table->hash_to_index(hashValues[i]); | |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
330 bool c_heap = class_loader() != NULL; |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
331 Symbol* sym = table->basic_add(index, (u1*)names[i], lengths[i], hashValues[i], c_heap, CHECK); |
0 | 332 cp->symbol_at_put(cp_indices[i], sym); |
333 } | |
334 } | |
335 } | |
336 | |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
337 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
|
338 unsigned int hash; |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
339 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
|
340 if (result != NULL) { |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
341 return result; |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
342 } |
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
343 // Grab SymbolTable_lock first. |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
344 MutexLocker ml(SymbolTable_lock, THREAD); |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
345 |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
346 SymbolTable* table = the_table(); |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
347 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
|
348 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
|
349 } |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
350 |
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
351 Symbol* SymbolTable::basic_add(int index_arg, u1 *name, int len, |
6162 | 352 unsigned int hashValue_arg, bool c_heap, TRAPS) { |
0 | 353 assert(!Universe::heap()->is_in_reserved(name) || GC_locker::is_active(), |
354 "proposed name of symbol must be stable"); | |
355 | |
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
356 // 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
|
357 if (len > Symbol::max_length()) { |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
358 THROW_MSG_0(vmSymbols::java_lang_InternalError(), |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
359 "name is too long to represent"); |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
360 } |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
361 |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
362 // 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
|
363 No_Safepoint_Verifier nsv; |
0 | 364 |
6162 | 365 // 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
|
366 // the hash value and index. |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
367 unsigned int hashValue; |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
368 int index; |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
369 if (use_alternate_hashcode()) { |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
370 hashValue = hash_symbol((const char*)name, len); |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
371 index = hash_to_index(hashValue); |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
372 } else { |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
373 hashValue = hashValue_arg; |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
374 index = index_arg; |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
375 } |
6162 | 376 |
0 | 377 // Since look-up was done lock-free, we need to check if another |
378 // 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
|
379 Symbol* test = lookup(index, (char*)name, len, hashValue); |
0 | 380 if (test != NULL) { |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
381 // 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
|
382 assert(test->refcount() != 0, "lookup should have incremented the count"); |
0 | 383 return test; |
384 } | |
385 | |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
386 // Create a new symbol. |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
387 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
|
388 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
|
389 |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
390 HashtableEntry<Symbol*>* entry = new_entry(hashValue, sym); |
0 | 391 add_entry(index, entry); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
392 return sym; |
0 | 393 } |
394 | |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
395 // 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
|
396 // parsing. |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
397 bool SymbolTable::basic_add(Handle class_loader, constantPoolHandle cp, |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
398 int names_count, |
0 | 399 const char** names, int* lengths, |
400 int* cp_indices, unsigned int* hashValues, | |
401 TRAPS) { | |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
402 |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
403 // 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
|
404 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
|
405 if (lengths[i] > Symbol::max_length()) { |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
406 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
|
407 "name is too long to represent"); |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
408 } |
0 | 409 } |
410 | |
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
411 // 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
|
412 No_Safepoint_Verifier nsv; |
0 | 413 |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
414 for (int i=0; i<names_count; i++) { |
6162 | 415 // Check if the symbol table has been rehashed, if so, need to recalculate |
416 // the hash value. | |
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
417 unsigned int hashValue; |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
418 if (use_alternate_hashcode()) { |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
419 hashValue = hash_symbol(names[i], lengths[i]); |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
420 } else { |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
421 hashValue = hashValues[i]; |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
422 } |
0 | 423 // Since look-up was done lock-free, we need to check if another |
424 // thread beat us in the race to insert the symbol. | |
6162 | 425 int index = hash_to_index(hashValue); |
426 Symbol* test = lookup(index, names[i], lengths[i], hashValue); | |
0 | 427 if (test != NULL) { |
605 | 428 // A race occurred and another thread introduced the symbol, this one |
0 | 429 // will be dropped and collected. Use test instead. |
430 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
|
431 assert(test->refcount() != 0, "lookup should have incremented the count"); |
0 | 432 } else { |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
433 // 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
|
434 // are allocated specially in a permanent arena. |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
435 bool c_heap = class_loader() != NULL; |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
436 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
|
437 assert(sym->equals(names[i], lengths[i]), "symbol must be properly initialized"); // why wouldn't it be??? |
6162 | 438 HashtableEntry<Symbol*>* entry = new_entry(hashValue, sym); |
0 | 439 add_entry(index, entry); |
440 cp->symbol_at_put(cp_indices[i], sym); | |
441 } | |
442 } | |
443 return true; | |
444 } | |
445 | |
446 | |
447 void SymbolTable::verify() { | |
448 for (int i = 0; i < the_table()->table_size(); ++i) { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
449 HashtableEntry<Symbol*>* p = the_table()->bucket(i); |
0 | 450 for ( ; p != NULL; p = p->next()) { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
451 Symbol* s = (Symbol*)(p->literal()); |
0 | 452 guarantee(s != NULL, "symbol is NULL"); |
453 unsigned int h = hash_symbol((char*)s->bytes(), s->utf8_length()); | |
454 guarantee(p->hash() == h, "broken hash in symbol table entry"); | |
455 guarantee(the_table()->hash_to_index(h) == i, | |
456 "wrong index in symbol table"); | |
457 } | |
458 } | |
459 } | |
460 | |
6162 | 461 void SymbolTable::dump(outputStream* st) { |
462 NumberSeq summary; | |
463 for (int i = 0; i < the_table()->table_size(); ++i) { | |
464 int count = 0; | |
465 for (HashtableEntry<Symbol*>* e = the_table()->bucket(i); | |
466 e != NULL; e = e->next()) { | |
467 count++; | |
468 } | |
469 summary.add((double)count); | |
470 } | |
471 st->print_cr("SymbolTable statistics:"); | |
472 st->print_cr("Number of buckets : %7d", summary.num()); | |
473 st->print_cr("Average bucket size : %7.0f", summary.avg()); | |
474 st->print_cr("Variance of bucket size : %7.0f", summary.variance()); | |
475 st->print_cr("Std. dev. of bucket size: %7.0f", summary.sd()); | |
476 st->print_cr("Maximum bucket size : %7.0f", summary.maximum()); | |
477 } | |
478 | |
0 | 479 |
480 //--------------------------------------------------------------------------- | |
481 // Non-product code | |
482 | |
483 #ifndef PRODUCT | |
484 | |
485 void SymbolTable::print_histogram() { | |
486 MutexLocker ml(SymbolTable_lock); | |
487 const int results_length = 100; | |
488 int results[results_length]; | |
489 int i,j; | |
490 | |
491 // initialize results to zero | |
492 for (j = 0; j < results_length; j++) { | |
493 results[j] = 0; | |
494 } | |
495 | |
496 int total = 0; | |
497 int max_symbols = 0; | |
498 int out_of_range = 0; | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
499 int memory_total = 0; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
500 int count = 0; |
0 | 501 for (i = 0; i < the_table()->table_size(); i++) { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
502 HashtableEntry<Symbol*>* p = the_table()->bucket(i); |
0 | 503 for ( ; p != NULL; p = p->next()) { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
504 memory_total += p->literal()->object_size(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
505 count++; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
506 int counter = p->literal()->utf8_length(); |
0 | 507 total += counter; |
508 if (counter < results_length) { | |
509 results[counter]++; | |
510 } else { | |
511 out_of_range++; | |
512 } | |
513 max_symbols = MAX2(max_symbols, counter); | |
514 } | |
515 } | |
516 tty->print_cr("Symbol Table:"); | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
517 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
|
518 tty->print_cr("Total size in memory %5dK", |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
519 (memory_total*HeapWordSize)/1024); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
520 tty->print_cr("Total counted %5d", symbols_counted); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
521 tty->print_cr("Total removed %5d", symbols_removed); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
522 if (symbols_counted > 0) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
523 tty->print_cr("Percent removed %3.2f", |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
524 ((float)symbols_removed/(float)symbols_counted)* 100); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
525 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
526 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
|
527 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
|
528 arena()->size_in_bytes(), arena()->used()); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
529 tty->print_cr("Histogram of symbol length:"); |
0 | 530 tty->print_cr("%8s %5d", "Total ", total); |
531 tty->print_cr("%8s %5d", "Maximum", max_symbols); | |
532 tty->print_cr("%8s %3.2f", "Average", | |
533 ((float) total / (float) the_table()->table_size())); | |
534 tty->print_cr("%s", "Histogram:"); | |
535 tty->print_cr(" %s %29s", "Length", "Number chains that length"); | |
536 for (i = 0; i < results_length; i++) { | |
537 if (results[i] > 0) { | |
538 tty->print_cr("%6d %10d", i, results[i]); | |
539 } | |
540 } | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
541 if (Verbose) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
542 int line_length = 70; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
543 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
|
544 for (i = 0; i < results_length; i++) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
545 if (results[i] > 0) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
546 tty->print("%4d", i); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
547 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
|
548 tty->print("%1s", "*"); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
549 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
550 if (j == line_length) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
551 tty->print("%1s", "+"); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
552 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
553 tty->cr(); |
0 | 554 } |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
555 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
556 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
557 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
|
558 results_length, out_of_range); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
559 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
560 |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
561 void SymbolTable::print() { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
562 for (int i = 0; i < the_table()->table_size(); ++i) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
563 HashtableEntry<Symbol*>** p = the_table()->bucket_addr(i); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
564 HashtableEntry<Symbol*>* entry = the_table()->bucket(i); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
565 if (entry != NULL) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
566 while (entry != NULL) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
567 tty->print(PTR_FORMAT " ", entry->literal()); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
568 entry->literal()->print(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
569 tty->print(" %d", entry->literal()->refcount()); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
570 p = entry->next_addr(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
571 entry = (HashtableEntry<Symbol*>*)HashtableEntry<Symbol*>::make_ptr(*p); |
0 | 572 } |
573 tty->cr(); | |
574 } | |
575 } | |
576 } | |
577 #endif // PRODUCT | |
578 | |
579 // -------------------------------------------------------------------------- | |
580 | |
581 #ifdef ASSERT | |
582 class StableMemoryChecker : public StackObj { | |
583 enum { _bufsize = wordSize*4 }; | |
584 | |
585 address _region; | |
586 jint _size; | |
587 u1 _save_buf[_bufsize]; | |
588 | |
589 int sample(u1* save_buf) { | |
590 if (_size <= _bufsize) { | |
591 memcpy(save_buf, _region, _size); | |
592 return _size; | |
593 } else { | |
594 // copy head and tail | |
595 memcpy(&save_buf[0], _region, _bufsize/2); | |
596 memcpy(&save_buf[_bufsize/2], _region + _size - _bufsize/2, _bufsize/2); | |
597 return (_bufsize/2)*2; | |
598 } | |
599 } | |
600 | |
601 public: | |
602 StableMemoryChecker(const void* region, jint size) { | |
603 _region = (address) region; | |
604 _size = size; | |
605 sample(_save_buf); | |
606 } | |
607 | |
608 bool verify() { | |
609 u1 check_buf[sizeof(_save_buf)]; | |
610 int check_size = sample(check_buf); | |
611 return (0 == memcmp(_save_buf, check_buf, check_size)); | |
612 } | |
613 | |
614 void set_region(const void* region) { _region = (address) region; } | |
615 }; | |
616 #endif | |
617 | |
618 | |
619 // -------------------------------------------------------------------------- | |
620 StringTable* StringTable::_the_table = NULL; | |
621 | |
6162 | 622 bool StringTable::_needs_rehashing = false; |
623 jint StringTable::_seed = 0; | |
624 | |
625 // Pick hashing algorithm | |
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
626 unsigned int StringTable::hash_string(const jchar* s, int len) { |
6162 | 627 return use_alternate_hashcode() ? AltHashing::murmur3_32(seed(), s, len) : |
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
628 java_lang_String::to_hash(s, len); |
6162 | 629 } |
630 | |
0 | 631 oop StringTable::lookup(int index, jchar* name, |
632 int len, unsigned int hash) { | |
6162 | 633 int count = 0; |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
634 for (HashtableEntry<oop>* l = bucket(index); l != NULL; l = l->next()) { |
6162 | 635 count++; |
0 | 636 if (l->hash() == hash) { |
637 if (java_lang_String::equals(l->literal(), name, len)) { | |
638 return l->literal(); | |
639 } | |
640 } | |
641 } | |
6162 | 642 // If the bucket size is too deep check if this hash code is insufficient. |
643 if (count >= BasicHashtable::rehash_count && !needs_rehashing()) { | |
644 _needs_rehashing = check_rehash_table(count); | |
645 } | |
0 | 646 return NULL; |
647 } | |
648 | |
649 | |
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
650 oop StringTable::basic_add(int index_arg, Handle string, jchar* name, |
6162 | 651 int len, unsigned int hashValue_arg, TRAPS) { |
0 | 652 |
653 assert(java_lang_String::equals(string(), name, len), | |
654 "string must be properly initialized"); | |
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
655 // 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
|
656 No_Safepoint_Verifier nsv; |
0 | 657 |
6162 | 658 // 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
|
659 // the hash value and index before second lookup. |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
660 unsigned int hashValue; |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
661 int index; |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
662 if (use_alternate_hashcode()) { |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
663 hashValue = hash_string(name, len); |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
664 index = hash_to_index(hashValue); |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
665 } else { |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
666 hashValue = hashValue_arg; |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
667 index = index_arg; |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
668 } |
6162 | 669 |
0 | 670 // Since look-up was done lock-free, we need to check if another |
671 // thread beat us in the race to insert the symbol. | |
672 | |
673 oop test = lookup(index, name, len, hashValue); // calls lookup(u1*, int) | |
674 if (test != NULL) { | |
675 // Entry already added | |
676 return test; | |
677 } | |
678 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
679 HashtableEntry<oop>* entry = new_entry(hashValue, string()); |
0 | 680 add_entry(index, entry); |
681 return string(); | |
682 } | |
683 | |
684 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
685 oop StringTable::lookup(Symbol* symbol) { |
0 | 686 ResourceMark rm; |
687 int length; | |
688 jchar* chars = symbol->as_unicode(length); | |
6162 | 689 unsigned int hashValue = hash_string(chars, length); |
0 | 690 int index = the_table()->hash_to_index(hashValue); |
691 return the_table()->lookup(index, chars, length, hashValue); | |
692 } | |
693 | |
694 | |
695 oop StringTable::intern(Handle string_or_null, jchar* name, | |
696 int len, TRAPS) { | |
6162 | 697 unsigned int hashValue = hash_string(name, len); |
0 | 698 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
|
699 oop found_string = the_table()->lookup(index, name, len, hashValue); |
0 | 700 |
701 // Found | |
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
702 if (found_string != NULL) return found_string; |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
703 |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
704 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
|
705 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
|
706 "proposed name of symbol must be stable"); |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
707 |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
708 Handle string; |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
709 // try to reuse the string if possible |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
710 if (!string_or_null.is_null() && (!JavaObjectsInPerm || string_or_null()->is_perm())) { |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
711 string = string_or_null; |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
712 } else { |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
713 string = java_lang_String::create_tenured_from_unicode(name, len, CHECK_NULL); |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
714 } |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
715 |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
716 // 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
|
717 // change at safepoint. |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
718 MutexLocker ml(StringTable_lock, THREAD); |
0 | 719 |
720 // Otherwise, add to symbol to table | |
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
721 return the_table()->basic_add(index, string, name, len, |
0 | 722 hashValue, CHECK_NULL); |
723 } | |
724 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
725 oop StringTable::intern(Symbol* symbol, TRAPS) { |
0 | 726 if (symbol == NULL) return NULL; |
727 ResourceMark rm(THREAD); | |
728 int length; | |
729 jchar* chars = symbol->as_unicode(length); | |
730 Handle string; | |
731 oop result = intern(string, chars, length, CHECK_NULL); | |
732 return result; | |
733 } | |
734 | |
735 | |
736 oop StringTable::intern(oop string, TRAPS) | |
737 { | |
738 if (string == NULL) return NULL; | |
739 ResourceMark rm(THREAD); | |
740 int length; | |
741 Handle h_string (THREAD, string); | |
742 jchar* chars = java_lang_String::as_unicode_string(string, length); | |
743 oop result = intern(h_string, chars, length, CHECK_NULL); | |
744 return result; | |
745 } | |
746 | |
747 | |
748 oop StringTable::intern(const char* utf8_string, TRAPS) { | |
749 if (utf8_string == NULL) return NULL; | |
750 ResourceMark rm(THREAD); | |
751 int length = UTF8::unicode_length(utf8_string); | |
752 jchar* chars = NEW_RESOURCE_ARRAY(jchar, length); | |
753 UTF8::convert_to_unicode(utf8_string, chars, length); | |
754 Handle string; | |
755 oop result = intern(string, chars, length, CHECK_NULL); | |
756 return result; | |
757 } | |
758 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
759 void StringTable::unlink(BoolObjectClosure* is_alive) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
760 // 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
|
761 // entries at a safepoint. |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
762 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
|
763 for (int i = 0; i < the_table()->table_size(); ++i) { |
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
764 HashtableEntry<oop>** p = the_table()->bucket_addr(i); |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
765 HashtableEntry<oop>* entry = the_table()->bucket(i); |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
766 while (entry != NULL) { |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
767 // 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
|
768 // 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
|
769 // 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
|
770 // end of the bucket. |
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
771 if (entry->is_shared() && !use_alternate_hashcode()) { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
772 break; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
773 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
774 assert(entry->literal() != NULL, "just checking"); |
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
775 if (entry->is_shared() || is_alive->do_object_b(entry->literal())) { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
776 p = entry->next_addr(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
777 } else { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
778 *p = entry->next(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
779 the_table()->free_entry(entry); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
780 } |
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
781 entry = (HashtableEntry<oop>*)HashtableEntry<oop>::make_ptr(*p); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
782 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
783 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
784 } |
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 void StringTable::oops_do(OopClosure* f) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
787 for (int i = 0; i < the_table()->table_size(); ++i) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
788 HashtableEntry<oop>** p = the_table()->bucket_addr(i); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
789 HashtableEntry<oop>* entry = the_table()->bucket(i); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
790 while (entry != NULL) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
791 f->do_oop((oop*)entry->literal_addr()); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
792 |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
793 // Did the closure remove the literal from the table? |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
794 if (entry->literal() == NULL) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
795 assert(!entry->is_shared(), "immutable hashtable entry?"); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
796 *p = entry->next(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
797 the_table()->free_entry(entry); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
798 } else { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
799 p = entry->next_addr(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
800 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
801 entry = (HashtableEntry<oop>*)HashtableEntry<oop>::make_ptr(*p); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
802 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
803 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
804 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
805 |
0 | 806 void StringTable::verify() { |
807 for (int i = 0; i < the_table()->table_size(); ++i) { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
808 HashtableEntry<oop>* p = the_table()->bucket(i); |
0 | 809 for ( ; p != NULL; p = p->next()) { |
810 oop s = p->literal(); | |
811 guarantee(s != NULL, "interned string is NULL"); | |
2379
b099aaf51bf8
6962931: move interned strings out of the perm gen
jcoomes
parents:
2336
diff
changeset
|
812 guarantee(s->is_perm() || !JavaObjectsInPerm, "interned string not in permspace"); |
2418
352622fd140a
7032129: Native memory usage grow unexpectedly for vm/oom/*InternedString tests
never
parents:
2379
diff
changeset
|
813 unsigned int h = java_lang_String::hash_string(s); |
0 | 814 guarantee(p->hash() == h, "broken hash in string table entry"); |
815 guarantee(the_table()->hash_to_index(h) == i, | |
816 "wrong index in string table"); | |
817 } | |
818 } | |
819 } | |
6162 | 820 |
821 void StringTable::dump(outputStream* st) { | |
822 NumberSeq summary; | |
823 for (int i = 0; i < the_table()->table_size(); ++i) { | |
824 HashtableEntry<oop>* p = the_table()->bucket(i); | |
825 int count = 0; | |
826 for ( ; p != NULL; p = p->next()) { | |
827 count++; | |
828 } | |
829 summary.add((double)count); | |
830 } | |
831 st->print_cr("StringTable statistics:"); | |
832 st->print_cr("Number of buckets : %7d", summary.num()); | |
833 st->print_cr("Average bucket size : %7.0f", summary.avg()); | |
834 st->print_cr("Variance of bucket size : %7.0f", summary.variance()); | |
835 st->print_cr("Std. dev. of bucket size: %7.0f", summary.sd()); | |
836 st->print_cr("Maximum bucket size : %7.0f", summary.maximum()); | |
837 } | |
838 | |
839 | |
840 unsigned int StringTable::new_hash(oop string) { | |
841 ResourceMark rm; | |
842 int length; | |
843 jchar* chars = java_lang_String::as_unicode_string(string, length); | |
844 // Use alternate hashing algorithm on the string | |
845 return AltHashing::murmur3_32(seed(), chars, length); | |
846 } | |
847 | |
848 // Create a new table and using alternate hash code, populate the new table | |
849 // with the existing strings. Set flag to use the alternate hash code afterwards. | |
850 void StringTable::rehash_table() { | |
851 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
|
852 // 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
|
853 if (DumpSharedSpaces) return; |
6162 | 854 StringTable* new_table = new StringTable(); |
855 | |
856 // Initialize new global seed for hashing. | |
857 _seed = AltHashing::compute_seed(); | |
858 assert(seed() != 0, "shouldn't be zero"); | |
859 | |
860 // Rehash the table | |
861 the_table()->move_to(new_table); | |
862 | |
863 // Delete the table and buckets (entries are reused in new table). | |
864 delete _the_table; | |
865 // Don't check if we need rehashing until the table gets unbalanced again. | |
866 // Then rehash with a new global seed. | |
867 _needs_rehashing = false; | |
868 _the_table = new_table; | |
869 } |