author | ehelin |
Tue, 25 Feb 2014 11:02:11 +0100 | |
changeset 22905 | 4b1549d69106 |
parent 22545 | b93a7f0e9b9d |
child 23472 | 35e93890ed88 |
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" |
|
1 | 38 |
|
39 |
// -------------------------------------------------------------------------- |
|
40 |
||
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
41 |
// the number of buckets a thread claims |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
42 |
const int ClaimChunkSize = 32; |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
43 |
|
1 | 44 |
SymbolTable* SymbolTable::_the_table = NULL; |
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
45 |
// 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
|
46 |
Arena* SymbolTable::_arena = NULL; |
13087 | 47 |
bool SymbolTable::_needs_rehashing = false; |
1 | 48 |
|
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
49 |
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
|
50 |
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
|
51 |
|
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
52 |
Symbol* sym; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13199
diff
changeset
|
53 |
|
15934
104ff83451f1
8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents:
14742
diff
changeset
|
54 |
if (DumpSharedSpaces) { |
104ff83451f1
8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents:
14742
diff
changeset
|
55 |
// Allocate all symbols to CLD shared metaspace |
104ff83451f1
8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents:
14742
diff
changeset
|
56 |
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
|
57 |
} else if (c_heap) { |
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
58 |
// refcount starts as 1 |
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
59 |
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
|
60 |
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
|
61 |
} else { |
15934
104ff83451f1
8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents:
14742
diff
changeset
|
62 |
// Allocate to global arena |
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
63 |
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
|
64 |
} |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
65 |
return sym; |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
66 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
67 |
|
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
68 |
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
|
69 |
// 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
|
70 |
if (arena_alloc_size == 0) { |
13195 | 71 |
_arena = new (mtSymbol) Arena(); |
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
72 |
} else { |
13195 | 73 |
_arena = new (mtSymbol) Arena(arena_alloc_size); |
8076
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 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
76 |
|
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
77 |
// 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
|
78 |
void SymbolTable::symbols_do(SymbolClosure *cl) { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
79 |
const int n = the_table()->table_size(); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
80 |
for (int i = 0; i < n; i++) { |
13195 | 81 |
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
|
82 |
p != NULL; |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
83 |
p = p->next()) { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
84 |
cl->do_symbol(p->literal_addr()); |
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 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
88 |
|
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
89 |
int SymbolTable::_symbols_removed = 0; |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
90 |
int SymbolTable::_symbols_counted = 0; |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
91 |
volatile int SymbolTable::_parallel_claimed_idx = 0; |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
92 |
|
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
93 |
void SymbolTable::buckets_unlink(int start_idx, int end_idx, int* processed, int* removed, size_t* memory_total) { |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
94 |
for (int i = start_idx; i < end_idx; ++i) { |
13195 | 95 |
HashtableEntry<Symbol*, mtSymbol>** p = the_table()->bucket_addr(i); |
96 |
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
|
97 |
while (entry != NULL) { |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
98 |
// 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
|
99 |
// 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
|
100 |
// 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
|
101 |
// end of the bucket. |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
102 |
if (entry->is_shared() && !use_alternate_hashcode()) { |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
103 |
break; |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
104 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
105 |
Symbol* s = entry->literal(); |
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
106 |
(*memory_total) += s->size(); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
107 |
(*processed)++; |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
108 |
assert(s != NULL, "just checking"); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
109 |
// If reference count is zero, remove. |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
110 |
if (s->refcount() == 0) { |
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
111 |
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
|
112 |
delete s; |
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
113 |
(*removed)++; |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
114 |
*p = entry->next(); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
115 |
the_table()->free_entry(entry); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
116 |
} else { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
117 |
p = entry->next_addr(); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
118 |
} |
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
119 |
// get next entry |
13195 | 120 |
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
|
121 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
122 |
} |
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
123 |
} |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
124 |
|
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
125 |
// Remove unreferenced symbols from the symbol table |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
126 |
// This is done late during GC. |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
127 |
void SymbolTable::unlink(int* processed, int* removed) { |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
128 |
size_t memory_total = 0; |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
129 |
buckets_unlink(0, the_table()->table_size(), processed, removed, &memory_total); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
130 |
_symbols_removed += *removed; |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
131 |
_symbols_counted += *processed; |
8655
fec854507832
7024584: Symbol printouts shouldnt be under PrintGCDetails
coleenp
parents:
8076
diff
changeset
|
132 |
// Exclude printing for normal PrintGCDetails because people parse |
fec854507832
7024584: Symbol printouts shouldnt be under PrintGCDetails
coleenp
parents:
8076
diff
changeset
|
133 |
// this output. |
fec854507832
7024584: Symbol printouts shouldnt be under PrintGCDetails
coleenp
parents:
8076
diff
changeset
|
134 |
if (PrintGCDetails && Verbose && WizardMode) { |
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
135 |
gclog_or_tty->print(" [Symbols=%d size=" SIZE_FORMAT "K] ", *processed, |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
136 |
(memory_total*HeapWordSize)/1024); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
137 |
} |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
138 |
} |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
139 |
|
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
140 |
void SymbolTable::possibly_parallel_unlink(int* processed, int* removed) { |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
141 |
const int limit = the_table()->table_size(); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
142 |
|
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
143 |
size_t memory_total = 0; |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
144 |
|
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
145 |
for (;;) { |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
146 |
// Grab next set of buckets to scan |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
147 |
int start_idx = Atomic::add(ClaimChunkSize, &_parallel_claimed_idx) - ClaimChunkSize; |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
148 |
if (start_idx >= limit) { |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
149 |
// End of table |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
150 |
break; |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
151 |
} |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
152 |
|
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
153 |
int end_idx = MIN2(limit, start_idx + ClaimChunkSize); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
154 |
buckets_unlink(start_idx, end_idx, processed, removed, &memory_total); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
155 |
} |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
156 |
Atomic::add(*processed, &_symbols_counted); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
157 |
Atomic::add(*removed, &_symbols_removed); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
158 |
// Exclude printing for normal PrintGCDetails because people parse |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
159 |
// this output. |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
160 |
if (PrintGCDetails && Verbose && WizardMode) { |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
161 |
gclog_or_tty->print(" [Symbols: scanned=%d removed=%d size=" SIZE_FORMAT "K] ", *processed, *removed, |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
162 |
(memory_total*HeapWordSize)/1024); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
163 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
164 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
165 |
|
13087 | 166 |
// Create a new table and using alternate hash code, populate the new table |
167 |
// with the existing strings. Set flag to use the alternate hash code afterwards. |
|
168 |
void SymbolTable::rehash_table() { |
|
169 |
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
|
170 |
// 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
|
171 |
if (DumpSharedSpaces) return; |
13087 | 172 |
// Create a new symbol table |
173 |
SymbolTable* new_table = new SymbolTable(); |
|
174 |
||
175 |
the_table()->move_to(new_table); |
|
176 |
||
177 |
// Delete the table and buckets (entries are reused in new table). |
|
178 |
delete _the_table; |
|
179 |
// Don't check if we need rehashing until the table gets unbalanced again. |
|
180 |
// Then rehash with a new global seed. |
|
181 |
_needs_rehashing = false; |
|
182 |
_the_table = new_table; |
|
183 |
} |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
184 |
|
1 | 185 |
// Lookup a symbol in a bucket. |
186 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
187 |
Symbol* SymbolTable::lookup(int index, const char* name, |
1 | 188 |
int len, unsigned int hash) { |
13087 | 189 |
int count = 0; |
13195 | 190 |
for (HashtableEntry<Symbol*, mtSymbol>* e = bucket(index); e != NULL; e = e->next()) { |
13087 | 191 |
count++; // count all entries in this bucket, not just ones with same hash |
1 | 192 |
if (e->hash() == hash) { |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
193 |
Symbol* sym = e->literal(); |
1 | 194 |
if (sym->equals(name, len)) { |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
195 |
// something is referencing this symbol now. |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
196 |
sym->increment_refcount(); |
1 | 197 |
return sym; |
198 |
} |
|
199 |
} |
|
200 |
} |
|
13087 | 201 |
// If the bucket size is too deep check if this hash code is insufficient. |
13195 | 202 |
if (count >= BasicHashtable<mtSymbol>::rehash_count && !needs_rehashing()) { |
13087 | 203 |
_needs_rehashing = check_rehash_table(count); |
204 |
} |
|
1 | 205 |
return NULL; |
206 |
} |
|
207 |
||
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
208 |
// Pick hashing algorithm. |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
209 |
unsigned int SymbolTable::hash_symbol(const char* s, int len) { |
13087 | 210 |
return use_alternate_hashcode() ? |
211 |
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
|
212 |
java_lang_String::hash_code(s, len); |
13087 | 213 |
} |
214 |
||
1 | 215 |
|
216 |
// We take care not to be blocking while holding the |
|
217 |
// SymbolTable_lock. Otherwise, the system might deadlock, since the |
|
218 |
// symboltable is used during compilation (VM_thread) The lock free |
|
219 |
// synchronization is simplified by the fact that we do not delete |
|
220 |
// entries in the symbol table during normal execution (only during |
|
221 |
// safepoints). |
|
222 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
223 |
Symbol* SymbolTable::lookup(const char* name, int len, TRAPS) { |
1 | 224 |
unsigned int hashValue = hash_symbol(name, len); |
225 |
int index = the_table()->hash_to_index(hashValue); |
|
226 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
227 |
Symbol* s = the_table()->lookup(index, name, len, hashValue); |
1 | 228 |
|
229 |
// Found |
|
230 |
if (s != NULL) return s; |
|
231 |
||
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
232 |
// Grab SymbolTable_lock first. |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
233 |
MutexLocker ml(SymbolTable_lock, THREAD); |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
234 |
|
1 | 235 |
// 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
|
236 |
return the_table()->basic_add(index, (u1*)name, len, hashValue, true, CHECK_NULL); |
1 | 237 |
} |
238 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
239 |
Symbol* SymbolTable::lookup(const Symbol* sym, int begin, int end, TRAPS) { |
1 | 240 |
char* buffer; |
241 |
int index, len; |
|
242 |
unsigned int hashValue; |
|
243 |
char* name; |
|
244 |
{ |
|
245 |
debug_only(No_Safepoint_Verifier nsv;) |
|
246 |
||
247 |
name = (char*)sym->base() + begin; |
|
248 |
len = end - begin; |
|
249 |
hashValue = hash_symbol(name, len); |
|
250 |
index = the_table()->hash_to_index(hashValue); |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
251 |
Symbol* s = the_table()->lookup(index, name, len, hashValue); |
1 | 252 |
|
253 |
// Found |
|
254 |
if (s != NULL) return s; |
|
255 |
} |
|
256 |
||
257 |
// Otherwise, add to symbol to table. Copy to a C string first. |
|
258 |
char stack_buf[128]; |
|
259 |
ResourceMark rm(THREAD); |
|
260 |
if (len <= 128) { |
|
261 |
buffer = stack_buf; |
|
262 |
} else { |
|
263 |
buffer = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, len); |
|
264 |
} |
|
265 |
for (int i=0; i<len; i++) { |
|
266 |
buffer[i] = name[i]; |
|
267 |
} |
|
268 |
// Make sure there is no safepoint in the code above since name can't move. |
|
269 |
// We can't include the code in No_Safepoint_Verifier because of the |
|
270 |
// ResourceMark. |
|
271 |
||
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
272 |
// Grab SymbolTable_lock first. |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
273 |
MutexLocker ml(SymbolTable_lock, THREAD); |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
274 |
|
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
275 |
return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, CHECK_NULL); |
1 | 276 |
} |
277 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
278 |
Symbol* SymbolTable::lookup_only(const char* name, int len, |
1 | 279 |
unsigned int& hash) { |
280 |
hash = hash_symbol(name, len); |
|
281 |
int index = the_table()->hash_to_index(hash); |
|
282 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
283 |
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
|
284 |
return s; |
1 | 285 |
} |
286 |
||
11480
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
287 |
// 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
|
288 |
// Do not create any new symbols |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
289 |
// 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
|
290 |
Symbol** SymbolTable::lookup_symbol_addr(Symbol* sym){ |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
291 |
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
|
292 |
int index = the_table()->hash_to_index(hash); |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
293 |
|
13195 | 294 |
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
|
295 |
if (e->hash() == hash) { |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
296 |
Symbol* literal_sym = e->literal(); |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
297 |
if (sym == literal_sym) { |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
298 |
return e->literal_addr(); |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
299 |
} |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
300 |
} |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
301 |
} |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
302 |
return NULL; |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
303 |
} |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
304 |
|
2332
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
305 |
// Suggestion: Push unicode-based lookup all the way into the hashing |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
306 |
// 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
|
307 |
// an actual new Symbol* is created. |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
308 |
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
|
309 |
int utf8_length = UNICODE::utf8_length((jchar*) name, utf16_length); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
310 |
char stack_buf[128]; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
311 |
if (utf8_length < (int) sizeof(stack_buf)) { |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
312 |
char* chars = stack_buf; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
313 |
UNICODE::convert_to_utf8(name, utf16_length, chars); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
314 |
return lookup(chars, utf8_length, THREAD); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
315 |
} else { |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
316 |
ResourceMark rm(THREAD); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
317 |
char* chars = NEW_RESOURCE_ARRAY(char, utf8_length + 1);; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
318 |
UNICODE::convert_to_utf8(name, utf16_length, chars); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
319 |
return lookup(chars, utf8_length, THREAD); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
320 |
} |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
321 |
} |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
322 |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
323 |
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
|
324 |
unsigned int& hash) { |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
325 |
int utf8_length = UNICODE::utf8_length((jchar*) name, utf16_length); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
326 |
char stack_buf[128]; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
327 |
if (utf8_length < (int) sizeof(stack_buf)) { |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
328 |
char* chars = stack_buf; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
329 |
UNICODE::convert_to_utf8(name, utf16_length, chars); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
330 |
return lookup_only(chars, utf8_length, hash); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
331 |
} else { |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
332 |
ResourceMark rm; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
333 |
char* chars = NEW_RESOURCE_ARRAY(char, utf8_length + 1);; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
334 |
UNICODE::convert_to_utf8(name, utf16_length, chars); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
335 |
return lookup_only(chars, utf8_length, hash); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
336 |
} |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
337 |
} |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
338 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13199
diff
changeset
|
339 |
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
|
340 |
int names_count, |
1 | 341 |
const char** names, int* lengths, int* cp_indices, |
342 |
unsigned int* hashValues, TRAPS) { |
|
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
343 |
// Grab SymbolTable_lock first. |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
344 |
MutexLocker ml(SymbolTable_lock, THREAD); |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
345 |
|
1 | 346 |
SymbolTable* table = the_table(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13199
diff
changeset
|
347 |
bool added = table->basic_add(loader_data, cp, names_count, names, lengths, |
1 | 348 |
cp_indices, hashValues, CHECK); |
349 |
if (!added) { |
|
350 |
// do it the hard way |
|
351 |
for (int i=0; i<names_count; i++) { |
|
352 |
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
|
353 |
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
|
354 |
Symbol* sym = table->basic_add(index, (u1*)names[i], lengths[i], hashValues[i], c_heap, CHECK); |
1 | 355 |
cp->symbol_at_put(cp_indices[i], sym); |
356 |
} |
|
357 |
} |
|
358 |
} |
|
359 |
||
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
360 |
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
|
361 |
unsigned int hash; |
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
362 |
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
|
363 |
if (result != NULL) { |
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
364 |
return result; |
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
365 |
} |
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
366 |
// Grab SymbolTable_lock first. |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
367 |
MutexLocker ml(SymbolTable_lock, THREAD); |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
368 |
|
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
369 |
SymbolTable* table = the_table(); |
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
370 |
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
|
371 |
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
|
372 |
} |
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
373 |
|
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
374 |
Symbol* SymbolTable::basic_add(int index_arg, u1 *name, int len, |
13087 | 375 |
unsigned int hashValue_arg, bool c_heap, TRAPS) { |
20079 | 376 |
assert(!Universe::heap()->is_in_reserved(name), |
1 | 377 |
"proposed name of symbol must be stable"); |
378 |
||
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
379 |
// 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
|
380 |
if (len > Symbol::max_length()) { |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
381 |
THROW_MSG_0(vmSymbols::java_lang_InternalError(), |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
382 |
"name is too long to represent"); |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
383 |
} |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
384 |
|
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
385 |
// 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
|
386 |
No_Safepoint_Verifier nsv; |
1 | 387 |
|
13087 | 388 |
// 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
|
389 |
// the hash value and index. |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
390 |
unsigned int hashValue; |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
391 |
int index; |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
392 |
if (use_alternate_hashcode()) { |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
393 |
hashValue = hash_symbol((const char*)name, len); |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
394 |
index = hash_to_index(hashValue); |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
395 |
} else { |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
396 |
hashValue = hashValue_arg; |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
397 |
index = index_arg; |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
398 |
} |
13087 | 399 |
|
1 | 400 |
// Since look-up was done lock-free, we need to check if another |
401 |
// 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
|
402 |
Symbol* test = lookup(index, (char*)name, len, hashValue); |
1 | 403 |
if (test != NULL) { |
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
404 |
// 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
|
405 |
assert(test->refcount() != 0, "lookup should have incremented the count"); |
1 | 406 |
return test; |
407 |
} |
|
408 |
||
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
409 |
// Create a new symbol. |
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
410 |
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
|
411 |
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
|
412 |
|
13195 | 413 |
HashtableEntry<Symbol*, mtSymbol>* entry = new_entry(hashValue, sym); |
1 | 414 |
add_entry(index, entry); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
415 |
return sym; |
1 | 416 |
} |
417 |
||
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
418 |
// 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
|
419 |
// parsing. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13199
diff
changeset
|
420 |
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
|
421 |
int names_count, |
1 | 422 |
const char** names, int* lengths, |
423 |
int* cp_indices, unsigned int* hashValues, |
|
424 |
TRAPS) { |
|
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
425 |
|
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
426 |
// 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
|
427 |
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
|
428 |
if (lengths[i] > Symbol::max_length()) { |
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
429 |
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
|
430 |
"name is too long to represent"); |
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
431 |
} |
1 | 432 |
} |
433 |
||
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
434 |
// 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
|
435 |
No_Safepoint_Verifier nsv; |
1 | 436 |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
437 |
for (int i=0; i<names_count; i++) { |
13087 | 438 |
// Check if the symbol table has been rehashed, if so, need to recalculate |
439 |
// the hash value. |
|
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
440 |
unsigned int hashValue; |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
441 |
if (use_alternate_hashcode()) { |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
442 |
hashValue = hash_symbol(names[i], lengths[i]); |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
443 |
} else { |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
444 |
hashValue = hashValues[i]; |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
445 |
} |
1 | 446 |
// Since look-up was done lock-free, we need to check if another |
447 |
// thread beat us in the race to insert the symbol. |
|
13087 | 448 |
int index = hash_to_index(hashValue); |
449 |
Symbol* test = lookup(index, names[i], lengths[i], hashValue); |
|
1 | 450 |
if (test != NULL) { |
2131 | 451 |
// A race occurred and another thread introduced the symbol, this one |
1 | 452 |
// will be dropped and collected. Use test instead. |
453 |
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
|
454 |
assert(test->refcount() != 0, "lookup should have incremented the count"); |
1 | 455 |
} else { |
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
456 |
// 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
|
457 |
// are allocated specially in a permanent arena. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13199
diff
changeset
|
458 |
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
|
459 |
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
|
460 |
assert(sym->equals(names[i], lengths[i]), "symbol must be properly initialized"); // why wouldn't it be??? |
13195 | 461 |
HashtableEntry<Symbol*, mtSymbol>* entry = new_entry(hashValue, sym); |
1 | 462 |
add_entry(index, entry); |
463 |
cp->symbol_at_put(cp_indices[i], sym); |
|
464 |
} |
|
465 |
} |
|
466 |
return true; |
|
467 |
} |
|
468 |
||
469 |
||
470 |
void SymbolTable::verify() { |
|
471 |
for (int i = 0; i < the_table()->table_size(); ++i) { |
|
13195 | 472 |
HashtableEntry<Symbol*, mtSymbol>* p = the_table()->bucket(i); |
1 | 473 |
for ( ; p != NULL; p = p->next()) { |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
474 |
Symbol* s = (Symbol*)(p->literal()); |
1 | 475 |
guarantee(s != NULL, "symbol is NULL"); |
476 |
unsigned int h = hash_symbol((char*)s->bytes(), s->utf8_length()); |
|
477 |
guarantee(p->hash() == h, "broken hash in symbol table entry"); |
|
478 |
guarantee(the_table()->hash_to_index(h) == i, |
|
479 |
"wrong index in symbol table"); |
|
480 |
} |
|
481 |
} |
|
482 |
} |
|
483 |
||
13087 | 484 |
void SymbolTable::dump(outputStream* st) { |
17610
c6857feaac47
8014262: PrintStringTableStatistics should include more footprint info
iklam
parents:
17081
diff
changeset
|
485 |
the_table()->dump_table(st, "SymbolTable"); |
13087 | 486 |
} |
487 |
||
1 | 488 |
|
489 |
//--------------------------------------------------------------------------- |
|
490 |
// Non-product code |
|
491 |
||
492 |
#ifndef PRODUCT |
|
493 |
||
494 |
void SymbolTable::print_histogram() { |
|
495 |
MutexLocker ml(SymbolTable_lock); |
|
496 |
const int results_length = 100; |
|
497 |
int results[results_length]; |
|
498 |
int i,j; |
|
499 |
||
500 |
// initialize results to zero |
|
501 |
for (j = 0; j < results_length; j++) { |
|
502 |
results[j] = 0; |
|
503 |
} |
|
504 |
||
505 |
int total = 0; |
|
506 |
int max_symbols = 0; |
|
507 |
int out_of_range = 0; |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
508 |
int memory_total = 0; |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
509 |
int count = 0; |
1 | 510 |
for (i = 0; i < the_table()->table_size(); i++) { |
13195 | 511 |
HashtableEntry<Symbol*, mtSymbol>* p = the_table()->bucket(i); |
1 | 512 |
for ( ; p != NULL; p = p->next()) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13199
diff
changeset
|
513 |
memory_total += p->literal()->size(); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
514 |
count++; |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
515 |
int counter = p->literal()->utf8_length(); |
1 | 516 |
total += counter; |
517 |
if (counter < results_length) { |
|
518 |
results[counter]++; |
|
519 |
} else { |
|
520 |
out_of_range++; |
|
521 |
} |
|
522 |
max_symbols = MAX2(max_symbols, counter); |
|
523 |
} |
|
524 |
} |
|
525 |
tty->print_cr("Symbol Table:"); |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
526 |
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
|
527 |
tty->print_cr("Total size in memory %5dK", |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
528 |
(memory_total*HeapWordSize)/1024); |
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
529 |
tty->print_cr("Total counted %5d", _symbols_counted); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
530 |
tty->print_cr("Total removed %5d", _symbols_removed); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
531 |
if (_symbols_counted > 0) { |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
532 |
tty->print_cr("Percent removed %3.2f", |
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
533 |
((float)_symbols_removed/(float)_symbols_counted)* 100); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
534 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
535 |
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
|
536 |
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
|
537 |
arena()->size_in_bytes(), arena()->used()); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
538 |
tty->print_cr("Histogram of symbol length:"); |
1 | 539 |
tty->print_cr("%8s %5d", "Total ", total); |
540 |
tty->print_cr("%8s %5d", "Maximum", max_symbols); |
|
541 |
tty->print_cr("%8s %3.2f", "Average", |
|
542 |
((float) total / (float) the_table()->table_size())); |
|
543 |
tty->print_cr("%s", "Histogram:"); |
|
544 |
tty->print_cr(" %s %29s", "Length", "Number chains that length"); |
|
545 |
for (i = 0; i < results_length; i++) { |
|
546 |
if (results[i] > 0) { |
|
547 |
tty->print_cr("%6d %10d", i, results[i]); |
|
548 |
} |
|
549 |
} |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
550 |
if (Verbose) { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
551 |
int line_length = 70; |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
552 |
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
|
553 |
for (i = 0; i < results_length; i++) { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
554 |
if (results[i] > 0) { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
555 |
tty->print("%4d", i); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
556 |
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
|
557 |
tty->print("%1s", "*"); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
558 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
559 |
if (j == line_length) { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
560 |
tty->print("%1s", "+"); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
561 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
562 |
tty->cr(); |
1 | 563 |
} |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
564 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
565 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
566 |
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
|
567 |
results_length, out_of_range); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
568 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
569 |
|
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
570 |
void SymbolTable::print() { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
571 |
for (int i = 0; i < the_table()->table_size(); ++i) { |
13195 | 572 |
HashtableEntry<Symbol*, mtSymbol>** p = the_table()->bucket_addr(i); |
573 |
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
|
574 |
if (entry != NULL) { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
575 |
while (entry != NULL) { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
576 |
tty->print(PTR_FORMAT " ", entry->literal()); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
577 |
entry->literal()->print(); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
578 |
tty->print(" %d", entry->literal()->refcount()); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
579 |
p = entry->next_addr(); |
13195 | 580 |
entry = (HashtableEntry<Symbol*, mtSymbol>*)HashtableEntry<Symbol*, mtSymbol>::make_ptr(*p); |
1 | 581 |
} |
582 |
tty->cr(); |
|
583 |
} |
|
584 |
} |
|
585 |
} |
|
586 |
#endif // PRODUCT |
|
587 |
||
588 |
// -------------------------------------------------------------------------- |
|
589 |
||
590 |
#ifdef ASSERT |
|
591 |
class StableMemoryChecker : public StackObj { |
|
592 |
enum { _bufsize = wordSize*4 }; |
|
593 |
||
594 |
address _region; |
|
595 |
jint _size; |
|
596 |
u1 _save_buf[_bufsize]; |
|
597 |
||
598 |
int sample(u1* save_buf) { |
|
599 |
if (_size <= _bufsize) { |
|
600 |
memcpy(save_buf, _region, _size); |
|
601 |
return _size; |
|
602 |
} else { |
|
603 |
// copy head and tail |
|
604 |
memcpy(&save_buf[0], _region, _bufsize/2); |
|
605 |
memcpy(&save_buf[_bufsize/2], _region + _size - _bufsize/2, _bufsize/2); |
|
606 |
return (_bufsize/2)*2; |
|
607 |
} |
|
608 |
} |
|
609 |
||
610 |
public: |
|
611 |
StableMemoryChecker(const void* region, jint size) { |
|
612 |
_region = (address) region; |
|
613 |
_size = size; |
|
614 |
sample(_save_buf); |
|
615 |
} |
|
616 |
||
617 |
bool verify() { |
|
618 |
u1 check_buf[sizeof(_save_buf)]; |
|
619 |
int check_size = sample(check_buf); |
|
620 |
return (0 == memcmp(_save_buf, check_buf, check_size)); |
|
621 |
} |
|
622 |
||
623 |
void set_region(const void* region) { _region = (address) region; } |
|
624 |
}; |
|
625 |
#endif |
|
626 |
||
627 |
||
628 |
// -------------------------------------------------------------------------- |
|
629 |
StringTable* StringTable::_the_table = NULL; |
|
630 |
||
13087 | 631 |
bool StringTable::_needs_rehashing = false; |
632 |
||
18091
ddde9f0f414d
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
17846
diff
changeset
|
633 |
volatile int StringTable::_parallel_claimed_idx = 0; |
ddde9f0f414d
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
17846
diff
changeset
|
634 |
|
13087 | 635 |
// Pick hashing algorithm |
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
636 |
unsigned int StringTable::hash_string(const jchar* s, int len) { |
13087 | 637 |
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
|
638 |
java_lang_String::hash_code(s, len); |
13087 | 639 |
} |
640 |
||
1 | 641 |
oop StringTable::lookup(int index, jchar* name, |
642 |
int len, unsigned int hash) { |
|
13087 | 643 |
int count = 0; |
13195 | 644 |
for (HashtableEntry<oop, mtSymbol>* l = bucket(index); l != NULL; l = l->next()) { |
13087 | 645 |
count++; |
1 | 646 |
if (l->hash() == hash) { |
647 |
if (java_lang_String::equals(l->literal(), name, len)) { |
|
648 |
return l->literal(); |
|
649 |
} |
|
650 |
} |
|
651 |
} |
|
13087 | 652 |
// If the bucket size is too deep check if this hash code is insufficient. |
13195 | 653 |
if (count >= BasicHashtable<mtSymbol>::rehash_count && !needs_rehashing()) { |
13087 | 654 |
_needs_rehashing = check_rehash_table(count); |
655 |
} |
|
1 | 656 |
return NULL; |
657 |
} |
|
658 |
||
659 |
||
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
660 |
oop StringTable::basic_add(int index_arg, Handle string, jchar* name, |
13087 | 661 |
int len, unsigned int hashValue_arg, TRAPS) { |
1 | 662 |
|
663 |
assert(java_lang_String::equals(string(), name, len), |
|
664 |
"string must be properly initialized"); |
|
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
665 |
// 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
|
666 |
No_Safepoint_Verifier nsv; |
1 | 667 |
|
13087 | 668 |
// 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
|
669 |
// the hash value and index before second lookup. |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
670 |
unsigned int hashValue; |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
671 |
int index; |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
672 |
if (use_alternate_hashcode()) { |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
673 |
hashValue = hash_string(name, len); |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
674 |
index = hash_to_index(hashValue); |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
675 |
} else { |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
676 |
hashValue = hashValue_arg; |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
677 |
index = index_arg; |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
678 |
} |
13087 | 679 |
|
1 | 680 |
// Since look-up was done lock-free, we need to check if another |
681 |
// thread beat us in the race to insert the symbol. |
|
682 |
||
683 |
oop test = lookup(index, name, len, hashValue); // calls lookup(u1*, int) |
|
684 |
if (test != NULL) { |
|
685 |
// Entry already added |
|
686 |
return test; |
|
687 |
} |
|
688 |
||
13195 | 689 |
HashtableEntry<oop, mtSymbol>* entry = new_entry(hashValue, string()); |
1 | 690 |
add_entry(index, entry); |
691 |
return string(); |
|
692 |
} |
|
693 |
||
694 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
695 |
oop StringTable::lookup(Symbol* symbol) { |
1 | 696 |
ResourceMark rm; |
697 |
int length; |
|
698 |
jchar* chars = symbol->as_unicode(length); |
|
16601 | 699 |
return lookup(chars, length); |
700 |
} |
|
701 |
||
702 |
||
703 |
oop StringTable::lookup(jchar* name, int len) { |
|
704 |
unsigned int hash = hash_string(name, len); |
|
705 |
int index = the_table()->hash_to_index(hash); |
|
706 |
return the_table()->lookup(index, name, len, hash); |
|
1 | 707 |
} |
708 |
||
709 |
||
710 |
oop StringTable::intern(Handle string_or_null, jchar* name, |
|
711 |
int len, TRAPS) { |
|
13087 | 712 |
unsigned int hashValue = hash_string(name, len); |
1 | 713 |
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
|
714 |
oop found_string = the_table()->lookup(index, name, len, hashValue); |
1 | 715 |
|
716 |
// Found |
|
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
717 |
if (found_string != NULL) return found_string; |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
718 |
|
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
719 |
debug_only(StableMemoryChecker smc(name, len * sizeof(name[0]))); |
20079 | 720 |
assert(!Universe::heap()->is_in_reserved(name), |
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
721 |
"proposed name of symbol must be stable"); |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
722 |
|
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
723 |
Handle string; |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
724 |
// try to reuse the string if possible |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13199
diff
changeset
|
725 |
if (!string_or_null.is_null()) { |
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
726 |
string = string_or_null; |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
727 |
} else { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13199
diff
changeset
|
728 |
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
|
729 |
} |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
730 |
|
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
731 |
// 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
|
732 |
// change at safepoint. |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
733 |
MutexLocker ml(StringTable_lock, THREAD); |
1 | 734 |
|
735 |
// Otherwise, add to symbol to table |
|
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
736 |
return the_table()->basic_add(index, string, name, len, |
1 | 737 |
hashValue, CHECK_NULL); |
738 |
} |
|
739 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
740 |
oop StringTable::intern(Symbol* symbol, TRAPS) { |
1 | 741 |
if (symbol == NULL) return NULL; |
742 |
ResourceMark rm(THREAD); |
|
743 |
int length; |
|
744 |
jchar* chars = symbol->as_unicode(length); |
|
745 |
Handle string; |
|
746 |
oop result = intern(string, chars, length, CHECK_NULL); |
|
747 |
return result; |
|
748 |
} |
|
749 |
||
750 |
||
751 |
oop StringTable::intern(oop string, TRAPS) |
|
752 |
{ |
|
753 |
if (string == NULL) return NULL; |
|
754 |
ResourceMark rm(THREAD); |
|
755 |
int length; |
|
756 |
Handle h_string (THREAD, string); |
|
17081
cf52c2bc3f8c
8011773: Some tests on Interned String crashed JVM with OOM
hseigel
parents:
16601
diff
changeset
|
757 |
jchar* chars = java_lang_String::as_unicode_string(string, length, CHECK_NULL); |
1 | 758 |
oop result = intern(h_string, chars, length, CHECK_NULL); |
759 |
return result; |
|
760 |
} |
|
761 |
||
762 |
||
763 |
oop StringTable::intern(const char* utf8_string, TRAPS) { |
|
764 |
if (utf8_string == NULL) return NULL; |
|
765 |
ResourceMark rm(THREAD); |
|
766 |
int length = UTF8::unicode_length(utf8_string); |
|
767 |
jchar* chars = NEW_RESOURCE_ARRAY(jchar, length); |
|
768 |
UTF8::convert_to_unicode(utf8_string, chars, length); |
|
769 |
Handle string; |
|
770 |
oop result = intern(string, chars, length, CHECK_NULL); |
|
771 |
return result; |
|
772 |
} |
|
773 |
||
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
774 |
void StringTable::unlink_or_oops_do(BoolObjectClosure* is_alive, OopClosure* f, int* processed, int* removed) { |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
775 |
buckets_unlink_or_oops_do(is_alive, f, 0, the_table()->table_size(), processed, removed); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
776 |
} |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
777 |
|
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
778 |
void StringTable::possibly_parallel_unlink_or_oops_do(BoolObjectClosure* is_alive, OopClosure* f, int* processed, int* removed) { |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
779 |
// 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
|
780 |
// entries at a safepoint. |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
781 |
assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint"); |
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
782 |
const int limit = the_table()->table_size(); |
17845
246c16282ae8
8015428: Remove unused CDS support from StringTable
stefank
parents:
17610
diff
changeset
|
783 |
|
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
784 |
for (;;) { |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
785 |
// Grab next set of buckets to scan |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
786 |
int start_idx = Atomic::add(ClaimChunkSize, &_parallel_claimed_idx) - ClaimChunkSize; |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
787 |
if (start_idx >= limit) { |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
788 |
// End of table |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
789 |
break; |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
790 |
} |
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
791 |
|
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
792 |
int end_idx = MIN2(limit, start_idx + ClaimChunkSize); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
793 |
buckets_unlink_or_oops_do(is_alive, f, start_idx, end_idx, processed, removed); |
8076
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 |
|
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
797 |
void StringTable::buckets_oops_do(OopClosure* f, int start_idx, int end_idx) { |
18091
ddde9f0f414d
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
17846
diff
changeset
|
798 |
const int limit = the_table()->table_size(); |
ddde9f0f414d
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
17846
diff
changeset
|
799 |
|
ddde9f0f414d
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
17846
diff
changeset
|
800 |
assert(0 <= start_idx && start_idx <= limit, |
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
801 |
err_msg("start_idx (" INT32_FORMAT ") is out of bounds", start_idx)); |
18091
ddde9f0f414d
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
17846
diff
changeset
|
802 |
assert(0 <= end_idx && end_idx <= limit, |
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
803 |
err_msg("end_idx (" INT32_FORMAT ") is out of bounds", end_idx)); |
18091
ddde9f0f414d
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
17846
diff
changeset
|
804 |
assert(start_idx <= end_idx, |
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
805 |
err_msg("Index ordering: start_idx=" INT32_FORMAT", end_idx=" INT32_FORMAT, |
18091
ddde9f0f414d
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
17846
diff
changeset
|
806 |
start_idx, end_idx)); |
ddde9f0f414d
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
17846
diff
changeset
|
807 |
|
ddde9f0f414d
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
17846
diff
changeset
|
808 |
for (int i = start_idx; i < end_idx; i += 1) { |
13195 | 809 |
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
|
810 |
while (entry != NULL) { |
17845
246c16282ae8
8015428: Remove unused CDS support from StringTable
stefank
parents:
17610
diff
changeset
|
811 |
assert(!entry->is_shared(), "CDS not used for the StringTable"); |
246c16282ae8
8015428: Remove unused CDS support from StringTable
stefank
parents:
17610
diff
changeset
|
812 |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
813 |
f->do_oop((oop*)entry->literal_addr()); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
814 |
|
17845
246c16282ae8
8015428: Remove unused CDS support from StringTable
stefank
parents:
17610
diff
changeset
|
815 |
entry = entry->next(); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
816 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
817 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
818 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
819 |
|
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
820 |
void StringTable::buckets_unlink_or_oops_do(BoolObjectClosure* is_alive, OopClosure* f, int start_idx, int end_idx, int* processed, int* removed) { |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
821 |
const int limit = the_table()->table_size(); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
822 |
|
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
823 |
assert(0 <= start_idx && start_idx <= limit, |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
824 |
err_msg("start_idx (" INT32_FORMAT ") is out of bounds", start_idx)); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
825 |
assert(0 <= end_idx && end_idx <= limit, |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
826 |
err_msg("end_idx (" INT32_FORMAT ") is out of bounds", end_idx)); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
827 |
assert(start_idx <= end_idx, |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
828 |
err_msg("Index ordering: start_idx=" INT32_FORMAT", end_idx=" INT32_FORMAT, |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
829 |
start_idx, end_idx)); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
830 |
|
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
831 |
for (int i = start_idx; i < end_idx; ++i) { |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
832 |
HashtableEntry<oop, mtSymbol>** p = the_table()->bucket_addr(i); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
833 |
HashtableEntry<oop, mtSymbol>* entry = the_table()->bucket(i); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
834 |
while (entry != NULL) { |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
835 |
assert(!entry->is_shared(), "CDS not used for the StringTable"); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
836 |
|
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
837 |
if (is_alive->do_object_b(entry->literal())) { |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
838 |
if (f != NULL) { |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
839 |
f->do_oop((oop*)entry->literal_addr()); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
840 |
} |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
841 |
p = entry->next_addr(); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
842 |
} else { |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
843 |
*p = entry->next(); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
844 |
the_table()->free_entry(entry); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
845 |
(*removed)++; |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
846 |
} |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
847 |
(*processed)++; |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
848 |
entry = *p; |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
849 |
} |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
850 |
} |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
851 |
} |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
852 |
|
18091
ddde9f0f414d
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
17846
diff
changeset
|
853 |
void StringTable::oops_do(OopClosure* f) { |
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
854 |
buckets_oops_do(f, 0, the_table()->table_size()); |
18091
ddde9f0f414d
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
17846
diff
changeset
|
855 |
} |
ddde9f0f414d
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
17846
diff
changeset
|
856 |
|
ddde9f0f414d
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
17846
diff
changeset
|
857 |
void StringTable::possibly_parallel_oops_do(OopClosure* f) { |
ddde9f0f414d
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
17846
diff
changeset
|
858 |
const int limit = the_table()->table_size(); |
ddde9f0f414d
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
17846
diff
changeset
|
859 |
|
ddde9f0f414d
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
17846
diff
changeset
|
860 |
for (;;) { |
ddde9f0f414d
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
17846
diff
changeset
|
861 |
// Grab next set of buckets to scan |
ddde9f0f414d
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
17846
diff
changeset
|
862 |
int start_idx = Atomic::add(ClaimChunkSize, &_parallel_claimed_idx) - ClaimChunkSize; |
ddde9f0f414d
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
17846
diff
changeset
|
863 |
if (start_idx >= limit) { |
ddde9f0f414d
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
17846
diff
changeset
|
864 |
// End of table |
ddde9f0f414d
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
17846
diff
changeset
|
865 |
break; |
ddde9f0f414d
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
17846
diff
changeset
|
866 |
} |
ddde9f0f414d
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
17846
diff
changeset
|
867 |
|
ddde9f0f414d
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
17846
diff
changeset
|
868 |
int end_idx = MIN2(limit, start_idx + ClaimChunkSize); |
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
869 |
buckets_oops_do(f, start_idx, end_idx); |
18091
ddde9f0f414d
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
17846
diff
changeset
|
870 |
} |
ddde9f0f414d
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
17846
diff
changeset
|
871 |
} |
ddde9f0f414d
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
17846
diff
changeset
|
872 |
|
20053
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
873 |
// This verification is part of Universe::verify() and needs to be quick. |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
874 |
// See StringTable::verify_and_compare() below for exhaustive verification. |
1 | 875 |
void StringTable::verify() { |
876 |
for (int i = 0; i < the_table()->table_size(); ++i) { |
|
13195 | 877 |
HashtableEntry<oop, mtSymbol>* p = the_table()->bucket(i); |
1 | 878 |
for ( ; p != NULL; p = p->next()) { |
879 |
oop s = p->literal(); |
|
880 |
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
|
881 |
unsigned int h = java_lang_String::hash_string(s); |
1 | 882 |
guarantee(p->hash() == h, "broken hash in string table entry"); |
883 |
guarantee(the_table()->hash_to_index(h) == i, |
|
884 |
"wrong index in string table"); |
|
885 |
} |
|
886 |
} |
|
887 |
} |
|
13087 | 888 |
|
889 |
void StringTable::dump(outputStream* st) { |
|
17610
c6857feaac47
8014262: PrintStringTableStatistics should include more footprint info
iklam
parents:
17081
diff
changeset
|
890 |
the_table()->dump_table(st, "StringTable"); |
13087 | 891 |
} |
892 |
||
20053
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
893 |
StringTable::VerifyRetTypes StringTable::compare_entries( |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
894 |
int bkt1, int e_cnt1, |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
895 |
HashtableEntry<oop, mtSymbol>* e_ptr1, |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
896 |
int bkt2, int e_cnt2, |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
897 |
HashtableEntry<oop, mtSymbol>* e_ptr2) { |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
898 |
// These entries are sanity checked by verify_and_compare_entries() |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
899 |
// before this function is called. |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
900 |
oop str1 = e_ptr1->literal(); |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
901 |
oop str2 = e_ptr2->literal(); |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
902 |
|
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
903 |
if (str1 == str2) { |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
904 |
tty->print_cr("ERROR: identical oop values (0x" PTR_FORMAT ") " |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
905 |
"in entry @ bucket[%d][%d] and entry @ bucket[%d][%d]", |
20282
7f9cbdf89af2
7195622: CheckUnhandledOops has limited usefulness now
hseigel
parents:
20053
diff
changeset
|
906 |
(void *)str1, bkt1, e_cnt1, bkt2, e_cnt2); |
20053
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
907 |
return _verify_fail_continue; |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
908 |
} |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
909 |
|
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
910 |
if (java_lang_String::equals(str1, str2)) { |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
911 |
tty->print_cr("ERROR: identical String values in entry @ " |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
912 |
"bucket[%d][%d] and entry @ bucket[%d][%d]", |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
913 |
bkt1, e_cnt1, bkt2, e_cnt2); |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
914 |
return _verify_fail_continue; |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
915 |
} |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
916 |
|
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
917 |
return _verify_pass; |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
918 |
} |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
919 |
|
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
920 |
StringTable::VerifyRetTypes StringTable::verify_entry(int bkt, int e_cnt, |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
921 |
HashtableEntry<oop, mtSymbol>* e_ptr, |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
922 |
StringTable::VerifyMesgModes mesg_mode) { |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
923 |
|
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
924 |
VerifyRetTypes ret = _verify_pass; // be optimistic |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
925 |
|
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
926 |
oop str = e_ptr->literal(); |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
927 |
if (str == NULL) { |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
928 |
if (mesg_mode == _verify_with_mesgs) { |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
929 |
tty->print_cr("ERROR: NULL oop value in entry @ bucket[%d][%d]", bkt, |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
930 |
e_cnt); |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
931 |
} |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
932 |
// NULL oop means no more verifications are possible |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
933 |
return _verify_fail_done; |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
934 |
} |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
935 |
|
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
936 |
if (str->klass() != SystemDictionary::String_klass()) { |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
937 |
if (mesg_mode == _verify_with_mesgs) { |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
938 |
tty->print_cr("ERROR: oop is not a String in entry @ bucket[%d][%d]", |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
939 |
bkt, e_cnt); |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
940 |
} |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
941 |
// not a String means no more verifications are possible |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
942 |
return _verify_fail_done; |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
943 |
} |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
944 |
|
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
945 |
unsigned int h = java_lang_String::hash_string(str); |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
946 |
if (e_ptr->hash() != h) { |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
947 |
if (mesg_mode == _verify_with_mesgs) { |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
948 |
tty->print_cr("ERROR: broken hash value in entry @ bucket[%d][%d], " |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
949 |
"bkt_hash=%d, str_hash=%d", bkt, e_cnt, e_ptr->hash(), h); |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
950 |
} |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
951 |
ret = _verify_fail_continue; |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
952 |
} |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
953 |
|
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
954 |
if (the_table()->hash_to_index(h) != bkt) { |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
955 |
if (mesg_mode == _verify_with_mesgs) { |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
956 |
tty->print_cr("ERROR: wrong index value for entry @ bucket[%d][%d], " |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
957 |
"str_hash=%d, hash_to_index=%d", bkt, e_cnt, h, |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
958 |
the_table()->hash_to_index(h)); |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
959 |
} |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
960 |
ret = _verify_fail_continue; |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
961 |
} |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
962 |
|
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
963 |
return ret; |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
964 |
} |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
965 |
|
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
966 |
// See StringTable::verify() above for the quick verification that is |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
967 |
// part of Universe::verify(). This verification is exhaustive and |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
968 |
// reports on every issue that is found. StringTable::verify() only |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
969 |
// reports on the first issue that is found. |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
970 |
// |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
971 |
// StringTable::verify_entry() checks: |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
972 |
// - oop value != NULL (same as verify()) |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
973 |
// - oop value is a String |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
974 |
// - hash(String) == hash in entry (same as verify()) |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
975 |
// - index for hash == index of entry (same as verify()) |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
976 |
// |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
977 |
// StringTable::compare_entries() checks: |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
978 |
// - oops are unique across all entries |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
979 |
// - String values are unique across all entries |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
980 |
// |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
981 |
int StringTable::verify_and_compare_entries() { |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
982 |
assert(StringTable_lock->is_locked(), "sanity check"); |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
983 |
|
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
984 |
int fail_cnt = 0; |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
985 |
|
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
986 |
// first, verify all the entries individually: |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
987 |
for (int bkt = 0; bkt < the_table()->table_size(); bkt++) { |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
988 |
HashtableEntry<oop, mtSymbol>* e_ptr = the_table()->bucket(bkt); |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
989 |
for (int e_cnt = 0; e_ptr != NULL; e_ptr = e_ptr->next(), e_cnt++) { |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
990 |
VerifyRetTypes ret = verify_entry(bkt, e_cnt, e_ptr, _verify_with_mesgs); |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
991 |
if (ret != _verify_pass) { |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
992 |
fail_cnt++; |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
993 |
} |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
994 |
} |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
995 |
} |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
996 |
|
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
997 |
// Optimization: if the above check did not find any failures, then |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
998 |
// the comparison loop below does not need to call verify_entry() |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
999 |
// before calling compare_entries(). If there were failures, then we |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1000 |
// have to call verify_entry() to see if the entry can be passed to |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1001 |
// compare_entries() safely. When we call verify_entry() in the loop |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1002 |
// below, we do so quietly to void duplicate messages and we don't |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1003 |
// increment fail_cnt because the failures have already been counted. |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1004 |
bool need_entry_verify = (fail_cnt != 0); |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1005 |
|
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1006 |
// second, verify all entries relative to each other: |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1007 |
for (int bkt1 = 0; bkt1 < the_table()->table_size(); bkt1++) { |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1008 |
HashtableEntry<oop, mtSymbol>* e_ptr1 = the_table()->bucket(bkt1); |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1009 |
for (int e_cnt1 = 0; e_ptr1 != NULL; e_ptr1 = e_ptr1->next(), e_cnt1++) { |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1010 |
if (need_entry_verify) { |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1011 |
VerifyRetTypes ret = verify_entry(bkt1, e_cnt1, e_ptr1, |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1012 |
_verify_quietly); |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1013 |
if (ret == _verify_fail_done) { |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1014 |
// cannot use the current entry to compare against other entries |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1015 |
continue; |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1016 |
} |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1017 |
} |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1018 |
|
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1019 |
for (int bkt2 = bkt1; bkt2 < the_table()->table_size(); bkt2++) { |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1020 |
HashtableEntry<oop, mtSymbol>* e_ptr2 = the_table()->bucket(bkt2); |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1021 |
int e_cnt2; |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1022 |
for (e_cnt2 = 0; e_ptr2 != NULL; e_ptr2 = e_ptr2->next(), e_cnt2++) { |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1023 |
if (bkt1 == bkt2 && e_cnt2 <= e_cnt1) { |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1024 |
// skip the entries up to and including the one that |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1025 |
// we're comparing against |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1026 |
continue; |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1027 |
} |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1028 |
|
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1029 |
if (need_entry_verify) { |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1030 |
VerifyRetTypes ret = verify_entry(bkt2, e_cnt2, e_ptr2, |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1031 |
_verify_quietly); |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1032 |
if (ret == _verify_fail_done) { |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1033 |
// cannot compare against this entry |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1034 |
continue; |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1035 |
} |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1036 |
} |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1037 |
|
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1038 |
// compare two entries, report and count any failures: |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1039 |
if (compare_entries(bkt1, e_cnt1, e_ptr1, bkt2, e_cnt2, e_ptr2) |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1040 |
!= _verify_pass) { |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1041 |
fail_cnt++; |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1042 |
} |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1043 |
} |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1044 |
} |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1045 |
} |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1046 |
} |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1047 |
return fail_cnt; |
a12bd7991794
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
18091
diff
changeset
|
1048 |
} |
13087 | 1049 |
|
1050 |
// Create a new table and using alternate hash code, populate the new table |
|
1051 |
// with the existing strings. Set flag to use the alternate hash code afterwards. |
|
1052 |
void StringTable::rehash_table() { |
|
1053 |
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
|
1054 |
// 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
|
1055 |
if (DumpSharedSpaces) return; |
13087 | 1056 |
StringTable* new_table = new StringTable(); |
1057 |
||
1058 |
// Rehash the table |
|
1059 |
the_table()->move_to(new_table); |
|
1060 |
||
1061 |
// Delete the table and buckets (entries are reused in new table). |
|
1062 |
delete _the_table; |
|
1063 |
// Don't check if we need rehashing until the table gets unbalanced again. |
|
1064 |
// Then rehash with a new global seed. |
|
1065 |
_needs_rehashing = false; |
|
1066 |
_the_table = new_table; |
|
1067 |
} |