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