author | kevinw |
Tue, 21 Feb 2017 02:27:01 -0800 | |
changeset 43929 | 9a572e758c9b |
parent 41289 | f307cc24f1e9 |
child 45114 | 45644c5f6b8e |
permissions | -rw-r--r-- |
1 | 1 |
/* |
35497
94c7c07d0161
8145940: TempNewSymbol should have correct copy and assignment functions
coleenp
parents:
35492
diff
changeset
|
2 |
* Copyright (c) 1997, 2016, 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" |
34659
3a7071043457
8143615: compactHashtable.hpp includes .inline.hpp file
iklam
parents:
34237
diff
changeset
|
27 |
#include "classfile/compactHashtable.inline.hpp" |
7397 | 28 |
#include "classfile/javaClasses.hpp" |
29 |
#include "classfile/symbolTable.hpp" |
|
30 |
#include "classfile/systemDictionary.hpp" |
|
30764 | 31 |
#include "gc/shared/collectedHeap.inline.hpp" |
32 |
#include "gc/shared/gcLocker.inline.hpp" |
|
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
33 |
#include "memory/allocation.inline.hpp" |
7397 | 34 |
#include "memory/filemap.hpp" |
37248 | 35 |
#include "memory/resourceArea.hpp" |
7397 | 36 |
#include "oops/oop.inline.hpp" |
40655
9f644073d3a0
8157907: Incorrect inclusion of atomic.hpp instead of atomic.inline.hpp
dholmes
parents:
39713
diff
changeset
|
37 |
#include "runtime/atomic.hpp" |
7397 | 38 |
#include "runtime/mutexLocker.hpp" |
39 |
#include "utilities/hashtable.inline.hpp" |
|
1 | 40 |
|
41 |
// -------------------------------------------------------------------------- |
|
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
42 |
// the number of buckets a thread claims |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
43 |
const int ClaimChunkSize = 32; |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
44 |
|
1 | 45 |
SymbolTable* SymbolTable::_the_table = NULL; |
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
46 |
// 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
|
47 |
Arena* SymbolTable::_arena = NULL; |
13087 | 48 |
bool SymbolTable::_needs_rehashing = false; |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
49 |
bool SymbolTable::_lookup_shared_first = false; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
50 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
51 |
CompactHashtable<Symbol*, char> SymbolTable::_shared_table; |
1 | 52 |
|
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
53 |
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
|
54 |
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
|
55 |
|
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
56 |
Symbol* sym; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13199
diff
changeset
|
57 |
|
15934
104ff83451f1
8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents:
14742
diff
changeset
|
58 |
if (DumpSharedSpaces) { |
104ff83451f1
8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents:
14742
diff
changeset
|
59 |
// Allocate all symbols to CLD shared metaspace |
31790 | 60 |
sym = new (len, ClassLoaderData::the_null_class_loader_data(), THREAD) Symbol(name, len, PERM_REFCOUNT); |
15934
104ff83451f1
8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents:
14742
diff
changeset
|
61 |
} else if (c_heap) { |
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
62 |
// refcount starts as 1 |
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
63 |
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
|
64 |
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
|
65 |
} else { |
15934
104ff83451f1
8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents:
14742
diff
changeset
|
66 |
// Allocate to global arena |
31790 | 67 |
sym = new (len, arena(), THREAD) Symbol(name, len, PERM_REFCOUNT); |
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
68 |
} |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
69 |
return sym; |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
70 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
71 |
|
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
72 |
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
|
73 |
// 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
|
74 |
if (arena_alloc_size == 0) { |
25946 | 75 |
_arena = new (mtSymbol) Arena(mtSymbol); |
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
76 |
} else { |
25946 | 77 |
_arena = new (mtSymbol) Arena(mtSymbol, arena_alloc_size); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
78 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
79 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
80 |
|
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
81 |
// 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
|
82 |
void SymbolTable::symbols_do(SymbolClosure *cl) { |
28615
1fb960ea5a7e
8067982: Some jcmd /gc/heap_dump tests failed: hprof output contains warning or error.
jiangli
parents:
28363
diff
changeset
|
83 |
// all symbols from shared table |
1fb960ea5a7e
8067982: Some jcmd /gc/heap_dump tests failed: hprof output contains warning or error.
jiangli
parents:
28363
diff
changeset
|
84 |
_shared_table.symbols_do(cl); |
1fb960ea5a7e
8067982: Some jcmd /gc/heap_dump tests failed: hprof output contains warning or error.
jiangli
parents:
28363
diff
changeset
|
85 |
|
1fb960ea5a7e
8067982: Some jcmd /gc/heap_dump tests failed: hprof output contains warning or error.
jiangli
parents:
28363
diff
changeset
|
86 |
// all symbols from the dynamic table |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
87 |
const int n = the_table()->table_size(); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
88 |
for (int i = 0; i < n; i++) { |
13195 | 89 |
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
|
90 |
p != NULL; |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
91 |
p = p->next()) { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
92 |
cl->do_symbol(p->literal_addr()); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
93 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
94 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
95 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
96 |
|
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
97 |
int SymbolTable::_symbols_removed = 0; |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
98 |
int SymbolTable::_symbols_counted = 0; |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
99 |
volatile int SymbolTable::_parallel_claimed_idx = 0; |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
100 |
|
34237
c34adffc35c0
8143255: Remove debug logging from SymbolTable::unlink() and SymbolTable::possibly_parallel_unlink()
brutisso
parents:
33638
diff
changeset
|
101 |
void SymbolTable::buckets_unlink(int start_idx, int end_idx, int* processed, int* removed) { |
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
102 |
for (int i = start_idx; i < end_idx; ++i) { |
13195 | 103 |
HashtableEntry<Symbol*, mtSymbol>** p = the_table()->bucket_addr(i); |
104 |
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
|
105 |
while (entry != NULL) { |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
106 |
// 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
|
107 |
// 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
|
108 |
// 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
|
109 |
// end of the bucket. |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
110 |
if (entry->is_shared() && !use_alternate_hashcode()) { |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
111 |
break; |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
112 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
113 |
Symbol* s = entry->literal(); |
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
114 |
(*processed)++; |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
115 |
assert(s != NULL, "just checking"); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
116 |
// If reference count is zero, remove. |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
117 |
if (s->refcount() == 0) { |
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
118 |
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
|
119 |
delete s; |
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
120 |
(*removed)++; |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
121 |
*p = entry->next(); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
122 |
the_table()->free_entry(entry); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
123 |
} else { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
124 |
p = entry->next_addr(); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
125 |
} |
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
126 |
// get next entry |
13195 | 127 |
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
|
128 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
129 |
} |
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
130 |
} |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
131 |
|
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
132 |
// Remove unreferenced symbols from the symbol table |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
133 |
// This is done late during GC. |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
134 |
void SymbolTable::unlink(int* processed, int* removed) { |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
135 |
size_t memory_total = 0; |
34237
c34adffc35c0
8143255: Remove debug logging from SymbolTable::unlink() and SymbolTable::possibly_parallel_unlink()
brutisso
parents:
33638
diff
changeset
|
136 |
buckets_unlink(0, the_table()->table_size(), processed, removed); |
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
137 |
_symbols_removed += *removed; |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
138 |
_symbols_counted += *processed; |
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 |
|
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
141 |
void SymbolTable::possibly_parallel_unlink(int* processed, int* removed) { |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
142 |
const int limit = the_table()->table_size(); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
143 |
|
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
144 |
size_t memory_total = 0; |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
145 |
|
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
146 |
for (;;) { |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
147 |
// Grab next set of buckets to scan |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
148 |
int start_idx = Atomic::add(ClaimChunkSize, &_parallel_claimed_idx) - ClaimChunkSize; |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
149 |
if (start_idx >= limit) { |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
150 |
// End of table |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
151 |
break; |
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 |
|
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
154 |
int end_idx = MIN2(limit, start_idx + ClaimChunkSize); |
34237
c34adffc35c0
8143255: Remove debug logging from SymbolTable::unlink() and SymbolTable::possibly_parallel_unlink()
brutisso
parents:
33638
diff
changeset
|
155 |
buckets_unlink(start_idx, end_idx, processed, removed); |
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
156 |
} |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
157 |
Atomic::add(*processed, &_symbols_counted); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
158 |
Atomic::add(*removed, &_symbols_removed); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
159 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
160 |
|
13087 | 161 |
// Create a new table and using alternate hash code, populate the new table |
162 |
// with the existing strings. Set flag to use the alternate hash code afterwards. |
|
163 |
void SymbolTable::rehash_table() { |
|
37198
b96542d1afa1
8152380: Shared symbol table should never use alternate hashcode
iklam
parents:
35898
diff
changeset
|
164 |
if (DumpSharedSpaces) { |
b96542d1afa1
8152380: Shared symbol table should never use alternate hashcode
iklam
parents:
35898
diff
changeset
|
165 |
tty->print_cr("Warning: rehash_table should not be called while dumping archive"); |
b96542d1afa1
8152380: Shared symbol table should never use alternate hashcode
iklam
parents:
35898
diff
changeset
|
166 |
return; |
b96542d1afa1
8152380: Shared symbol table should never use alternate hashcode
iklam
parents:
35898
diff
changeset
|
167 |
} |
b96542d1afa1
8152380: Shared symbol table should never use alternate hashcode
iklam
parents:
35898
diff
changeset
|
168 |
|
13087 | 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 |
||
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
187 |
Symbol* SymbolTable::lookup_dynamic(int index, const char* name, |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
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. |
26421
37d88e604ad0
8056084: Refactor Hashtable to allow implementations without rehashing support
mgerdin
parents:
25946
diff
changeset
|
202 |
if (count >= rehash_count && !needs_rehashing()) { |
13087 | 203 |
_needs_rehashing = check_rehash_table(count); |
204 |
} |
|
1 | 205 |
return NULL; |
206 |
} |
|
207 |
||
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
208 |
Symbol* SymbolTable::lookup_shared(const char* name, |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
209 |
int len, unsigned int hash) { |
37198
b96542d1afa1
8152380: Shared symbol table should never use alternate hashcode
iklam
parents:
35898
diff
changeset
|
210 |
if (use_alternate_hashcode()) { |
b96542d1afa1
8152380: Shared symbol table should never use alternate hashcode
iklam
parents:
35898
diff
changeset
|
211 |
// hash_code parameter may use alternate hashing algorithm but the shared table |
b96542d1afa1
8152380: Shared symbol table should never use alternate hashcode
iklam
parents:
35898
diff
changeset
|
212 |
// always uses the same original hash code. |
b96542d1afa1
8152380: Shared symbol table should never use alternate hashcode
iklam
parents:
35898
diff
changeset
|
213 |
hash = hash_shared_symbol(name, len); |
b96542d1afa1
8152380: Shared symbol table should never use alternate hashcode
iklam
parents:
35898
diff
changeset
|
214 |
} |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
215 |
return _shared_table.lookup(name, hash, len); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
216 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
217 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
218 |
Symbol* SymbolTable::lookup(int index, const char* name, |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
219 |
int len, unsigned int hash) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
220 |
Symbol* sym; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
221 |
if (_lookup_shared_first) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
222 |
sym = lookup_shared(name, len, hash); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
223 |
if (sym != NULL) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
224 |
return sym; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
225 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
226 |
_lookup_shared_first = false; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
227 |
return lookup_dynamic(index, name, len, hash); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
228 |
} else { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
229 |
sym = lookup_dynamic(index, name, len, hash); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
230 |
if (sym != NULL) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
231 |
return sym; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
232 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
233 |
sym = lookup_shared(name, len, hash); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
234 |
if (sym != NULL) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
235 |
_lookup_shared_first = true; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
236 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
237 |
return sym; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
238 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
239 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
240 |
|
39713 | 241 |
u4 SymbolTable::encode_shared(Symbol* sym) { |
242 |
assert(DumpSharedSpaces, "called only during dump time"); |
|
243 |
uintx base_address = uintx(MetaspaceShared::shared_rs()->base()); |
|
244 |
uintx offset = uintx(sym) - base_address; |
|
245 |
assert(offset < 0x7fffffff, "sanity"); |
|
246 |
return u4(offset); |
|
247 |
} |
|
248 |
||
249 |
Symbol* SymbolTable::decode_shared(u4 offset) { |
|
250 |
assert(!DumpSharedSpaces, "called only during runtime"); |
|
251 |
uintx base_address = _shared_table.base_address(); |
|
252 |
Symbol* sym = (Symbol*)(base_address + offset); |
|
253 |
||
254 |
#ifndef PRODUCT |
|
255 |
const char* s = (const char*)sym->bytes(); |
|
256 |
int len = sym->utf8_length(); |
|
257 |
unsigned int hash = hash_symbol(s, len); |
|
258 |
assert(sym == lookup_shared(s, len, hash), "must be shared symbol"); |
|
259 |
#endif |
|
260 |
||
261 |
return sym; |
|
262 |
} |
|
263 |
||
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
264 |
// Pick hashing algorithm. |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
265 |
unsigned int SymbolTable::hash_symbol(const char* s, int len) { |
13087 | 266 |
return use_alternate_hashcode() ? |
267 |
AltHashing::murmur3_32(seed(), (const jbyte*)s, len) : |
|
33628 | 268 |
java_lang_String::hash_code((const jbyte*)s, len); |
13087 | 269 |
} |
270 |
||
37198
b96542d1afa1
8152380: Shared symbol table should never use alternate hashcode
iklam
parents:
35898
diff
changeset
|
271 |
unsigned int SymbolTable::hash_shared_symbol(const char* s, int len) { |
b96542d1afa1
8152380: Shared symbol table should never use alternate hashcode
iklam
parents:
35898
diff
changeset
|
272 |
return java_lang_String::hash_code((const jbyte*)s, len); |
b96542d1afa1
8152380: Shared symbol table should never use alternate hashcode
iklam
parents:
35898
diff
changeset
|
273 |
} |
b96542d1afa1
8152380: Shared symbol table should never use alternate hashcode
iklam
parents:
35898
diff
changeset
|
274 |
|
1 | 275 |
|
276 |
// We take care not to be blocking while holding the |
|
277 |
// SymbolTable_lock. Otherwise, the system might deadlock, since the |
|
278 |
// symboltable is used during compilation (VM_thread) The lock free |
|
279 |
// synchronization is simplified by the fact that we do not delete |
|
280 |
// entries in the symbol table during normal execution (only during |
|
281 |
// safepoints). |
|
282 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
283 |
Symbol* SymbolTable::lookup(const char* name, int len, TRAPS) { |
1 | 284 |
unsigned int hashValue = hash_symbol(name, len); |
285 |
int index = the_table()->hash_to_index(hashValue); |
|
286 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
287 |
Symbol* s = the_table()->lookup(index, name, len, hashValue); |
1 | 288 |
|
289 |
// Found |
|
290 |
if (s != NULL) return s; |
|
291 |
||
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
292 |
// Grab SymbolTable_lock first. |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
293 |
MutexLocker ml(SymbolTable_lock, THREAD); |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
294 |
|
1 | 295 |
// Otherwise, add to symbol to table |
27677 | 296 |
return the_table()->basic_add(index, (u1*)name, len, hashValue, true, THREAD); |
1 | 297 |
} |
298 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
299 |
Symbol* SymbolTable::lookup(const Symbol* sym, int begin, int end, TRAPS) { |
1 | 300 |
char* buffer; |
301 |
int index, len; |
|
302 |
unsigned int hashValue; |
|
303 |
char* name; |
|
304 |
{ |
|
35492
c8c0273e6b91
8146690: Make all classes in GC follow the naming convention.
david
parents:
34659
diff
changeset
|
305 |
debug_only(NoSafepointVerifier nsv;) |
1 | 306 |
|
307 |
name = (char*)sym->base() + begin; |
|
308 |
len = end - begin; |
|
309 |
hashValue = hash_symbol(name, len); |
|
310 |
index = the_table()->hash_to_index(hashValue); |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
311 |
Symbol* s = the_table()->lookup(index, name, len, hashValue); |
1 | 312 |
|
313 |
// Found |
|
314 |
if (s != NULL) return s; |
|
315 |
} |
|
316 |
||
317 |
// Otherwise, add to symbol to table. Copy to a C string first. |
|
318 |
char stack_buf[128]; |
|
319 |
ResourceMark rm(THREAD); |
|
320 |
if (len <= 128) { |
|
321 |
buffer = stack_buf; |
|
322 |
} else { |
|
323 |
buffer = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, len); |
|
324 |
} |
|
325 |
for (int i=0; i<len; i++) { |
|
326 |
buffer[i] = name[i]; |
|
327 |
} |
|
328 |
// Make sure there is no safepoint in the code above since name can't move. |
|
35492
c8c0273e6b91
8146690: Make all classes in GC follow the naming convention.
david
parents:
34659
diff
changeset
|
329 |
// We can't include the code in NoSafepointVerifier because of the |
1 | 330 |
// ResourceMark. |
331 |
||
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
332 |
// Grab SymbolTable_lock first. |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
333 |
MutexLocker ml(SymbolTable_lock, THREAD); |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
334 |
|
27677 | 335 |
return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, THREAD); |
1 | 336 |
} |
337 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
338 |
Symbol* SymbolTable::lookup_only(const char* name, int len, |
1 | 339 |
unsigned int& hash) { |
340 |
hash = hash_symbol(name, len); |
|
341 |
int index = the_table()->hash_to_index(hash); |
|
342 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
343 |
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
|
344 |
return s; |
1 | 345 |
} |
346 |
||
11480
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
347 |
// 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
|
348 |
// Do not create any new symbols |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
349 |
// 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
|
350 |
Symbol** SymbolTable::lookup_symbol_addr(Symbol* sym){ |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
351 |
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
|
352 |
int index = the_table()->hash_to_index(hash); |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
353 |
|
13195 | 354 |
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
|
355 |
if (e->hash() == hash) { |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
356 |
Symbol* literal_sym = e->literal(); |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
357 |
if (sym == literal_sym) { |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
358 |
return e->literal_addr(); |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
359 |
} |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
360 |
} |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
361 |
} |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
362 |
return NULL; |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
363 |
} |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
364 |
|
2332
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
365 |
// Suggestion: Push unicode-based lookup all the way into the hashing |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
366 |
// 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
|
367 |
// an actual new Symbol* is created. |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
368 |
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
|
369 |
int utf8_length = UNICODE::utf8_length((jchar*) name, utf16_length); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
370 |
char stack_buf[128]; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
371 |
if (utf8_length < (int) sizeof(stack_buf)) { |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
372 |
char* chars = stack_buf; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
373 |
UNICODE::convert_to_utf8(name, utf16_length, chars); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
374 |
return lookup(chars, utf8_length, THREAD); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
375 |
} else { |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
376 |
ResourceMark rm(THREAD); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
377 |
char* chars = NEW_RESOURCE_ARRAY(char, utf8_length + 1);; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
378 |
UNICODE::convert_to_utf8(name, utf16_length, chars); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
379 |
return lookup(chars, utf8_length, THREAD); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
380 |
} |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
381 |
} |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
382 |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
383 |
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
|
384 |
unsigned int& hash) { |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
385 |
int utf8_length = UNICODE::utf8_length((jchar*) name, utf16_length); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
386 |
char stack_buf[128]; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
387 |
if (utf8_length < (int) sizeof(stack_buf)) { |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
388 |
char* chars = stack_buf; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
389 |
UNICODE::convert_to_utf8(name, utf16_length, chars); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
390 |
return lookup_only(chars, utf8_length, hash); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
391 |
} else { |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
392 |
ResourceMark rm; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
393 |
char* chars = NEW_RESOURCE_ARRAY(char, utf8_length + 1);; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
394 |
UNICODE::convert_to_utf8(name, utf16_length, chars); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
395 |
return lookup_only(chars, utf8_length, hash); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
396 |
} |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
397 |
} |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
398 |
|
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
399 |
void SymbolTable::add(ClassLoaderData* loader_data, const constantPoolHandle& cp, |
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
400 |
int names_count, |
1 | 401 |
const char** names, int* lengths, int* cp_indices, |
402 |
unsigned int* hashValues, TRAPS) { |
|
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
403 |
// Grab SymbolTable_lock first. |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
404 |
MutexLocker ml(SymbolTable_lock, THREAD); |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
405 |
|
1 | 406 |
SymbolTable* table = the_table(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13199
diff
changeset
|
407 |
bool added = table->basic_add(loader_data, cp, names_count, names, lengths, |
1 | 408 |
cp_indices, hashValues, CHECK); |
409 |
if (!added) { |
|
410 |
// do it the hard way |
|
411 |
for (int i=0; i<names_count; i++) { |
|
412 |
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
|
413 |
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
|
414 |
Symbol* sym = table->basic_add(index, (u1*)names[i], lengths[i], hashValues[i], c_heap, CHECK); |
1 | 415 |
cp->symbol_at_put(cp_indices[i], sym); |
416 |
} |
|
417 |
} |
|
418 |
} |
|
419 |
||
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
420 |
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
|
421 |
unsigned int hash; |
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
422 |
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
|
423 |
if (result != NULL) { |
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
424 |
return result; |
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
425 |
} |
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
426 |
// Grab SymbolTable_lock first. |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
427 |
MutexLocker ml(SymbolTable_lock, THREAD); |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
428 |
|
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
429 |
SymbolTable* table = the_table(); |
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
430 |
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
|
431 |
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
|
432 |
} |
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
433 |
|
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
434 |
Symbol* SymbolTable::basic_add(int index_arg, u1 *name, int len, |
13087 | 435 |
unsigned int hashValue_arg, bool c_heap, TRAPS) { |
20079 | 436 |
assert(!Universe::heap()->is_in_reserved(name), |
1 | 437 |
"proposed name of symbol must be stable"); |
438 |
||
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
439 |
// 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
|
440 |
if (len > Symbol::max_length()) { |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
441 |
THROW_MSG_0(vmSymbols::java_lang_InternalError(), |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
442 |
"name is too long to represent"); |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
443 |
} |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
444 |
|
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
445 |
// Cannot hit a safepoint in this function because the "this" pointer can move. |
35492
c8c0273e6b91
8146690: Make all classes in GC follow the naming convention.
david
parents:
34659
diff
changeset
|
446 |
NoSafepointVerifier nsv; |
1 | 447 |
|
13087 | 448 |
// 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
|
449 |
// the hash value and index. |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
450 |
unsigned int hashValue; |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
451 |
int index; |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
452 |
if (use_alternate_hashcode()) { |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
453 |
hashValue = hash_symbol((const char*)name, len); |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
454 |
index = hash_to_index(hashValue); |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
455 |
} else { |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
456 |
hashValue = hashValue_arg; |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
457 |
index = index_arg; |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
458 |
} |
13087 | 459 |
|
1 | 460 |
// Since look-up was done lock-free, we need to check if another |
461 |
// 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
|
462 |
Symbol* test = lookup(index, (char*)name, len, hashValue); |
1 | 463 |
if (test != NULL) { |
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
464 |
// 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
|
465 |
assert(test->refcount() != 0, "lookup should have incremented the count"); |
1 | 466 |
return test; |
467 |
} |
|
468 |
||
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
469 |
// Create a new symbol. |
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
470 |
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
|
471 |
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
|
472 |
|
13195 | 473 |
HashtableEntry<Symbol*, mtSymbol>* entry = new_entry(hashValue, sym); |
1 | 474 |
add_entry(index, entry); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
475 |
return sym; |
1 | 476 |
} |
477 |
||
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
478 |
// 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
|
479 |
// parsing. |
33593
60764a78fa5c
8140274: methodHandles and constantPoolHandles should be passed as const references
coleenp
parents:
33148
diff
changeset
|
480 |
bool SymbolTable::basic_add(ClassLoaderData* loader_data, const constantPoolHandle& cp, |
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
481 |
int names_count, |
1 | 482 |
const char** names, int* lengths, |
483 |
int* cp_indices, unsigned int* hashValues, |
|
484 |
TRAPS) { |
|
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
485 |
|
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
486 |
// 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
|
487 |
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
|
488 |
if (lengths[i] > Symbol::max_length()) { |
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
489 |
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
|
490 |
"name is too long to represent"); |
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
491 |
} |
1 | 492 |
} |
493 |
||
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
494 |
// Cannot hit a safepoint in this function because the "this" pointer can move. |
35492
c8c0273e6b91
8146690: Make all classes in GC follow the naming convention.
david
parents:
34659
diff
changeset
|
495 |
NoSafepointVerifier nsv; |
1 | 496 |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
497 |
for (int i=0; i<names_count; i++) { |
13087 | 498 |
// Check if the symbol table has been rehashed, if so, need to recalculate |
499 |
// the hash value. |
|
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
500 |
unsigned int hashValue; |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
501 |
if (use_alternate_hashcode()) { |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
502 |
hashValue = hash_symbol(names[i], lengths[i]); |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
503 |
} else { |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
504 |
hashValue = hashValues[i]; |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
505 |
} |
1 | 506 |
// Since look-up was done lock-free, we need to check if another |
507 |
// thread beat us in the race to insert the symbol. |
|
13087 | 508 |
int index = hash_to_index(hashValue); |
509 |
Symbol* test = lookup(index, names[i], lengths[i], hashValue); |
|
1 | 510 |
if (test != NULL) { |
2131 | 511 |
// A race occurred and another thread introduced the symbol, this one |
1 | 512 |
// will be dropped and collected. Use test instead. |
513 |
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
|
514 |
assert(test->refcount() != 0, "lookup should have incremented the count"); |
1 | 515 |
} else { |
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
516 |
// 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
|
517 |
// are allocated specially in a permanent arena. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13199
diff
changeset
|
518 |
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
|
519 |
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
|
520 |
assert(sym->equals(names[i], lengths[i]), "symbol must be properly initialized"); // why wouldn't it be??? |
13195 | 521 |
HashtableEntry<Symbol*, mtSymbol>* entry = new_entry(hashValue, sym); |
1 | 522 |
add_entry(index, entry); |
523 |
cp->symbol_at_put(cp_indices[i], sym); |
|
524 |
} |
|
525 |
} |
|
526 |
return true; |
|
527 |
} |
|
528 |
||
529 |
||
530 |
void SymbolTable::verify() { |
|
531 |
for (int i = 0; i < the_table()->table_size(); ++i) { |
|
13195 | 532 |
HashtableEntry<Symbol*, mtSymbol>* p = the_table()->bucket(i); |
1 | 533 |
for ( ; p != NULL; p = p->next()) { |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
534 |
Symbol* s = (Symbol*)(p->literal()); |
1 | 535 |
guarantee(s != NULL, "symbol is NULL"); |
536 |
unsigned int h = hash_symbol((char*)s->bytes(), s->utf8_length()); |
|
537 |
guarantee(p->hash() == h, "broken hash in symbol table entry"); |
|
538 |
guarantee(the_table()->hash_to_index(h) == i, |
|
539 |
"wrong index in symbol table"); |
|
540 |
} |
|
541 |
} |
|
542 |
} |
|
543 |
||
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
544 |
void SymbolTable::dump(outputStream* st, bool verbose) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
545 |
if (!verbose) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
546 |
the_table()->dump_table(st, "SymbolTable"); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
547 |
} else { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
548 |
st->print_cr("VERSION: 1.0"); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
549 |
for (int i = 0; i < the_table()->table_size(); ++i) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
550 |
HashtableEntry<Symbol*, mtSymbol>* p = the_table()->bucket(i); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
551 |
for ( ; p != NULL; p = p->next()) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
552 |
Symbol* s = (Symbol*)(p->literal()); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
553 |
const char* utf8_string = (const char*)s->bytes(); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
554 |
int utf8_length = s->utf8_length(); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
555 |
st->print("%d %d: ", utf8_length, s->refcount()); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
556 |
HashtableTextDump::put_utf8(st, utf8_string, utf8_length); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
557 |
st->cr(); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
558 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
559 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
560 |
} |
13087 | 561 |
} |
562 |
||
37995 | 563 |
void SymbolTable::serialize(SerializeClosure* soc) { |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
564 |
#if INCLUDE_CDS |
37995 | 565 |
_shared_table.reset(); |
566 |
if (soc->writing()) { |
|
567 |
int num_buckets = the_table()->number_of_entries() / |
|
568 |
SharedSymbolTableBucketSize; |
|
569 |
CompactSymbolTableWriter writer(num_buckets, |
|
570 |
&MetaspaceShared::stats()->symbol); |
|
571 |
for (int i = 0; i < the_table()->table_size(); ++i) { |
|
572 |
HashtableEntry<Symbol*, mtSymbol>* p = the_table()->bucket(i); |
|
573 |
for ( ; p != NULL; p = p->next()) { |
|
574 |
Symbol* s = (Symbol*)(p->literal()); |
|
575 |
unsigned int fixed_hash = hash_shared_symbol((char*)s->bytes(), s->utf8_length()); |
|
576 |
assert(fixed_hash == p->hash(), "must not rehash during dumping"); |
|
577 |
writer.add(fixed_hash, s); |
|
578 |
} |
|
579 |
} |
|
580 |
||
581 |
writer.dump(&_shared_table); |
|
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
582 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
583 |
|
37995 | 584 |
_shared_table.set_type(CompactHashtable<Symbol*, char>::_symbol_table); |
585 |
_shared_table.serialize(soc); |
|
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
586 |
|
37995 | 587 |
if (soc->writing()) { |
588 |
// Verify table is correct |
|
589 |
Symbol* sym = vmSymbols::java_lang_Object(); |
|
590 |
const char* name = (const char*)sym->bytes(); |
|
591 |
int len = sym->utf8_length(); |
|
592 |
unsigned int hash = hash_symbol(name, len); |
|
593 |
assert(sym == _shared_table.lookup(name, hash, len), "sanity"); |
|
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
594 |
|
37995 | 595 |
// Sanity. Make sure we don't use the shared table at dump time |
596 |
_shared_table.reset(); |
|
597 |
} |
|
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
598 |
#endif |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
599 |
} |
1 | 600 |
|
601 |
//--------------------------------------------------------------------------- |
|
602 |
// Non-product code |
|
603 |
||
604 |
#ifndef PRODUCT |
|
605 |
||
606 |
void SymbolTable::print_histogram() { |
|
607 |
MutexLocker ml(SymbolTable_lock); |
|
608 |
const int results_length = 100; |
|
26923
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
609 |
int counts[results_length]; |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
610 |
int sizes[results_length]; |
1 | 611 |
int i,j; |
612 |
||
613 |
// initialize results to zero |
|
614 |
for (j = 0; j < results_length; j++) { |
|
26923
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
615 |
counts[j] = 0; |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
616 |
sizes[j] = 0; |
1 | 617 |
} |
618 |
||
26923
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
619 |
int total_size = 0; |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
620 |
int total_count = 0; |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
621 |
int total_length = 0; |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
622 |
int max_length = 0; |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
623 |
int out_of_range_count = 0; |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
624 |
int out_of_range_size = 0; |
1 | 625 |
for (i = 0; i < the_table()->table_size(); i++) { |
13195 | 626 |
HashtableEntry<Symbol*, mtSymbol>* p = the_table()->bucket(i); |
1 | 627 |
for ( ; p != NULL; p = p->next()) { |
26923
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
628 |
int size = p->literal()->size(); |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
629 |
int len = p->literal()->utf8_length(); |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
630 |
if (len < results_length) { |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
631 |
counts[len]++; |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
632 |
sizes[len] += size; |
1 | 633 |
} else { |
26923
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
634 |
out_of_range_count++; |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
635 |
out_of_range_size += size; |
1 | 636 |
} |
26923
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
637 |
total_count++; |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
638 |
total_size += size; |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
639 |
total_length += len; |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
640 |
max_length = MAX2(max_length, len); |
1 | 641 |
} |
642 |
} |
|
26923
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
643 |
tty->print_cr("Symbol Table Histogram:"); |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
644 |
tty->print_cr(" Total number of symbols %7d", total_count); |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
645 |
tty->print_cr(" Total size in memory %7dK", |
35898
ddc274f0052f
8145628: hotspot metadata classes shouldn't use HeapWordSize or heap related macros like align_object_size
coleenp
parents:
35497
diff
changeset
|
646 |
(total_size*wordSize)/1024); |
26923
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
647 |
tty->print_cr(" Total counted %7d", _symbols_counted); |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
648 |
tty->print_cr(" Total removed %7d", _symbols_removed); |
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
649 |
if (_symbols_counted > 0) { |
26923
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
650 |
tty->print_cr(" Percent removed %3.2f", |
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
651 |
((float)_symbols_removed/(float)_symbols_counted)* 100); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
652 |
} |
26923
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
653 |
tty->print_cr(" Reference counts %7d", Symbol::_total_count); |
33148
68fa8b6c4340
8042893: compiler: PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC needs to be removed from source files
david
parents:
31790
diff
changeset
|
654 |
tty->print_cr(" Symbol arena used " SIZE_FORMAT_W(7) "K", arena()->used()/1024); |
68fa8b6c4340
8042893: compiler: PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC needs to be removed from source files
david
parents:
31790
diff
changeset
|
655 |
tty->print_cr(" Symbol arena size " SIZE_FORMAT_W(7) "K", arena()->size_in_bytes()/1024); |
26923
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
656 |
tty->print_cr(" Total symbol length %7d", total_length); |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
657 |
tty->print_cr(" Maximum symbol length %7d", max_length); |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
658 |
tty->print_cr(" Average symbol length %7.2f", ((float) total_length / (float) total_count)); |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
659 |
tty->print_cr(" Symbol length histogram:"); |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
660 |
tty->print_cr(" %6s %10s %10s", "Length", "#Symbols", "Size"); |
1 | 661 |
for (i = 0; i < results_length; i++) { |
26923
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
662 |
if (counts[i] > 0) { |
35898
ddc274f0052f
8145628: hotspot metadata classes shouldn't use HeapWordSize or heap related macros like align_object_size
coleenp
parents:
35497
diff
changeset
|
663 |
tty->print_cr(" %6d %10d %10dK", i, counts[i], (sizes[i]*wordSize)/1024); |
1 | 664 |
} |
665 |
} |
|
26923
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
666 |
tty->print_cr(" >=%6d %10d %10dK\n", results_length, |
35898
ddc274f0052f
8145628: hotspot metadata classes shouldn't use HeapWordSize or heap related macros like align_object_size
coleenp
parents:
35497
diff
changeset
|
667 |
out_of_range_count, (out_of_range_size*wordSize)/1024); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
668 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
669 |
|
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
670 |
void SymbolTable::print() { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
671 |
for (int i = 0; i < the_table()->table_size(); ++i) { |
13195 | 672 |
HashtableEntry<Symbol*, mtSymbol>** p = the_table()->bucket_addr(i); |
673 |
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
|
674 |
if (entry != NULL) { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
675 |
while (entry != NULL) { |
33148
68fa8b6c4340
8042893: compiler: PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC needs to be removed from source files
david
parents:
31790
diff
changeset
|
676 |
tty->print(PTR_FORMAT " ", p2i(entry->literal())); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
677 |
entry->literal()->print(); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
678 |
tty->print(" %d", entry->literal()->refcount()); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
679 |
p = entry->next_addr(); |
13195 | 680 |
entry = (HashtableEntry<Symbol*, mtSymbol>*)HashtableEntry<Symbol*, mtSymbol>::make_ptr(*p); |
1 | 681 |
} |
682 |
tty->cr(); |
|
683 |
} |
|
684 |
} |
|
685 |
} |
|
686 |
#endif // PRODUCT |
|
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
687 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
688 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
689 |
// Utility for dumping symbols |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
690 |
SymboltableDCmd::SymboltableDCmd(outputStream* output, bool heap) : |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
691 |
DCmdWithParser(output, heap), |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
692 |
_verbose("-verbose", "Dump the content of each symbol in the table", |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
693 |
"BOOLEAN", false, "false") { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
694 |
_dcmdparser.add_dcmd_option(&_verbose); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
695 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
696 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
697 |
void SymboltableDCmd::execute(DCmdSource source, TRAPS) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
698 |
VM_DumpHashtable dumper(output(), VM_DumpHashtable::DumpSymbols, |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
699 |
_verbose.value()); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
700 |
VMThread::execute(&dumper); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
701 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
702 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
703 |
int SymboltableDCmd::num_arguments() { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
704 |
ResourceMark rm; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
705 |
SymboltableDCmd* dcmd = new SymboltableDCmd(NULL, false); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
706 |
if (dcmd != NULL) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
707 |
DCmdMark mark(dcmd); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
708 |
return dcmd->_dcmdparser.num_arguments(); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
709 |
} else { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
710 |
return 0; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
711 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
712 |
} |