author | jiangli |
Wed, 17 Dec 2014 23:34:52 -0500 | |
changeset 28363 | 047115468f16 |
parent 27677 | b1997f2f1b56 |
child 28615 | 1fb960ea5a7e |
permissions | -rw-r--r-- |
1 | 1 |
/* |
23472 | 2 |
* Copyright (c) 1997, 2014, 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" |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
27 |
#include "classfile/compactHashtable.hpp" |
7397 | 28 |
#include "classfile/javaClasses.hpp" |
29 |
#include "classfile/symbolTable.hpp" |
|
30 |
#include "classfile/systemDictionary.hpp" |
|
31 |
#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
|
32 |
#include "memory/allocation.inline.hpp" |
7397 | 33 |
#include "memory/filemap.hpp" |
34 |
#include "memory/gcLocker.inline.hpp" |
|
35 |
#include "oops/oop.inline.hpp" |
|
36 |
#include "oops/oop.inline2.hpp" |
|
25351
7c198a690050
8044775: Improve usage of umbrella header atomic.inline.hpp.
goetz
parents:
24429
diff
changeset
|
37 |
#include "runtime/atomic.inline.hpp" |
7397 | 38 |
#include "runtime/mutexLocker.hpp" |
39 |
#include "utilities/hashtable.inline.hpp" |
|
1 | 40 |
|
24424
2658d7834c6e
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
23858
diff
changeset
|
41 |
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC |
2658d7834c6e
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
23858
diff
changeset
|
42 |
|
1 | 43 |
// -------------------------------------------------------------------------- |
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
44 |
// the number of buckets a thread claims |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
45 |
const int ClaimChunkSize = 32; |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
46 |
|
1 | 47 |
SymbolTable* SymbolTable::_the_table = NULL; |
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
48 |
// 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
|
49 |
Arena* SymbolTable::_arena = NULL; |
13087 | 50 |
bool SymbolTable::_needs_rehashing = false; |
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
51 |
bool SymbolTable::_lookup_shared_first = false; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
52 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
53 |
CompactHashtable<Symbol*, char> SymbolTable::_shared_table; |
1 | 54 |
|
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
55 |
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
|
56 |
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
|
57 |
|
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
58 |
Symbol* sym; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13199
diff
changeset
|
59 |
|
15934
104ff83451f1
8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents:
14742
diff
changeset
|
60 |
if (DumpSharedSpaces) { |
104ff83451f1
8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents:
14742
diff
changeset
|
61 |
// Allocate all symbols to CLD shared metaspace |
104ff83451f1
8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents:
14742
diff
changeset
|
62 |
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
|
63 |
} else if (c_heap) { |
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
64 |
// refcount starts as 1 |
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
65 |
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
|
66 |
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
|
67 |
} else { |
15934
104ff83451f1
8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents:
14742
diff
changeset
|
68 |
// Allocate to global arena |
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
69 |
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
|
70 |
} |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
71 |
return sym; |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
72 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
73 |
|
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
74 |
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
|
75 |
// 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
|
76 |
if (arena_alloc_size == 0) { |
25946 | 77 |
_arena = new (mtSymbol) Arena(mtSymbol); |
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
78 |
} else { |
25946 | 79 |
_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
|
80 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
81 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
82 |
|
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
83 |
// 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
|
84 |
void SymbolTable::symbols_do(SymbolClosure *cl) { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
85 |
const int n = the_table()->table_size(); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
86 |
for (int i = 0; i < n; i++) { |
13195 | 87 |
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
|
88 |
p != NULL; |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
89 |
p = p->next()) { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
90 |
cl->do_symbol(p->literal_addr()); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
91 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
92 |
} |
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 |
|
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
95 |
int SymbolTable::_symbols_removed = 0; |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
96 |
int SymbolTable::_symbols_counted = 0; |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
97 |
volatile int SymbolTable::_parallel_claimed_idx = 0; |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
98 |
|
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
99 |
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
|
100 |
for (int i = start_idx; i < end_idx; ++i) { |
13195 | 101 |
HashtableEntry<Symbol*, mtSymbol>** p = the_table()->bucket_addr(i); |
102 |
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
|
103 |
while (entry != NULL) { |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
104 |
// 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
|
105 |
// 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
|
106 |
// 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
|
107 |
// end of the bucket. |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
108 |
if (entry->is_shared() && !use_alternate_hashcode()) { |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
109 |
break; |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
110 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
111 |
Symbol* s = entry->literal(); |
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
112 |
(*memory_total) += s->size(); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
113 |
(*processed)++; |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
114 |
assert(s != NULL, "just checking"); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
115 |
// If reference count is zero, remove. |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
116 |
if (s->refcount() == 0) { |
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
117 |
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
|
118 |
delete s; |
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
119 |
(*removed)++; |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
120 |
*p = entry->next(); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
121 |
the_table()->free_entry(entry); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
122 |
} else { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
123 |
p = entry->next_addr(); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
124 |
} |
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
125 |
// get next entry |
13195 | 126 |
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
|
127 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
128 |
} |
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
129 |
} |
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 |
// Remove unreferenced symbols from the symbol table |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
132 |
// This is done late during GC. |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
133 |
void SymbolTable::unlink(int* processed, int* removed) { |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
134 |
size_t memory_total = 0; |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
135 |
buckets_unlink(0, the_table()->table_size(), processed, removed, &memory_total); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
136 |
_symbols_removed += *removed; |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
137 |
_symbols_counted += *processed; |
8655
fec854507832
7024584: Symbol printouts shouldnt be under PrintGCDetails
coleenp
parents:
8076
diff
changeset
|
138 |
// Exclude printing for normal PrintGCDetails because people parse |
fec854507832
7024584: Symbol printouts shouldnt be under PrintGCDetails
coleenp
parents:
8076
diff
changeset
|
139 |
// this output. |
fec854507832
7024584: Symbol printouts shouldnt be under PrintGCDetails
coleenp
parents:
8076
diff
changeset
|
140 |
if (PrintGCDetails && Verbose && WizardMode) { |
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
141 |
gclog_or_tty->print(" [Symbols=%d size=" SIZE_FORMAT "K] ", *processed, |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
142 |
(memory_total*HeapWordSize)/1024); |
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 |
} |
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 |
void SymbolTable::possibly_parallel_unlink(int* processed, int* removed) { |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
147 |
const int limit = the_table()->table_size(); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
148 |
|
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
149 |
size_t memory_total = 0; |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
150 |
|
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
151 |
for (;;) { |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
152 |
// Grab next set of buckets to scan |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
153 |
int start_idx = Atomic::add(ClaimChunkSize, &_parallel_claimed_idx) - ClaimChunkSize; |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
154 |
if (start_idx >= limit) { |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
155 |
// End of table |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
156 |
break; |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
157 |
} |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
158 |
|
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
159 |
int end_idx = MIN2(limit, start_idx + ClaimChunkSize); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
160 |
buckets_unlink(start_idx, end_idx, processed, removed, &memory_total); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
161 |
} |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
162 |
Atomic::add(*processed, &_symbols_counted); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
163 |
Atomic::add(*removed, &_symbols_removed); |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
164 |
// Exclude printing for normal PrintGCDetails because people parse |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
165 |
// this output. |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
166 |
if (PrintGCDetails && Verbose && WizardMode) { |
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
167 |
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
|
168 |
(memory_total*HeapWordSize)/1024); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
169 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
170 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
171 |
|
13087 | 172 |
// Create a new table and using alternate hash code, populate the new table |
173 |
// with the existing strings. Set flag to use the alternate hash code afterwards. |
|
174 |
void SymbolTable::rehash_table() { |
|
175 |
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
|
176 |
// 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
|
177 |
if (DumpSharedSpaces) return; |
13087 | 178 |
// Create a new symbol table |
179 |
SymbolTable* new_table = new SymbolTable(); |
|
180 |
||
181 |
the_table()->move_to(new_table); |
|
182 |
||
183 |
// Delete the table and buckets (entries are reused in new table). |
|
184 |
delete _the_table; |
|
185 |
// Don't check if we need rehashing until the table gets unbalanced again. |
|
186 |
// Then rehash with a new global seed. |
|
187 |
_needs_rehashing = false; |
|
188 |
_the_table = new_table; |
|
189 |
} |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
190 |
|
1 | 191 |
// Lookup a symbol in a bucket. |
192 |
||
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
193 |
Symbol* SymbolTable::lookup_dynamic(int index, const char* name, |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
194 |
int len, unsigned int hash) { |
13087 | 195 |
int count = 0; |
13195 | 196 |
for (HashtableEntry<Symbol*, mtSymbol>* e = bucket(index); e != NULL; e = e->next()) { |
13087 | 197 |
count++; // count all entries in this bucket, not just ones with same hash |
1 | 198 |
if (e->hash() == hash) { |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
199 |
Symbol* sym = e->literal(); |
1 | 200 |
if (sym->equals(name, len)) { |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
201 |
// something is referencing this symbol now. |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
202 |
sym->increment_refcount(); |
1 | 203 |
return sym; |
204 |
} |
|
205 |
} |
|
206 |
} |
|
13087 | 207 |
// 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
|
208 |
if (count >= rehash_count && !needs_rehashing()) { |
13087 | 209 |
_needs_rehashing = check_rehash_table(count); |
210 |
} |
|
1 | 211 |
return NULL; |
212 |
} |
|
213 |
||
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
214 |
Symbol* SymbolTable::lookup_shared(const char* name, |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
215 |
int len, unsigned int hash) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
216 |
return _shared_table.lookup(name, hash, len); |
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 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
219 |
Symbol* SymbolTable::lookup(int index, const char* name, |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
220 |
int len, unsigned int hash) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
221 |
Symbol* sym; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
222 |
if (_lookup_shared_first) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
223 |
sym = lookup_shared(name, len, hash); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
224 |
if (sym != NULL) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
225 |
return sym; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
226 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
227 |
_lookup_shared_first = false; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
228 |
return lookup_dynamic(index, name, len, hash); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
229 |
} else { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
230 |
sym = lookup_dynamic(index, name, len, hash); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
231 |
if (sym != NULL) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
232 |
return sym; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
233 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
234 |
sym = lookup_shared(name, len, hash); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
235 |
if (sym != NULL) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
236 |
_lookup_shared_first = true; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
237 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
238 |
return sym; |
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 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
241 |
|
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
242 |
// Pick hashing algorithm. |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
243 |
unsigned int SymbolTable::hash_symbol(const char* s, int len) { |
13087 | 244 |
return use_alternate_hashcode() ? |
245 |
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
|
246 |
java_lang_String::hash_code(s, len); |
13087 | 247 |
} |
248 |
||
1 | 249 |
|
250 |
// We take care not to be blocking while holding the |
|
251 |
// SymbolTable_lock. Otherwise, the system might deadlock, since the |
|
252 |
// symboltable is used during compilation (VM_thread) The lock free |
|
253 |
// synchronization is simplified by the fact that we do not delete |
|
254 |
// entries in the symbol table during normal execution (only during |
|
255 |
// safepoints). |
|
256 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
257 |
Symbol* SymbolTable::lookup(const char* name, int len, TRAPS) { |
1 | 258 |
unsigned int hashValue = hash_symbol(name, len); |
259 |
int index = the_table()->hash_to_index(hashValue); |
|
260 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
261 |
Symbol* s = the_table()->lookup(index, name, len, hashValue); |
1 | 262 |
|
263 |
// Found |
|
264 |
if (s != NULL) return s; |
|
265 |
||
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
266 |
// Grab SymbolTable_lock first. |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
267 |
MutexLocker ml(SymbolTable_lock, THREAD); |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
268 |
|
1 | 269 |
// Otherwise, add to symbol to table |
27677 | 270 |
return the_table()->basic_add(index, (u1*)name, len, hashValue, true, THREAD); |
1 | 271 |
} |
272 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
273 |
Symbol* SymbolTable::lookup(const Symbol* sym, int begin, int end, TRAPS) { |
1 | 274 |
char* buffer; |
275 |
int index, len; |
|
276 |
unsigned int hashValue; |
|
277 |
char* name; |
|
278 |
{ |
|
279 |
debug_only(No_Safepoint_Verifier nsv;) |
|
280 |
||
281 |
name = (char*)sym->base() + begin; |
|
282 |
len = end - begin; |
|
283 |
hashValue = hash_symbol(name, len); |
|
284 |
index = the_table()->hash_to_index(hashValue); |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
285 |
Symbol* s = the_table()->lookup(index, name, len, hashValue); |
1 | 286 |
|
287 |
// Found |
|
288 |
if (s != NULL) return s; |
|
289 |
} |
|
290 |
||
291 |
// Otherwise, add to symbol to table. Copy to a C string first. |
|
292 |
char stack_buf[128]; |
|
293 |
ResourceMark rm(THREAD); |
|
294 |
if (len <= 128) { |
|
295 |
buffer = stack_buf; |
|
296 |
} else { |
|
297 |
buffer = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, len); |
|
298 |
} |
|
299 |
for (int i=0; i<len; i++) { |
|
300 |
buffer[i] = name[i]; |
|
301 |
} |
|
302 |
// Make sure there is no safepoint in the code above since name can't move. |
|
303 |
// We can't include the code in No_Safepoint_Verifier because of the |
|
304 |
// ResourceMark. |
|
305 |
||
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
306 |
// Grab SymbolTable_lock first. |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
307 |
MutexLocker ml(SymbolTable_lock, THREAD); |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
308 |
|
27677 | 309 |
return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, THREAD); |
1 | 310 |
} |
311 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
312 |
Symbol* SymbolTable::lookup_only(const char* name, int len, |
1 | 313 |
unsigned int& hash) { |
314 |
hash = hash_symbol(name, len); |
|
315 |
int index = the_table()->hash_to_index(hash); |
|
316 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
317 |
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
|
318 |
return s; |
1 | 319 |
} |
320 |
||
11480
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
321 |
// 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
|
322 |
// Do not create any new symbols |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
323 |
// 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
|
324 |
Symbol** SymbolTable::lookup_symbol_addr(Symbol* sym){ |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
325 |
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
|
326 |
int index = the_table()->hash_to_index(hash); |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
327 |
|
13195 | 328 |
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
|
329 |
if (e->hash() == hash) { |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
330 |
Symbol* literal_sym = e->literal(); |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
331 |
if (sym == literal_sym) { |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
332 |
return e->literal_addr(); |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
333 |
} |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
334 |
} |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
335 |
} |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
336 |
return NULL; |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
337 |
} |
1bf714e8adb4
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
8885
diff
changeset
|
338 |
|
2332
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
339 |
// Suggestion: Push unicode-based lookup all the way into the hashing |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
340 |
// 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
|
341 |
// an actual new Symbol* is created. |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
342 |
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
|
343 |
int utf8_length = UNICODE::utf8_length((jchar*) name, utf16_length); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
344 |
char stack_buf[128]; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
345 |
if (utf8_length < (int) sizeof(stack_buf)) { |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
346 |
char* chars = stack_buf; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
347 |
UNICODE::convert_to_utf8(name, utf16_length, chars); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
348 |
return lookup(chars, utf8_length, THREAD); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
349 |
} else { |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
350 |
ResourceMark rm(THREAD); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
351 |
char* chars = NEW_RESOURCE_ARRAY(char, utf8_length + 1);; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
352 |
UNICODE::convert_to_utf8(name, utf16_length, chars); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
353 |
return lookup(chars, utf8_length, THREAD); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
354 |
} |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
355 |
} |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
356 |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
357 |
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
|
358 |
unsigned int& hash) { |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
359 |
int utf8_length = UNICODE::utf8_length((jchar*) name, utf16_length); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
360 |
char stack_buf[128]; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
361 |
if (utf8_length < (int) sizeof(stack_buf)) { |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
362 |
char* chars = stack_buf; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
363 |
UNICODE::convert_to_utf8(name, utf16_length, chars); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
364 |
return lookup_only(chars, utf8_length, hash); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
365 |
} else { |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
366 |
ResourceMark rm; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
367 |
char* chars = NEW_RESOURCE_ARRAY(char, utf8_length + 1);; |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
368 |
UNICODE::convert_to_utf8(name, utf16_length, chars); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
369 |
return lookup_only(chars, utf8_length, hash); |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
370 |
} |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
371 |
} |
5c7b6f4ce0a1
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
2131
diff
changeset
|
372 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13199
diff
changeset
|
373 |
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
|
374 |
int names_count, |
1 | 375 |
const char** names, int* lengths, int* cp_indices, |
376 |
unsigned int* hashValues, TRAPS) { |
|
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
377 |
// Grab SymbolTable_lock first. |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
378 |
MutexLocker ml(SymbolTable_lock, THREAD); |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
379 |
|
1 | 380 |
SymbolTable* table = the_table(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13199
diff
changeset
|
381 |
bool added = table->basic_add(loader_data, cp, names_count, names, lengths, |
1 | 382 |
cp_indices, hashValues, CHECK); |
383 |
if (!added) { |
|
384 |
// do it the hard way |
|
385 |
for (int i=0; i<names_count; i++) { |
|
386 |
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
|
387 |
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
|
388 |
Symbol* sym = table->basic_add(index, (u1*)names[i], lengths[i], hashValues[i], c_heap, CHECK); |
1 | 389 |
cp->symbol_at_put(cp_indices[i], sym); |
390 |
} |
|
391 |
} |
|
392 |
} |
|
393 |
||
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
394 |
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
|
395 |
unsigned int hash; |
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
396 |
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
|
397 |
if (result != NULL) { |
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
398 |
return result; |
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
399 |
} |
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
400 |
// Grab SymbolTable_lock first. |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
401 |
MutexLocker ml(SymbolTable_lock, THREAD); |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
402 |
|
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
403 |
SymbolTable* table = the_table(); |
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
404 |
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
|
405 |
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
|
406 |
} |
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
407 |
|
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
408 |
Symbol* SymbolTable::basic_add(int index_arg, u1 *name, int len, |
13087 | 409 |
unsigned int hashValue_arg, bool c_heap, TRAPS) { |
20079 | 410 |
assert(!Universe::heap()->is_in_reserved(name), |
1 | 411 |
"proposed name of symbol must be stable"); |
412 |
||
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
413 |
// 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
|
414 |
if (len > Symbol::max_length()) { |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
415 |
THROW_MSG_0(vmSymbols::java_lang_InternalError(), |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
416 |
"name is too long to represent"); |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
417 |
} |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
418 |
|
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
419 |
// 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
|
420 |
No_Safepoint_Verifier nsv; |
1 | 421 |
|
13087 | 422 |
// 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
|
423 |
// the hash value and index. |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
424 |
unsigned int hashValue; |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
425 |
int index; |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
426 |
if (use_alternate_hashcode()) { |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
427 |
hashValue = hash_symbol((const char*)name, len); |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
428 |
index = hash_to_index(hashValue); |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
429 |
} else { |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
430 |
hashValue = hashValue_arg; |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
431 |
index = index_arg; |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
432 |
} |
13087 | 433 |
|
1 | 434 |
// Since look-up was done lock-free, we need to check if another |
435 |
// 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
|
436 |
Symbol* test = lookup(index, (char*)name, len, hashValue); |
1 | 437 |
if (test != NULL) { |
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
438 |
// 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
|
439 |
assert(test->refcount() != 0, "lookup should have incremented the count"); |
1 | 440 |
return test; |
441 |
} |
|
442 |
||
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
443 |
// Create a new symbol. |
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
444 |
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
|
445 |
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
|
446 |
|
13195 | 447 |
HashtableEntry<Symbol*, mtSymbol>* entry = new_entry(hashValue, sym); |
1 | 448 |
add_entry(index, entry); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
449 |
return sym; |
1 | 450 |
} |
451 |
||
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
452 |
// 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
|
453 |
// parsing. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13199
diff
changeset
|
454 |
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
|
455 |
int names_count, |
1 | 456 |
const char** names, int* lengths, |
457 |
int* cp_indices, unsigned int* hashValues, |
|
458 |
TRAPS) { |
|
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
459 |
|
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
460 |
// 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
|
461 |
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
|
462 |
if (lengths[i] > Symbol::max_length()) { |
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
463 |
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
|
464 |
"name is too long to represent"); |
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
465 |
} |
1 | 466 |
} |
467 |
||
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
468 |
// 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
|
469 |
No_Safepoint_Verifier nsv; |
1 | 470 |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
471 |
for (int i=0; i<names_count; i++) { |
13087 | 472 |
// Check if the symbol table has been rehashed, if so, need to recalculate |
473 |
// the hash value. |
|
13097
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
474 |
unsigned int hashValue; |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
475 |
if (use_alternate_hashcode()) { |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
476 |
hashValue = hash_symbol(names[i], lengths[i]); |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
477 |
} else { |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
478 |
hashValue = hashValues[i]; |
c146b608d91f
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
13087
diff
changeset
|
479 |
} |
1 | 480 |
// Since look-up was done lock-free, we need to check if another |
481 |
// thread beat us in the race to insert the symbol. |
|
13087 | 482 |
int index = hash_to_index(hashValue); |
483 |
Symbol* test = lookup(index, names[i], lengths[i], hashValue); |
|
1 | 484 |
if (test != NULL) { |
2131 | 485 |
// A race occurred and another thread introduced the symbol, this one |
1 | 486 |
// will be dropped and collected. Use test instead. |
487 |
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
|
488 |
assert(test->refcount() != 0, "lookup should have incremented the count"); |
1 | 489 |
} else { |
12263
d20640f4f8fe
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
11480
diff
changeset
|
490 |
// 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
|
491 |
// are allocated specially in a permanent arena. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13199
diff
changeset
|
492 |
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
|
493 |
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
|
494 |
assert(sym->equals(names[i], lengths[i]), "symbol must be properly initialized"); // why wouldn't it be??? |
13195 | 495 |
HashtableEntry<Symbol*, mtSymbol>* entry = new_entry(hashValue, sym); |
1 | 496 |
add_entry(index, entry); |
497 |
cp->symbol_at_put(cp_indices[i], sym); |
|
498 |
} |
|
499 |
} |
|
500 |
return true; |
|
501 |
} |
|
502 |
||
503 |
||
504 |
void SymbolTable::verify() { |
|
505 |
for (int i = 0; i < the_table()->table_size(); ++i) { |
|
13195 | 506 |
HashtableEntry<Symbol*, mtSymbol>* p = the_table()->bucket(i); |
1 | 507 |
for ( ; p != NULL; p = p->next()) { |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
508 |
Symbol* s = (Symbol*)(p->literal()); |
1 | 509 |
guarantee(s != NULL, "symbol is NULL"); |
510 |
unsigned int h = hash_symbol((char*)s->bytes(), s->utf8_length()); |
|
511 |
guarantee(p->hash() == h, "broken hash in symbol table entry"); |
|
512 |
guarantee(the_table()->hash_to_index(h) == i, |
|
513 |
"wrong index in symbol table"); |
|
514 |
} |
|
515 |
} |
|
516 |
} |
|
517 |
||
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
518 |
void SymbolTable::dump(outputStream* st, bool verbose) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
519 |
if (!verbose) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
520 |
the_table()->dump_table(st, "SymbolTable"); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
521 |
} else { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
522 |
st->print_cr("VERSION: 1.0"); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
523 |
for (int i = 0; i < the_table()->table_size(); ++i) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
524 |
HashtableEntry<Symbol*, mtSymbol>* p = the_table()->bucket(i); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
525 |
for ( ; p != NULL; p = p->next()) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
526 |
Symbol* s = (Symbol*)(p->literal()); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
527 |
const char* utf8_string = (const char*)s->bytes(); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
528 |
int utf8_length = s->utf8_length(); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
529 |
st->print("%d %d: ", utf8_length, s->refcount()); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
530 |
HashtableTextDump::put_utf8(st, utf8_string, utf8_length); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
531 |
st->cr(); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
532 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
533 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
534 |
} |
13087 | 535 |
} |
536 |
||
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
537 |
bool SymbolTable::copy_compact_table(char** top, char*end) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
538 |
#if INCLUDE_CDS |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
539 |
CompactHashtableWriter ch_table("symbol", the_table()->number_of_entries(), |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
540 |
&MetaspaceShared::stats()->symbol); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
541 |
if (*top + ch_table.get_required_bytes() > end) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
542 |
// not enough space left |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
543 |
return false; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
544 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
545 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
546 |
for (int i = 0; i < the_table()->table_size(); ++i) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
547 |
HashtableEntry<Symbol*, mtSymbol>* p = the_table()->bucket(i); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
548 |
for ( ; p != NULL; p = p->next()) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
549 |
Symbol* s = (Symbol*)(p->literal()); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
550 |
unsigned int fixed_hash = hash_symbol((char*)s->bytes(), s->utf8_length()); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
551 |
assert(fixed_hash == p->hash(), "must not rehash during dumping"); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
552 |
ch_table.add(fixed_hash, s); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
553 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
554 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
555 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
556 |
char* old_top = *top; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
557 |
ch_table.dump(top, end); |
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 |
*top = (char*)align_pointer_up(*top, sizeof(void*)); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
560 |
#endif |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
561 |
return true; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
562 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
563 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
564 |
const char* SymbolTable::init_shared_table(const char* buffer) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
565 |
const char* end = _shared_table.init(buffer); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
566 |
return (const char*)align_pointer_up(end, sizeof(void*)); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
567 |
} |
1 | 568 |
|
569 |
//--------------------------------------------------------------------------- |
|
570 |
// Non-product code |
|
571 |
||
572 |
#ifndef PRODUCT |
|
573 |
||
574 |
void SymbolTable::print_histogram() { |
|
575 |
MutexLocker ml(SymbolTable_lock); |
|
576 |
const int results_length = 100; |
|
26923
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
577 |
int counts[results_length]; |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
578 |
int sizes[results_length]; |
1 | 579 |
int i,j; |
580 |
||
581 |
// initialize results to zero |
|
582 |
for (j = 0; j < results_length; j++) { |
|
26923
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
583 |
counts[j] = 0; |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
584 |
sizes[j] = 0; |
1 | 585 |
} |
586 |
||
26923
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
587 |
int total_size = 0; |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
588 |
int total_count = 0; |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
589 |
int total_length = 0; |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
590 |
int max_length = 0; |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
591 |
int out_of_range_count = 0; |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
592 |
int out_of_range_size = 0; |
1 | 593 |
for (i = 0; i < the_table()->table_size(); i++) { |
13195 | 594 |
HashtableEntry<Symbol*, mtSymbol>* p = the_table()->bucket(i); |
1 | 595 |
for ( ; p != NULL; p = p->next()) { |
26923
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
596 |
int size = p->literal()->size(); |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
597 |
int len = p->literal()->utf8_length(); |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
598 |
if (len < results_length) { |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
599 |
counts[len]++; |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
600 |
sizes[len] += size; |
1 | 601 |
} else { |
26923
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
602 |
out_of_range_count++; |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
603 |
out_of_range_size += size; |
1 | 604 |
} |
26923
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
605 |
total_count++; |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
606 |
total_size += size; |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
607 |
total_length += len; |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
608 |
max_length = MAX2(max_length, len); |
1 | 609 |
} |
610 |
} |
|
26923
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
611 |
tty->print_cr("Symbol Table Histogram:"); |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
612 |
tty->print_cr(" Total number of symbols %7d", total_count); |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
613 |
tty->print_cr(" Total size in memory %7dK", |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
614 |
(total_size*HeapWordSize)/1024); |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
615 |
tty->print_cr(" Total counted %7d", _symbols_counted); |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
616 |
tty->print_cr(" Total removed %7d", _symbols_removed); |
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
617 |
if (_symbols_counted > 0) { |
26923
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
618 |
tty->print_cr(" Percent removed %3.2f", |
22545
b93a7f0e9b9d
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
20283
diff
changeset
|
619 |
((float)_symbols_removed/(float)_symbols_counted)* 100); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
620 |
} |
26923
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
621 |
tty->print_cr(" Reference counts %7d", Symbol::_total_count); |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
622 |
tty->print_cr(" Symbol arena used %7dK", arena()->used()/1024); |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
623 |
tty->print_cr(" Symbol arena size %7dK", arena()->size_in_bytes()/1024); |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
624 |
tty->print_cr(" Total symbol length %7d", total_length); |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
625 |
tty->print_cr(" Maximum symbol length %7d", max_length); |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
626 |
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
|
627 |
tty->print_cr(" Symbol length histogram:"); |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
628 |
tty->print_cr(" %6s %10s %10s", "Length", "#Symbols", "Size"); |
1 | 629 |
for (i = 0; i < results_length; i++) { |
26923
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
630 |
if (counts[i] > 0) { |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
631 |
tty->print_cr(" %6d %10d %10dK", i, counts[i], (sizes[i]*HeapWordSize)/1024); |
1 | 632 |
} |
633 |
} |
|
26923
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
634 |
tty->print_cr(" >=%6d %10d %10dK\n", results_length, |
60c1555c25c5
8057925: PrintSymbolTableSizeHistogram prints misleading output
shade
parents:
26421
diff
changeset
|
635 |
out_of_range_count, (out_of_range_size*HeapWordSize)/1024); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
636 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
637 |
|
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
638 |
void SymbolTable::print() { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
639 |
for (int i = 0; i < the_table()->table_size(); ++i) { |
13195 | 640 |
HashtableEntry<Symbol*, mtSymbol>** p = the_table()->bucket_addr(i); |
641 |
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
|
642 |
if (entry != NULL) { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
643 |
while (entry != NULL) { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
644 |
tty->print(PTR_FORMAT " ", entry->literal()); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
645 |
entry->literal()->print(); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
646 |
tty->print(" %d", entry->literal()->refcount()); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
647 |
p = entry->next_addr(); |
13195 | 648 |
entry = (HashtableEntry<Symbol*, mtSymbol>*)HashtableEntry<Symbol*, mtSymbol>::make_ptr(*p); |
1 | 649 |
} |
650 |
tty->cr(); |
|
651 |
} |
|
652 |
} |
|
653 |
} |
|
654 |
#endif // PRODUCT |
|
28363
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
655 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
656 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
657 |
// Utility for dumping symbols |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
658 |
SymboltableDCmd::SymboltableDCmd(outputStream* output, bool heap) : |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
659 |
DCmdWithParser(output, heap), |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
660 |
_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
|
661 |
"BOOLEAN", false, "false") { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
662 |
_dcmdparser.add_dcmd_option(&_verbose); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
663 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
664 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
665 |
void SymboltableDCmd::execute(DCmdSource source, TRAPS) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
666 |
VM_DumpHashtable dumper(output(), VM_DumpHashtable::DumpSymbols, |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
667 |
_verbose.value()); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
668 |
VMThread::execute(&dumper); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
669 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
670 |
|
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
671 |
int SymboltableDCmd::num_arguments() { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
672 |
ResourceMark rm; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
673 |
SymboltableDCmd* dcmd = new SymboltableDCmd(NULL, false); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
674 |
if (dcmd != NULL) { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
675 |
DCmdMark mark(dcmd); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
676 |
return dcmd->_dcmdparser.num_arguments(); |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
677 |
} else { |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
678 |
return 0; |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
679 |
} |
047115468f16
8059510: Compact symbol table layout inside shared archive.
jiangli
parents:
27677
diff
changeset
|
680 |
} |