Mercurial > hg > truffle
annotate src/share/vm/classfile/symbolTable.cpp @ 20762:c2844108a708
Merge
| author | asaha |
|---|---|
| date | Thu, 23 Oct 2014 12:02:08 -0700 |
| parents | 152cf4afc11f |
| children | 7848fc12602b |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 17764 | 2 * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. |
| 0 | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
| 4 * | |
| 5 * This code is free software; you can redistribute it and/or modify it | |
| 6 * under the terms of the GNU General Public License version 2 only, as | |
| 7 * published by the Free Software Foundation. | |
| 8 * | |
| 9 * This code is distributed in the hope that it will be useful, but WITHOUT | |
| 10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 12 * version 2 for more details (a copy is included in the LICENSE file that | |
| 13 * accompanied this code). | |
| 14 * | |
| 15 * You should have received a copy of the GNU General Public License version | |
| 16 * 2 along with this work; if not, write to the Free Software Foundation, | |
| 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
| 18 * | |
|
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
665
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
665
diff
changeset
|
20 * or visit www.oracle.com if you need additional information or have any |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
665
diff
changeset
|
21 * questions. |
| 0 | 22 * |
| 23 */ | |
| 24 | |
| 1972 | 25 #include "precompiled.hpp" |
| 6162 | 26 #include "classfile/altHashing.hpp" |
| 1972 | 27 #include "classfile/javaClasses.hpp" |
| 28 #include "classfile/symbolTable.hpp" | |
| 29 #include "classfile/systemDictionary.hpp" | |
| 30 #include "gc_interface/collectedHeap.inline.hpp" | |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
31 #include "memory/allocation.inline.hpp" |
| 1972 | 32 #include "memory/filemap.hpp" |
| 33 #include "memory/gcLocker.inline.hpp" | |
| 34 #include "oops/oop.inline.hpp" | |
| 35 #include "oops/oop.inline2.hpp" | |
| 36 #include "runtime/mutexLocker.hpp" | |
| 37 #include "utilities/hashtable.inline.hpp" | |
| 17764 | 38 #if INCLUDE_ALL_GCS |
|
20278
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
39 #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" |
| 17764 | 40 #include "gc_implementation/g1/g1StringDedup.hpp" |
| 41 #endif | |
| 0 | 42 |
|
17937
78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
17764
diff
changeset
|
43 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC |
|
78bbf4d43a14
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
17764
diff
changeset
|
44 |
| 0 | 45 // -------------------------------------------------------------------------- |
| 46 | |
|
17634
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
47 // the number of buckets a thread claims |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
48 const int ClaimChunkSize = 32; |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
49 |
| 0 | 50 SymbolTable* SymbolTable::_the_table = NULL; |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
51 // Static arena for symbols that are not deallocated |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
52 Arena* SymbolTable::_arena = NULL; |
| 6162 | 53 bool SymbolTable::_needs_rehashing = false; |
| 0 | 54 |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
55 Symbol* SymbolTable::allocate_symbol(const u1* name, int len, bool c_heap, TRAPS) { |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
56 assert (len <= Symbol::max_length(), "should be checked by caller"); |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
57 |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
58 Symbol* sym; |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6201
diff
changeset
|
59 |
|
8718
0ede345ec7c9
8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents:
7399
diff
changeset
|
60 if (DumpSharedSpaces) { |
|
0ede345ec7c9
8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents:
7399
diff
changeset
|
61 // Allocate all symbols to CLD shared metaspace |
|
0ede345ec7c9
8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents:
7399
diff
changeset
|
62 sym = new (len, ClassLoaderData::the_null_class_loader_data(), THREAD) Symbol(name, len, -1); |
|
0ede345ec7c9
8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents:
7399
diff
changeset
|
63 } else if (c_heap) { |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
64 // refcount starts as 1 |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
65 sym = new (len, THREAD) Symbol(name, len, 1); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6201
diff
changeset
|
66 assert(sym != NULL, "new should call vm_exit_out_of_memory if C_HEAP is exhausted"); |
|
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6201
diff
changeset
|
67 } else { |
|
8718
0ede345ec7c9
8009829: CDS: JDK JPRT test fails crash in Symbol::equals()
coleenp
parents:
7399
diff
changeset
|
68 // Allocate to global arena |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
69 sym = new (len, arena(), THREAD) Symbol(name, len, -1); |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
70 } |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
71 return sym; |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
72 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
73 |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
74 void SymbolTable::initialize_symbols(int arena_alloc_size) { |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
75 // Initialize the arena for global symbols, size passed in depends on CDS. |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
76 if (arena_alloc_size == 0) { |
| 20360 | 77 _arena = new (mtSymbol) Arena(mtSymbol); |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
78 } else { |
| 20360 | 79 _arena = new (mtSymbol) Arena(mtSymbol, arena_alloc_size); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
80 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
81 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
82 |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
83 // Call function for all symbols in the symbol table. |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
84 void SymbolTable::symbols_do(SymbolClosure *cl) { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
85 const int n = the_table()->table_size(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
86 for (int i = 0; i < n; i++) { |
| 6197 | 87 for (HashtableEntry<Symbol*, mtSymbol>* p = the_table()->bucket(i); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
88 p != NULL; |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
89 p = p->next()) { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
90 cl->do_symbol(p->literal_addr()); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
91 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
92 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
93 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
94 |
|
17634
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
95 int SymbolTable::_symbols_removed = 0; |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
96 int SymbolTable::_symbols_counted = 0; |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
97 volatile int SymbolTable::_parallel_claimed_idx = 0; |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
98 |
|
17634
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
99 void SymbolTable::buckets_unlink(int start_idx, int end_idx, int* processed, int* removed, size_t* memory_total) { |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
100 for (int i = start_idx; i < end_idx; ++i) { |
| 6197 | 101 HashtableEntry<Symbol*, mtSymbol>** p = the_table()->bucket_addr(i); |
| 102 HashtableEntry<Symbol*, mtSymbol>* entry = the_table()->bucket(i); | |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
103 while (entry != NULL) { |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
104 // Shared entries are normally at the end of the bucket and if we run into |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
105 // a shared entry, then there is nothing more to remove. However, if we |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
106 // have rehashed the table, then the shared entries are no longer at the |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
107 // end of the bucket. |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
108 if (entry->is_shared() && !use_alternate_hashcode()) { |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
109 break; |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
110 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
111 Symbol* s = entry->literal(); |
|
17634
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
112 (*memory_total) += s->size(); |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
113 (*processed)++; |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
114 assert(s != NULL, "just checking"); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
115 // If reference count is zero, remove. |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
116 if (s->refcount() == 0) { |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
117 assert(!entry->is_shared(), "shared entries should be kept live"); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
118 delete s; |
|
17634
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
119 (*removed)++; |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
120 *p = entry->next(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
121 the_table()->free_entry(entry); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
122 } else { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
123 p = entry->next_addr(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
124 } |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
125 // get next entry |
| 6197 | 126 entry = (HashtableEntry<Symbol*, mtSymbol>*)HashtableEntry<Symbol*, mtSymbol>::make_ptr(*p); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
127 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
128 } |
|
17634
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
129 } |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
130 |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
131 // Remove unreferenced symbols from the symbol table |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
132 // This is done late during GC. |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
133 void SymbolTable::unlink(int* processed, int* removed) { |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
134 size_t memory_total = 0; |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
135 buckets_unlink(0, the_table()->table_size(), processed, removed, &memory_total); |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
136 _symbols_removed += *removed; |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
137 _symbols_counted += *processed; |
|
2336
df1347358fe6
7024584: Symbol printouts shouldnt be under PrintGCDetails
coleenp
parents:
2177
diff
changeset
|
138 // Exclude printing for normal PrintGCDetails because people parse |
|
df1347358fe6
7024584: Symbol printouts shouldnt be under PrintGCDetails
coleenp
parents:
2177
diff
changeset
|
139 // this output. |
|
df1347358fe6
7024584: Symbol printouts shouldnt be under PrintGCDetails
coleenp
parents:
2177
diff
changeset
|
140 if (PrintGCDetails && Verbose && WizardMode) { |
|
17634
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
141 gclog_or_tty->print(" [Symbols=%d size=" SIZE_FORMAT "K] ", *processed, |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
142 (memory_total*HeapWordSize)/1024); |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
143 } |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
144 } |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
145 |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
146 void SymbolTable::possibly_parallel_unlink(int* processed, int* removed) { |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
147 const int limit = the_table()->table_size(); |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
148 |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
149 size_t memory_total = 0; |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
150 |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
151 for (;;) { |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
152 // Grab next set of buckets to scan |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
153 int start_idx = Atomic::add(ClaimChunkSize, &_parallel_claimed_idx) - ClaimChunkSize; |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
154 if (start_idx >= limit) { |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
155 // End of table |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
156 break; |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
157 } |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
158 |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
159 int end_idx = MIN2(limit, start_idx + ClaimChunkSize); |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
160 buckets_unlink(start_idx, end_idx, processed, removed, &memory_total); |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
161 } |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
162 Atomic::add(*processed, &_symbols_counted); |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
163 Atomic::add(*removed, &_symbols_removed); |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
164 // Exclude printing for normal PrintGCDetails because people parse |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
165 // this output. |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
166 if (PrintGCDetails && Verbose && WizardMode) { |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
167 gclog_or_tty->print(" [Symbols: scanned=%d removed=%d size=" SIZE_FORMAT "K] ", *processed, *removed, |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
168 (memory_total*HeapWordSize)/1024); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
169 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
170 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
171 |
| 6162 | 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"); | |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
176 // This should never happen with -Xshare:dump but it might in testing mode. |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
177 if (DumpSharedSpaces) return; |
| 6162 | 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 } | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
190 |
| 0 | 191 // Lookup a symbol in a bucket. |
| 192 | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
193 Symbol* SymbolTable::lookup(int index, const char* name, |
| 0 | 194 int len, unsigned int hash) { |
| 6162 | 195 int count = 0; |
| 6197 | 196 for (HashtableEntry<Symbol*, mtSymbol>* e = bucket(index); e != NULL; e = e->next()) { |
| 6162 | 197 count++; // count all entries in this bucket, not just ones with same hash |
| 0 | 198 if (e->hash() == hash) { |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
199 Symbol* sym = e->literal(); |
| 0 | 200 if (sym->equals(name, len)) { |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
201 // something is referencing this symbol now. |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
202 sym->increment_refcount(); |
| 0 | 203 return sym; |
| 204 } | |
| 205 } | |
| 206 } | |
| 6162 | 207 // If the bucket size is too deep check if this hash code is insufficient. |
|
20493
152cf4afc11f
8056084: Refactor Hashtable to allow implementations without rehashing support
mgerdin
parents:
20360
diff
changeset
|
208 if (count >= rehash_count && !needs_rehashing()) { |
| 6162 | 209 _needs_rehashing = check_rehash_table(count); |
| 210 } | |
| 0 | 211 return NULL; |
| 212 } | |
| 213 | |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
214 // Pick hashing algorithm. |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
215 unsigned int SymbolTable::hash_symbol(const char* s, int len) { |
| 6162 | 216 return use_alternate_hashcode() ? |
| 217 AltHashing::murmur3_32(seed(), (const jbyte*)s, len) : | |
|
7399
2aa953165ade
8004661: Comment and function name java_lang_String::toHash is wrong
brutisso
parents:
6725
diff
changeset
|
218 java_lang_String::hash_code(s, len); |
| 6162 | 219 } |
| 220 | |
| 0 | 221 |
| 222 // We take care not to be blocking while holding the | |
| 223 // SymbolTable_lock. Otherwise, the system might deadlock, since the | |
| 224 // symboltable is used during compilation (VM_thread) The lock free | |
| 225 // synchronization is simplified by the fact that we do not delete | |
| 226 // entries in the symbol table during normal execution (only during | |
| 227 // safepoints). | |
| 228 | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
229 Symbol* SymbolTable::lookup(const char* name, int len, TRAPS) { |
| 0 | 230 unsigned int hashValue = hash_symbol(name, len); |
| 231 int index = the_table()->hash_to_index(hashValue); | |
| 232 | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
233 Symbol* s = the_table()->lookup(index, name, len, hashValue); |
| 0 | 234 |
| 235 // Found | |
| 236 if (s != NULL) return s; | |
| 237 | |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
238 // Grab SymbolTable_lock first. |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
239 MutexLocker ml(SymbolTable_lock, THREAD); |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
240 |
| 0 | 241 // Otherwise, add to symbol to table |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
242 return the_table()->basic_add(index, (u1*)name, len, hashValue, true, CHECK_NULL); |
| 0 | 243 } |
| 244 | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
245 Symbol* SymbolTable::lookup(const Symbol* sym, int begin, int end, TRAPS) { |
| 0 | 246 char* buffer; |
| 247 int index, len; | |
| 248 unsigned int hashValue; | |
| 249 char* name; | |
| 250 { | |
| 251 debug_only(No_Safepoint_Verifier nsv;) | |
| 252 | |
| 253 name = (char*)sym->base() + begin; | |
| 254 len = end - begin; | |
| 255 hashValue = hash_symbol(name, len); | |
| 256 index = the_table()->hash_to_index(hashValue); | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
257 Symbol* s = the_table()->lookup(index, name, len, hashValue); |
| 0 | 258 |
| 259 // Found | |
| 260 if (s != NULL) return s; | |
| 261 } | |
| 262 | |
| 263 // Otherwise, add to symbol to table. Copy to a C string first. | |
| 264 char stack_buf[128]; | |
| 265 ResourceMark rm(THREAD); | |
| 266 if (len <= 128) { | |
| 267 buffer = stack_buf; | |
| 268 } else { | |
| 269 buffer = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, len); | |
| 270 } | |
| 271 for (int i=0; i<len; i++) { | |
| 272 buffer[i] = name[i]; | |
| 273 } | |
| 274 // Make sure there is no safepoint in the code above since name can't move. | |
| 275 // We can't include the code in No_Safepoint_Verifier because of the | |
| 276 // ResourceMark. | |
| 277 | |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
278 // Grab SymbolTable_lock first. |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
279 MutexLocker ml(SymbolTable_lock, THREAD); |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
280 |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
281 return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, CHECK_NULL); |
| 0 | 282 } |
| 283 | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
284 Symbol* SymbolTable::lookup_only(const char* name, int len, |
| 0 | 285 unsigned int& hash) { |
| 286 hash = hash_symbol(name, len); | |
| 287 int index = the_table()->hash_to_index(hash); | |
| 288 | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
289 Symbol* s = the_table()->lookup(index, name, len, hash); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
290 return s; |
| 0 | 291 } |
| 292 | |
|
4800
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
293 // Look up the address of the literal in the SymbolTable for this Symbol* |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
294 // Do not create any new symbols |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
295 // Do not increment the reference count to keep this alive |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
296 Symbol** SymbolTable::lookup_symbol_addr(Symbol* sym){ |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
297 unsigned int hash = hash_symbol((char*)sym->bytes(), sym->utf8_length()); |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
298 int index = the_table()->hash_to_index(hash); |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
299 |
| 6197 | 300 for (HashtableEntry<Symbol*, mtSymbol>* e = the_table()->bucket(index); e != NULL; e = e->next()) { |
|
4800
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
301 if (e->hash() == hash) { |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
302 Symbol* literal_sym = e->literal(); |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
303 if (sym == literal_sym) { |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
304 return e->literal_addr(); |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
305 } |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
306 } |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
307 } |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
308 return NULL; |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
309 } |
|
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
310 |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
311 // Suggestion: Push unicode-based lookup all the way into the hashing |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
312 // and probing logic, so there is no need for convert_to_utf8 until |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
313 // an actual new Symbol* is created. |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
314 Symbol* SymbolTable::lookup_unicode(const jchar* name, int utf16_length, TRAPS) { |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
315 int utf8_length = UNICODE::utf8_length((jchar*) name, utf16_length); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
316 char stack_buf[128]; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
317 if (utf8_length < (int) sizeof(stack_buf)) { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
318 char* chars = stack_buf; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
319 UNICODE::convert_to_utf8(name, utf16_length, chars); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
320 return lookup(chars, utf8_length, THREAD); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
321 } else { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
322 ResourceMark rm(THREAD); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
323 char* chars = NEW_RESOURCE_ARRAY(char, utf8_length + 1);; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
324 UNICODE::convert_to_utf8(name, utf16_length, chars); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
325 return lookup(chars, utf8_length, THREAD); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
326 } |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
327 } |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
328 |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
329 Symbol* SymbolTable::lookup_only_unicode(const jchar* name, int utf16_length, |
|
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
330 unsigned int& hash) { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
331 int utf8_length = UNICODE::utf8_length((jchar*) name, utf16_length); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
332 char stack_buf[128]; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
333 if (utf8_length < (int) sizeof(stack_buf)) { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
334 char* chars = stack_buf; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
335 UNICODE::convert_to_utf8(name, utf16_length, chars); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
336 return lookup_only(chars, utf8_length, hash); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
337 } else { |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
338 ResourceMark rm; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
339 char* chars = NEW_RESOURCE_ARRAY(char, utf8_length + 1);; |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
340 UNICODE::convert_to_utf8(name, utf16_length, chars); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
341 return lookup_only(chars, utf8_length, hash); |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
342 } |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
343 } |
|
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
344 |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6201
diff
changeset
|
345 void SymbolTable::add(ClassLoaderData* loader_data, constantPoolHandle cp, |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
346 int names_count, |
| 0 | 347 const char** names, int* lengths, int* cp_indices, |
| 348 unsigned int* hashValues, TRAPS) { | |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
349 // Grab SymbolTable_lock first. |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
350 MutexLocker ml(SymbolTable_lock, THREAD); |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
351 |
| 0 | 352 SymbolTable* table = the_table(); |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6201
diff
changeset
|
353 bool added = table->basic_add(loader_data, cp, names_count, names, lengths, |
| 0 | 354 cp_indices, hashValues, CHECK); |
| 355 if (!added) { | |
| 356 // do it the hard way | |
| 357 for (int i=0; i<names_count; i++) { | |
| 358 int index = table->hash_to_index(hashValues[i]); | |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6201
diff
changeset
|
359 bool c_heap = !loader_data->is_the_null_class_loader_data(); |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
360 Symbol* sym = table->basic_add(index, (u1*)names[i], lengths[i], hashValues[i], c_heap, CHECK); |
| 0 | 361 cp->symbol_at_put(cp_indices[i], sym); |
| 362 } | |
| 363 } | |
| 364 } | |
| 365 | |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
366 Symbol* SymbolTable::new_permanent_symbol(const char* name, TRAPS) { |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
367 unsigned int hash; |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
368 Symbol* result = SymbolTable::lookup_only((char*)name, (int)strlen(name), hash); |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
369 if (result != NULL) { |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
370 return result; |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
371 } |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
372 // Grab SymbolTable_lock first. |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
373 MutexLocker ml(SymbolTable_lock, THREAD); |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
374 |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
375 SymbolTable* table = the_table(); |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
376 int index = table->hash_to_index(hash); |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
377 return table->basic_add(index, (u1*)name, (int)strlen(name), hash, false, THREAD); |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
378 } |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
379 |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
380 Symbol* SymbolTable::basic_add(int index_arg, u1 *name, int len, |
| 6162 | 381 unsigned int hashValue_arg, bool c_heap, TRAPS) { |
| 12301 | 382 assert(!Universe::heap()->is_in_reserved(name), |
| 0 | 383 "proposed name of symbol must be stable"); |
| 384 | |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
385 // Don't allow symbols to be created which cannot fit in a Symbol*. |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
386 if (len > Symbol::max_length()) { |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
387 THROW_MSG_0(vmSymbols::java_lang_InternalError(), |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
388 "name is too long to represent"); |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
389 } |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
390 |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
391 // Cannot hit a safepoint in this function because the "this" pointer can move. |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
392 No_Safepoint_Verifier nsv; |
| 0 | 393 |
| 6162 | 394 // Check if the symbol table has been rehashed, if so, need to recalculate |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
395 // the hash value and index. |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
396 unsigned int hashValue; |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
397 int index; |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
398 if (use_alternate_hashcode()) { |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
399 hashValue = hash_symbol((const char*)name, len); |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
400 index = hash_to_index(hashValue); |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
401 } else { |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
402 hashValue = hashValue_arg; |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
403 index = index_arg; |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
404 } |
| 6162 | 405 |
| 0 | 406 // Since look-up was done lock-free, we need to check if another |
| 407 // thread beat us in the race to insert the symbol. | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
408 Symbol* test = lookup(index, (char*)name, len, hashValue); |
| 0 | 409 if (test != NULL) { |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
410 // A race occurred and another thread introduced the symbol. |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
411 assert(test->refcount() != 0, "lookup should have incremented the count"); |
| 0 | 412 return test; |
| 413 } | |
| 414 | |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
415 // Create a new symbol. |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
416 Symbol* sym = allocate_symbol(name, len, c_heap, CHECK_NULL); |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
417 assert(sym->equals((char*)name, len), "symbol must be properly initialized"); |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
418 |
| 6197 | 419 HashtableEntry<Symbol*, mtSymbol>* entry = new_entry(hashValue, sym); |
| 0 | 420 add_entry(index, entry); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
421 return sym; |
| 0 | 422 } |
| 423 | |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
424 // This version of basic_add adds symbols in batch from the constant pool |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
425 // parsing. |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6201
diff
changeset
|
426 bool SymbolTable::basic_add(ClassLoaderData* loader_data, constantPoolHandle cp, |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
427 int names_count, |
| 0 | 428 const char** names, int* lengths, |
| 429 int* cp_indices, unsigned int* hashValues, | |
| 430 TRAPS) { | |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
431 |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
432 // Check symbol names are not too long. If any are too long, don't add any. |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
433 for (int i = 0; i< names_count; i++) { |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
434 if (lengths[i] > Symbol::max_length()) { |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
435 THROW_MSG_0(vmSymbols::java_lang_InternalError(), |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
436 "name is too long to represent"); |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
437 } |
| 0 | 438 } |
| 439 | |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
440 // Cannot hit a safepoint in this function because the "this" pointer can move. |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
441 No_Safepoint_Verifier nsv; |
| 0 | 442 |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
443 for (int i=0; i<names_count; i++) { |
| 6162 | 444 // Check if the symbol table has been rehashed, if so, need to recalculate |
| 445 // the hash value. | |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
446 unsigned int hashValue; |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
447 if (use_alternate_hashcode()) { |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
448 hashValue = hash_symbol(names[i], lengths[i]); |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
449 } else { |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
450 hashValue = hashValues[i]; |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
451 } |
| 0 | 452 // Since look-up was done lock-free, we need to check if another |
| 453 // thread beat us in the race to insert the symbol. | |
| 6162 | 454 int index = hash_to_index(hashValue); |
| 455 Symbol* test = lookup(index, names[i], lengths[i], hashValue); | |
| 0 | 456 if (test != NULL) { |
| 605 | 457 // A race occurred and another thread introduced the symbol, this one |
| 0 | 458 // will be dropped and collected. Use test instead. |
| 459 cp->symbol_at_put(cp_indices[i], test); | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
460 assert(test->refcount() != 0, "lookup should have incremented the count"); |
| 0 | 461 } else { |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
462 // Create a new symbol. The null class loader is never unloaded so these |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
463 // are allocated specially in a permanent arena. |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6201
diff
changeset
|
464 bool c_heap = !loader_data->is_the_null_class_loader_data(); |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
465 Symbol* sym = allocate_symbol((const u1*)names[i], lengths[i], c_heap, CHECK_(false)); |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
466 assert(sym->equals(names[i], lengths[i]), "symbol must be properly initialized"); // why wouldn't it be??? |
| 6197 | 467 HashtableEntry<Symbol*, mtSymbol>* entry = new_entry(hashValue, sym); |
| 0 | 468 add_entry(index, entry); |
| 469 cp->symbol_at_put(cp_indices[i], sym); | |
| 470 } | |
| 471 } | |
| 472 return true; | |
| 473 } | |
| 474 | |
| 475 | |
| 476 void SymbolTable::verify() { | |
| 477 for (int i = 0; i < the_table()->table_size(); ++i) { | |
| 6197 | 478 HashtableEntry<Symbol*, mtSymbol>* p = the_table()->bucket(i); |
| 0 | 479 for ( ; p != NULL; p = p->next()) { |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
480 Symbol* s = (Symbol*)(p->literal()); |
| 0 | 481 guarantee(s != NULL, "symbol is NULL"); |
| 482 unsigned int h = hash_symbol((char*)s->bytes(), s->utf8_length()); | |
| 483 guarantee(p->hash() == h, "broken hash in symbol table entry"); | |
| 484 guarantee(the_table()->hash_to_index(h) == i, | |
| 485 "wrong index in symbol table"); | |
| 486 } | |
| 487 } | |
| 488 } | |
| 489 | |
| 6162 | 490 void SymbolTable::dump(outputStream* st) { |
|
10312
a5d6f0c3585f
8014262: PrintStringTableStatistics should include more footprint info
iklam
parents:
10155
diff
changeset
|
491 the_table()->dump_table(st, "SymbolTable"); |
| 6162 | 492 } |
| 493 | |
| 0 | 494 |
| 495 //--------------------------------------------------------------------------- | |
| 496 // Non-product code | |
| 497 | |
| 498 #ifndef PRODUCT | |
| 499 | |
| 500 void SymbolTable::print_histogram() { | |
| 501 MutexLocker ml(SymbolTable_lock); | |
| 502 const int results_length = 100; | |
| 503 int results[results_length]; | |
| 504 int i,j; | |
| 505 | |
| 506 // initialize results to zero | |
| 507 for (j = 0; j < results_length; j++) { | |
| 508 results[j] = 0; | |
| 509 } | |
| 510 | |
| 511 int total = 0; | |
| 512 int max_symbols = 0; | |
| 513 int out_of_range = 0; | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
514 int memory_total = 0; |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
515 int count = 0; |
| 0 | 516 for (i = 0; i < the_table()->table_size(); i++) { |
| 6197 | 517 HashtableEntry<Symbol*, mtSymbol>* p = the_table()->bucket(i); |
| 0 | 518 for ( ; p != NULL; p = p->next()) { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6201
diff
changeset
|
519 memory_total += p->literal()->size(); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
520 count++; |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
521 int counter = p->literal()->utf8_length(); |
| 0 | 522 total += counter; |
| 523 if (counter < results_length) { | |
| 524 results[counter]++; | |
| 525 } else { | |
| 526 out_of_range++; | |
| 527 } | |
| 528 max_symbols = MAX2(max_symbols, counter); | |
| 529 } | |
| 530 } | |
| 531 tty->print_cr("Symbol Table:"); | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
532 tty->print_cr("Total number of symbols %5d", count); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
533 tty->print_cr("Total size in memory %5dK", |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
534 (memory_total*HeapWordSize)/1024); |
|
17634
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
535 tty->print_cr("Total counted %5d", _symbols_counted); |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
536 tty->print_cr("Total removed %5d", _symbols_removed); |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
537 if (_symbols_counted > 0) { |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
538 tty->print_cr("Percent removed %3.2f", |
|
17634
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
539 ((float)_symbols_removed/(float)_symbols_counted)* 100); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
540 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
541 tty->print_cr("Reference counts %5d", Symbol::_total_count); |
|
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
542 tty->print_cr("Symbol arena size %5d used %5d", |
|
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
543 arena()->size_in_bytes(), arena()->used()); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
544 tty->print_cr("Histogram of symbol length:"); |
| 0 | 545 tty->print_cr("%8s %5d", "Total ", total); |
| 546 tty->print_cr("%8s %5d", "Maximum", max_symbols); | |
| 547 tty->print_cr("%8s %3.2f", "Average", | |
| 548 ((float) total / (float) the_table()->table_size())); | |
| 549 tty->print_cr("%s", "Histogram:"); | |
| 550 tty->print_cr(" %s %29s", "Length", "Number chains that length"); | |
| 551 for (i = 0; i < results_length; i++) { | |
| 552 if (results[i] > 0) { | |
| 553 tty->print_cr("%6d %10d", i, results[i]); | |
| 554 } | |
| 555 } | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
556 if (Verbose) { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
557 int line_length = 70; |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
558 tty->print_cr("%s %30s", " Length", "Number chains that length"); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
559 for (i = 0; i < results_length; i++) { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
560 if (results[i] > 0) { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
561 tty->print("%4d", i); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
562 for (j = 0; (j < results[i]) && (j < line_length); j++) { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
563 tty->print("%1s", "*"); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
564 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
565 if (j == line_length) { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
566 tty->print("%1s", "+"); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
567 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
568 tty->cr(); |
| 0 | 569 } |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
570 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
571 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
572 tty->print_cr(" %s %d: %d\n", "Number chains longer than", |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
573 results_length, out_of_range); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
574 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
575 |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
576 void SymbolTable::print() { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
577 for (int i = 0; i < the_table()->table_size(); ++i) { |
| 6197 | 578 HashtableEntry<Symbol*, mtSymbol>** p = the_table()->bucket_addr(i); |
| 579 HashtableEntry<Symbol*, mtSymbol>* entry = the_table()->bucket(i); | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
580 if (entry != NULL) { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
581 while (entry != NULL) { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
582 tty->print(PTR_FORMAT " ", entry->literal()); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
583 entry->literal()->print(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
584 tty->print(" %d", entry->literal()->refcount()); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
585 p = entry->next_addr(); |
| 6197 | 586 entry = (HashtableEntry<Symbol*, mtSymbol>*)HashtableEntry<Symbol*, mtSymbol>::make_ptr(*p); |
| 0 | 587 } |
| 588 tty->cr(); | |
| 589 } | |
| 590 } | |
| 591 } | |
| 592 #endif // PRODUCT | |
| 593 | |
| 594 // -------------------------------------------------------------------------- | |
| 595 | |
| 596 #ifdef ASSERT | |
| 597 class StableMemoryChecker : public StackObj { | |
| 598 enum { _bufsize = wordSize*4 }; | |
| 599 | |
| 600 address _region; | |
| 601 jint _size; | |
| 602 u1 _save_buf[_bufsize]; | |
| 603 | |
| 604 int sample(u1* save_buf) { | |
| 605 if (_size <= _bufsize) { | |
| 606 memcpy(save_buf, _region, _size); | |
| 607 return _size; | |
| 608 } else { | |
| 609 // copy head and tail | |
| 610 memcpy(&save_buf[0], _region, _bufsize/2); | |
| 611 memcpy(&save_buf[_bufsize/2], _region + _size - _bufsize/2, _bufsize/2); | |
| 612 return (_bufsize/2)*2; | |
| 613 } | |
| 614 } | |
| 615 | |
| 616 public: | |
| 617 StableMemoryChecker(const void* region, jint size) { | |
| 618 _region = (address) region; | |
| 619 _size = size; | |
| 620 sample(_save_buf); | |
| 621 } | |
| 622 | |
| 623 bool verify() { | |
| 624 u1 check_buf[sizeof(_save_buf)]; | |
| 625 int check_size = sample(check_buf); | |
| 626 return (0 == memcmp(_save_buf, check_buf, check_size)); | |
| 627 } | |
| 628 | |
| 629 void set_region(const void* region) { _region = (address) region; } | |
| 630 }; | |
| 631 #endif | |
| 632 | |
| 633 | |
| 634 // -------------------------------------------------------------------------- | |
| 635 StringTable* StringTable::_the_table = NULL; | |
| 636 | |
| 6162 | 637 bool StringTable::_needs_rehashing = false; |
| 638 | |
|
10991
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
639 volatile int StringTable::_parallel_claimed_idx = 0; |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
640 |
| 6162 | 641 // Pick hashing algorithm |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
642 unsigned int StringTable::hash_string(const jchar* s, int len) { |
| 6162 | 643 return use_alternate_hashcode() ? AltHashing::murmur3_32(seed(), s, len) : |
|
7399
2aa953165ade
8004661: Comment and function name java_lang_String::toHash is wrong
brutisso
parents:
6725
diff
changeset
|
644 java_lang_String::hash_code(s, len); |
| 6162 | 645 } |
| 646 | |
| 0 | 647 oop StringTable::lookup(int index, jchar* name, |
| 648 int len, unsigned int hash) { | |
| 6162 | 649 int count = 0; |
| 6197 | 650 for (HashtableEntry<oop, mtSymbol>* l = bucket(index); l != NULL; l = l->next()) { |
| 6162 | 651 count++; |
| 0 | 652 if (l->hash() == hash) { |
| 653 if (java_lang_String::equals(l->literal(), name, len)) { | |
| 654 return l->literal(); | |
| 655 } | |
| 656 } | |
| 657 } | |
| 6162 | 658 // If the bucket size is too deep check if this hash code is insufficient. |
|
20493
152cf4afc11f
8056084: Refactor Hashtable to allow implementations without rehashing support
mgerdin
parents:
20360
diff
changeset
|
659 if (count >= rehash_count && !needs_rehashing()) { |
| 6162 | 660 _needs_rehashing = check_rehash_table(count); |
| 661 } | |
| 0 | 662 return NULL; |
| 663 } | |
| 664 | |
| 665 | |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
666 oop StringTable::basic_add(int index_arg, Handle string, jchar* name, |
| 6162 | 667 int len, unsigned int hashValue_arg, TRAPS) { |
| 0 | 668 |
| 669 assert(java_lang_String::equals(string(), name, len), | |
| 670 "string must be properly initialized"); | |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
671 // Cannot hit a safepoint in this function because the "this" pointer can move. |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
672 No_Safepoint_Verifier nsv; |
| 0 | 673 |
| 6162 | 674 // Check if the symbol table has been rehashed, if so, need to recalculate |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
675 // the hash value and index before second lookup. |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
676 unsigned int hashValue; |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
677 int index; |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
678 if (use_alternate_hashcode()) { |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
679 hashValue = hash_string(name, len); |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
680 index = hash_to_index(hashValue); |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
681 } else { |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
682 hashValue = hashValue_arg; |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
683 index = index_arg; |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
684 } |
| 6162 | 685 |
| 0 | 686 // Since look-up was done lock-free, we need to check if another |
| 687 // thread beat us in the race to insert the symbol. | |
| 688 | |
| 689 oop test = lookup(index, name, len, hashValue); // calls lookup(u1*, int) | |
| 690 if (test != NULL) { | |
| 691 // Entry already added | |
| 692 return test; | |
| 693 } | |
| 694 | |
| 6197 | 695 HashtableEntry<oop, mtSymbol>* entry = new_entry(hashValue, string()); |
| 0 | 696 add_entry(index, entry); |
| 697 return string(); | |
| 698 } | |
| 699 | |
| 700 | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
701 oop StringTable::lookup(Symbol* symbol) { |
| 0 | 702 ResourceMark rm; |
| 703 int length; | |
| 704 jchar* chars = symbol->as_unicode(length); | |
| 8850 | 705 return lookup(chars, length); |
| 706 } | |
| 707 | |
|
20278
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
708 // Tell the GC that this string was looked up in the StringTable. |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
709 static void ensure_string_alive(oop string) { |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
710 // A lookup in the StringTable could return an object that was previously |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
711 // considered dead. The SATB part of G1 needs to get notified about this |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
712 // potential resurrection, otherwise the marking might not find the object. |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
713 #if INCLUDE_ALL_GCS |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
714 if (UseG1GC && string != NULL) { |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
715 G1SATBCardTableModRefBS::enqueue(string); |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
716 } |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
717 #endif |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
718 } |
| 8850 | 719 |
| 720 oop StringTable::lookup(jchar* name, int len) { | |
| 721 unsigned int hash = hash_string(name, len); | |
| 722 int index = the_table()->hash_to_index(hash); | |
|
20278
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
723 oop string = the_table()->lookup(index, name, len, hash); |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
724 |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
725 ensure_string_alive(string); |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
726 |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
727 return string; |
| 0 | 728 } |
| 729 | |
| 730 | |
| 731 oop StringTable::intern(Handle string_or_null, jchar* name, | |
| 732 int len, TRAPS) { | |
| 6162 | 733 unsigned int hashValue = hash_string(name, len); |
| 0 | 734 int index = the_table()->hash_to_index(hashValue); |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
735 oop found_string = the_table()->lookup(index, name, len, hashValue); |
| 0 | 736 |
| 737 // Found | |
|
20278
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
738 if (found_string != NULL) { |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
739 ensure_string_alive(found_string); |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
740 return found_string; |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
741 } |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
742 |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
743 debug_only(StableMemoryChecker smc(name, len * sizeof(name[0]))); |
| 12301 | 744 assert(!Universe::heap()->is_in_reserved(name), |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
745 "proposed name of symbol must be stable"); |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
746 |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
747 Handle string; |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
748 // try to reuse the string if possible |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6201
diff
changeset
|
749 if (!string_or_null.is_null()) { |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
750 string = string_or_null; |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
751 } else { |
|
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6201
diff
changeset
|
752 string = java_lang_String::create_from_unicode(name, len, CHECK_NULL); |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
753 } |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
754 |
| 17764 | 755 #if INCLUDE_ALL_GCS |
| 756 if (G1StringDedup::is_enabled()) { | |
| 757 // Deduplicate the string before it is interned. Note that we should never | |
| 758 // deduplicate a string after it has been interned. Doing so will counteract | |
| 759 // compiler optimizations done on e.g. interned string literals. | |
| 760 G1StringDedup::deduplicate(string()); | |
| 761 } | |
| 762 #endif | |
| 763 | |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
764 // Grab the StringTable_lock before getting the_table() because it could |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
765 // change at safepoint. |
|
20278
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
766 oop added_or_found; |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
767 { |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
768 MutexLocker ml(StringTable_lock, THREAD); |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
769 // Otherwise, add to symbol to table |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
770 added_or_found = the_table()->basic_add(index, string, name, len, |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
771 hashValue, CHECK_NULL); |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
772 } |
| 0 | 773 |
|
20278
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
774 ensure_string_alive(added_or_found); |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
775 |
|
2c6ef90f030a
8049421: G1 Class Unloading after completing a concurrent mark cycle
stefank
parents:
17937
diff
changeset
|
776 return added_or_found; |
| 0 | 777 } |
| 778 | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
779 oop StringTable::intern(Symbol* symbol, TRAPS) { |
| 0 | 780 if (symbol == NULL) return NULL; |
| 781 ResourceMark rm(THREAD); | |
| 782 int length; | |
| 783 jchar* chars = symbol->as_unicode(length); | |
| 784 Handle string; | |
| 785 oop result = intern(string, chars, length, CHECK_NULL); | |
| 786 return result; | |
| 787 } | |
| 788 | |
| 789 | |
| 790 oop StringTable::intern(oop string, TRAPS) | |
| 791 { | |
| 792 if (string == NULL) return NULL; | |
| 793 ResourceMark rm(THREAD); | |
| 794 int length; | |
| 795 Handle h_string (THREAD, string); | |
|
10155
f258c5828eb8
8011773: Some tests on Interned String crashed JVM with OOM
hseigel
parents:
8850
diff
changeset
|
796 jchar* chars = java_lang_String::as_unicode_string(string, length, CHECK_NULL); |
| 0 | 797 oop result = intern(h_string, chars, length, CHECK_NULL); |
| 798 return result; | |
| 799 } | |
| 800 | |
| 801 | |
| 802 oop StringTable::intern(const char* utf8_string, TRAPS) { | |
| 803 if (utf8_string == NULL) return NULL; | |
| 804 ResourceMark rm(THREAD); | |
| 805 int length = UTF8::unicode_length(utf8_string); | |
| 806 jchar* chars = NEW_RESOURCE_ARRAY(jchar, length); | |
| 807 UTF8::convert_to_unicode(utf8_string, chars, length); | |
| 808 Handle string; | |
| 809 oop result = intern(string, chars, length, CHECK_NULL); | |
| 810 return result; | |
| 811 } | |
| 812 | |
|
17634
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
813 void StringTable::unlink_or_oops_do(BoolObjectClosure* is_alive, OopClosure* f, int* processed, int* removed) { |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
814 buckets_unlink_or_oops_do(is_alive, f, 0, the_table()->table_size(), processed, removed); |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
815 } |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
816 |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
817 void StringTable::possibly_parallel_unlink_or_oops_do(BoolObjectClosure* is_alive, OopClosure* f, int* processed, int* removed) { |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
818 // Readers of the table are unlocked, so we should only be removing |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
819 // entries at a safepoint. |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
820 assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint"); |
|
17634
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
821 const int limit = the_table()->table_size(); |
|
10362
95c00927be11
8015428: Remove unused CDS support from StringTable
stefank
parents:
10312
diff
changeset
|
822 |
|
17634
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
823 for (;;) { |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
824 // Grab next set of buckets to scan |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
825 int start_idx = Atomic::add(ClaimChunkSize, &_parallel_claimed_idx) - ClaimChunkSize; |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
826 if (start_idx >= limit) { |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
827 // End of table |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
828 break; |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
829 } |
|
17634
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
830 |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
831 int end_idx = MIN2(limit, start_idx + ClaimChunkSize); |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
832 buckets_unlink_or_oops_do(is_alive, f, start_idx, end_idx, processed, removed); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
833 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
834 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
835 |
|
17634
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
836 void StringTable::buckets_oops_do(OopClosure* f, int start_idx, int end_idx) { |
|
10991
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
837 const int limit = the_table()->table_size(); |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
838 |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
839 assert(0 <= start_idx && start_idx <= limit, |
|
17634
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
840 err_msg("start_idx (" INT32_FORMAT ") is out of bounds", start_idx)); |
|
10991
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
841 assert(0 <= end_idx && end_idx <= limit, |
|
17634
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
842 err_msg("end_idx (" INT32_FORMAT ") is out of bounds", end_idx)); |
|
10991
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
843 assert(start_idx <= end_idx, |
|
17634
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
844 err_msg("Index ordering: start_idx=" INT32_FORMAT", end_idx=" INT32_FORMAT, |
|
10991
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
845 start_idx, end_idx)); |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
846 |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
847 for (int i = start_idx; i < end_idx; i += 1) { |
| 6197 | 848 HashtableEntry<oop, mtSymbol>* entry = the_table()->bucket(i); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
849 while (entry != NULL) { |
|
10362
95c00927be11
8015428: Remove unused CDS support from StringTable
stefank
parents:
10312
diff
changeset
|
850 assert(!entry->is_shared(), "CDS not used for the StringTable"); |
|
95c00927be11
8015428: Remove unused CDS support from StringTable
stefank
parents:
10312
diff
changeset
|
851 |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
852 f->do_oop((oop*)entry->literal_addr()); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
853 |
|
10362
95c00927be11
8015428: Remove unused CDS support from StringTable
stefank
parents:
10312
diff
changeset
|
854 entry = entry->next(); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
855 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
856 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
857 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
858 |
|
17634
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
859 void StringTable::buckets_unlink_or_oops_do(BoolObjectClosure* is_alive, OopClosure* f, int start_idx, int end_idx, int* processed, int* removed) { |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
860 const int limit = the_table()->table_size(); |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
861 |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
862 assert(0 <= start_idx && start_idx <= limit, |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
863 err_msg("start_idx (" INT32_FORMAT ") is out of bounds", start_idx)); |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
864 assert(0 <= end_idx && end_idx <= limit, |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
865 err_msg("end_idx (" INT32_FORMAT ") is out of bounds", end_idx)); |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
866 assert(start_idx <= end_idx, |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
867 err_msg("Index ordering: start_idx=" INT32_FORMAT", end_idx=" INT32_FORMAT, |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
868 start_idx, end_idx)); |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
869 |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
870 for (int i = start_idx; i < end_idx; ++i) { |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
871 HashtableEntry<oop, mtSymbol>** p = the_table()->bucket_addr(i); |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
872 HashtableEntry<oop, mtSymbol>* entry = the_table()->bucket(i); |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
873 while (entry != NULL) { |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
874 assert(!entry->is_shared(), "CDS not used for the StringTable"); |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
875 |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
876 if (is_alive->do_object_b(entry->literal())) { |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
877 if (f != NULL) { |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
878 f->do_oop((oop*)entry->literal_addr()); |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
879 } |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
880 p = entry->next_addr(); |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
881 } else { |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
882 *p = entry->next(); |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
883 the_table()->free_entry(entry); |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
884 (*removed)++; |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
885 } |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
886 (*processed)++; |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
887 entry = *p; |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
888 } |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
889 } |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
890 } |
|
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
891 |
|
10991
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
892 void StringTable::oops_do(OopClosure* f) { |
|
17634
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
893 buckets_oops_do(f, 0, the_table()->table_size()); |
|
10991
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
894 } |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
895 |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
896 void StringTable::possibly_parallel_oops_do(OopClosure* f) { |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
897 const int limit = the_table()->table_size(); |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
898 |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
899 for (;;) { |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
900 // Grab next set of buckets to scan |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
901 int start_idx = Atomic::add(ClaimChunkSize, &_parallel_claimed_idx) - ClaimChunkSize; |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
902 if (start_idx >= limit) { |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
903 // End of table |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
904 break; |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
905 } |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
906 |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
907 int end_idx = MIN2(limit, start_idx + ClaimChunkSize); |
|
17634
5a32d2a3cc1e
8027476: Improve performance of Stringtable unlink
tschatzl
parents:
12317
diff
changeset
|
908 buckets_oops_do(f, start_idx, end_idx); |
|
10991
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
909 } |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
910 } |
|
01522ca68fc7
8015237: Parallelize string table scanning during strong root processing
johnc
parents:
10363
diff
changeset
|
911 |
|
12275
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
912 // This verification is part of Universe::verify() and needs to be quick. |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
913 // See StringTable::verify_and_compare() below for exhaustive verification. |
| 0 | 914 void StringTable::verify() { |
| 915 for (int i = 0; i < the_table()->table_size(); ++i) { | |
| 6197 | 916 HashtableEntry<oop, mtSymbol>* p = the_table()->bucket(i); |
| 0 | 917 for ( ; p != NULL; p = p->next()) { |
| 918 oop s = p->literal(); | |
| 919 guarantee(s != NULL, "interned string is NULL"); | |
|
2418
352622fd140a
7032129: Native memory usage grow unexpectedly for vm/oom/*InternedString tests
never
parents:
2379
diff
changeset
|
920 unsigned int h = java_lang_String::hash_string(s); |
| 0 | 921 guarantee(p->hash() == h, "broken hash in string table entry"); |
| 922 guarantee(the_table()->hash_to_index(h) == i, | |
| 923 "wrong index in string table"); | |
| 924 } | |
| 925 } | |
| 926 } | |
| 6162 | 927 |
| 928 void StringTable::dump(outputStream* st) { | |
|
10312
a5d6f0c3585f
8014262: PrintStringTableStatistics should include more footprint info
iklam
parents:
10155
diff
changeset
|
929 the_table()->dump_table(st, "StringTable"); |
| 6162 | 930 } |
| 931 | |
|
12275
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
932 StringTable::VerifyRetTypes StringTable::compare_entries( |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
933 int bkt1, int e_cnt1, |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
934 HashtableEntry<oop, mtSymbol>* e_ptr1, |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
935 int bkt2, int e_cnt2, |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
936 HashtableEntry<oop, mtSymbol>* e_ptr2) { |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
937 // These entries are sanity checked by verify_and_compare_entries() |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
938 // before this function is called. |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
939 oop str1 = e_ptr1->literal(); |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
940 oop str2 = e_ptr2->literal(); |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
941 |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
942 if (str1 == str2) { |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
943 tty->print_cr("ERROR: identical oop values (0x" PTR_FORMAT ") " |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
944 "in entry @ bucket[%d][%d] and entry @ bucket[%d][%d]", |
|
12316
190899198332
7195622: CheckUnhandledOops has limited usefulness now
hseigel
parents:
12275
diff
changeset
|
945 (void *)str1, bkt1, e_cnt1, bkt2, e_cnt2); |
|
12275
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
946 return _verify_fail_continue; |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
947 } |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
948 |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
949 if (java_lang_String::equals(str1, str2)) { |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
950 tty->print_cr("ERROR: identical String values in entry @ " |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
951 "bucket[%d][%d] and entry @ bucket[%d][%d]", |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
952 bkt1, e_cnt1, bkt2, e_cnt2); |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
953 return _verify_fail_continue; |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
954 } |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
955 |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
956 return _verify_pass; |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
957 } |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
958 |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
959 StringTable::VerifyRetTypes StringTable::verify_entry(int bkt, int e_cnt, |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
960 HashtableEntry<oop, mtSymbol>* e_ptr, |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
961 StringTable::VerifyMesgModes mesg_mode) { |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
962 |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
963 VerifyRetTypes ret = _verify_pass; // be optimistic |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
964 |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
965 oop str = e_ptr->literal(); |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
966 if (str == NULL) { |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
967 if (mesg_mode == _verify_with_mesgs) { |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
968 tty->print_cr("ERROR: NULL oop value in entry @ bucket[%d][%d]", bkt, |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
969 e_cnt); |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
970 } |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
971 // NULL oop means no more verifications are possible |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
972 return _verify_fail_done; |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
973 } |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
974 |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
975 if (str->klass() != SystemDictionary::String_klass()) { |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
976 if (mesg_mode == _verify_with_mesgs) { |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
977 tty->print_cr("ERROR: oop is not a String in entry @ bucket[%d][%d]", |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
978 bkt, e_cnt); |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
979 } |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
980 // not a String means no more verifications are possible |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
981 return _verify_fail_done; |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
982 } |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
983 |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
984 unsigned int h = java_lang_String::hash_string(str); |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
985 if (e_ptr->hash() != h) { |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
986 if (mesg_mode == _verify_with_mesgs) { |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
987 tty->print_cr("ERROR: broken hash value in entry @ bucket[%d][%d], " |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
988 "bkt_hash=%d, str_hash=%d", bkt, e_cnt, e_ptr->hash(), h); |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
989 } |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
990 ret = _verify_fail_continue; |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
991 } |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
992 |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
993 if (the_table()->hash_to_index(h) != bkt) { |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
994 if (mesg_mode == _verify_with_mesgs) { |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
995 tty->print_cr("ERROR: wrong index value for entry @ bucket[%d][%d], " |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
996 "str_hash=%d, hash_to_index=%d", bkt, e_cnt, h, |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
997 the_table()->hash_to_index(h)); |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
998 } |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
999 ret = _verify_fail_continue; |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1000 } |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1001 |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1002 return ret; |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1003 } |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1004 |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1005 // See StringTable::verify() above for the quick verification that is |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1006 // part of Universe::verify(). This verification is exhaustive and |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1007 // reports on every issue that is found. StringTable::verify() only |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1008 // reports on the first issue that is found. |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1009 // |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1010 // StringTable::verify_entry() checks: |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1011 // - oop value != NULL (same as verify()) |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1012 // - oop value is a String |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1013 // - hash(String) == hash in entry (same as verify()) |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1014 // - index for hash == index of entry (same as verify()) |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1015 // |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1016 // StringTable::compare_entries() checks: |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1017 // - oops are unique across all entries |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1018 // - String values are unique across all entries |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1019 // |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1020 int StringTable::verify_and_compare_entries() { |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1021 assert(StringTable_lock->is_locked(), "sanity check"); |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1022 |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1023 int fail_cnt = 0; |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1024 |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1025 // first, verify all the entries individually: |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1026 for (int bkt = 0; bkt < the_table()->table_size(); bkt++) { |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1027 HashtableEntry<oop, mtSymbol>* e_ptr = the_table()->bucket(bkt); |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1028 for (int e_cnt = 0; e_ptr != NULL; e_ptr = e_ptr->next(), e_cnt++) { |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1029 VerifyRetTypes ret = verify_entry(bkt, e_cnt, e_ptr, _verify_with_mesgs); |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1030 if (ret != _verify_pass) { |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1031 fail_cnt++; |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1032 } |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1033 } |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1034 } |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1035 |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1036 // Optimization: if the above check did not find any failures, then |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1037 // the comparison loop below does not need to call verify_entry() |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1038 // before calling compare_entries(). If there were failures, then we |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1039 // have to call verify_entry() to see if the entry can be passed to |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1040 // compare_entries() safely. When we call verify_entry() in the loop |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1041 // below, we do so quietly to void duplicate messages and we don't |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1042 // increment fail_cnt because the failures have already been counted. |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1043 bool need_entry_verify = (fail_cnt != 0); |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1044 |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1045 // second, verify all entries relative to each other: |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1046 for (int bkt1 = 0; bkt1 < the_table()->table_size(); bkt1++) { |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1047 HashtableEntry<oop, mtSymbol>* e_ptr1 = the_table()->bucket(bkt1); |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1048 for (int e_cnt1 = 0; e_ptr1 != NULL; e_ptr1 = e_ptr1->next(), e_cnt1++) { |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1049 if (need_entry_verify) { |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1050 VerifyRetTypes ret = verify_entry(bkt1, e_cnt1, e_ptr1, |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1051 _verify_quietly); |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1052 if (ret == _verify_fail_done) { |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1053 // cannot use the current entry to compare against other entries |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1054 continue; |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1055 } |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1056 } |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1057 |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1058 for (int bkt2 = bkt1; bkt2 < the_table()->table_size(); bkt2++) { |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1059 HashtableEntry<oop, mtSymbol>* e_ptr2 = the_table()->bucket(bkt2); |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1060 int e_cnt2; |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1061 for (e_cnt2 = 0; e_ptr2 != NULL; e_ptr2 = e_ptr2->next(), e_cnt2++) { |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1062 if (bkt1 == bkt2 && e_cnt2 <= e_cnt1) { |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1063 // skip the entries up to and including the one that |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1064 // we're comparing against |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1065 continue; |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1066 } |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1067 |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1068 if (need_entry_verify) { |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1069 VerifyRetTypes ret = verify_entry(bkt2, e_cnt2, e_ptr2, |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1070 _verify_quietly); |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1071 if (ret == _verify_fail_done) { |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1072 // cannot compare against this entry |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1073 continue; |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1074 } |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1075 } |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1076 |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1077 // compare two entries, report and count any failures: |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1078 if (compare_entries(bkt1, e_cnt1, e_ptr1, bkt2, e_cnt2, e_ptr2) |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1079 != _verify_pass) { |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1080 fail_cnt++; |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1081 } |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1082 } |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1083 } |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1084 } |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1085 } |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1086 return fail_cnt; |
|
63147986a428
8019835: Strings interned in different threads equal but does not ==
dcubed
parents:
10991
diff
changeset
|
1087 } |
| 6162 | 1088 |
| 1089 // Create a new table and using alternate hash code, populate the new table | |
| 1090 // with the existing strings. Set flag to use the alternate hash code afterwards. | |
| 1091 void StringTable::rehash_table() { | |
| 1092 assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint"); | |
|
6172
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
1093 // This should never happen with -Xshare:dump but it might in testing mode. |
|
246d977b51f2
7178670: runtime/7158800/BadUtf8.java fails in SymbolTable::rehash_table
coleenp
parents:
6162
diff
changeset
|
1094 if (DumpSharedSpaces) return; |
| 6162 | 1095 StringTable* new_table = new StringTable(); |
| 1096 | |
| 1097 // Rehash the table | |
| 1098 the_table()->move_to(new_table); | |
| 1099 | |
| 1100 // Delete the table and buckets (entries are reused in new table). | |
| 1101 delete _the_table; | |
| 1102 // Don't check if we need rehashing until the table gets unbalanced again. | |
| 1103 // Then rehash with a new global seed. | |
| 1104 _needs_rehashing = false; | |
| 1105 _the_table = new_table; | |
| 1106 } |