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