Mercurial > hg > graal-compiler
annotate src/share/vm/classfile/symbolTable.cpp @ 6213:8150fa46d2ed
7178145: Change constMethodOop::_exception_table to optionally inlined u2 table.
Summary: Change constMethodOop::_exception_table to optionally inlined u2 table.
Reviewed-by: bdelsart, coleenp, kamg
author | jiangli |
---|---|
date | Tue, 26 Jun 2012 19:08:44 -0400 |
parents | fc9d8850ab8b |
children | e9140bf80b4a |
rev | line source |
---|---|
0 | 1 /* |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
2 * Copyright (c) 1997, 2012, 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" |
26 #include "classfile/javaClasses.hpp" | |
27 #include "classfile/symbolTable.hpp" | |
28 #include "classfile/systemDictionary.hpp" | |
29 #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
|
30 #include "memory/allocation.inline.hpp" |
1972 | 31 #include "memory/filemap.hpp" |
32 #include "memory/gcLocker.inline.hpp" | |
33 #include "oops/oop.inline.hpp" | |
34 #include "oops/oop.inline2.hpp" | |
35 #include "runtime/mutexLocker.hpp" | |
36 #include "utilities/hashtable.inline.hpp" | |
0 | 37 |
38 // -------------------------------------------------------------------------- | |
39 | |
40 SymbolTable* SymbolTable::_the_table = NULL; | |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
41 // 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
|
42 Arena* SymbolTable::_arena = NULL; |
0 | 43 |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
44 Symbol* SymbolTable::allocate_symbol(const u1* name, int len, bool c_heap, TRAPS) { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
45 // Don't allow symbols to be created which cannot fit in a Symbol*. |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
46 if (len > Symbol::max_length()) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
47 THROW_MSG_0(vmSymbols::java_lang_InternalError(), |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
48 "name is too long to represent"); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
49 } |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
50 Symbol* sym; |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
51 // Allocate symbols in the C heap when dumping shared spaces in case there |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
52 // are temporary symbols we can remove. |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
53 if (c_heap || DumpSharedSpaces) { |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
54 // refcount starts as 1 |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
55 sym = new (len, THREAD) Symbol(name, len, 1); |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
56 } else { |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
57 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
|
58 } |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
59 assert(sym != NULL, "new should call vm_exit_out_of_memory if C_HEAP is exhausted"); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
60 return sym; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
61 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
62 |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
63 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
|
64 // 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
|
65 if (arena_alloc_size == 0) { |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
66 _arena = new Arena(); |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
67 } else { |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
68 _arena = new Arena(arena_alloc_size); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
69 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
70 } |
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 // 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
|
73 void SymbolTable::symbols_do(SymbolClosure *cl) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
74 const int n = the_table()->table_size(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
75 for (int i = 0; i < n; i++) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
76 for (HashtableEntry<Symbol*>* p = the_table()->bucket(i); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
77 p != NULL; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
78 p = p->next()) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
79 cl->do_symbol(p->literal_addr()); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
80 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
81 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
82 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
83 |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
84 int SymbolTable::symbols_removed = 0; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
85 int SymbolTable::symbols_counted = 0; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
86 |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
87 // Remove unreferenced symbols from the symbol table |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
88 // This is done late during GC. |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
89 void SymbolTable::unlink() { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
90 int removed = 0; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
91 int total = 0; |
2336
df1347358fe6
7024584: Symbol printouts shouldnt be under PrintGCDetails
coleenp
parents:
2177
diff
changeset
|
92 size_t memory_total = 0; |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
93 for (int i = 0; i < the_table()->table_size(); ++i) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
94 for (HashtableEntry<Symbol*>** p = the_table()->bucket_addr(i); *p != NULL; ) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
95 HashtableEntry<Symbol*>* entry = *p; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
96 if (entry->is_shared()) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
97 break; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
98 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
99 Symbol* s = entry->literal(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
100 memory_total += s->object_size(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
101 total++; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
102 assert(s != NULL, "just checking"); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
103 // If reference count is zero, remove. |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
104 if (s->refcount() == 0) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
105 delete s; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
106 removed++; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
107 *p = entry->next(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
108 the_table()->free_entry(entry); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
109 } else { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
110 p = entry->next_addr(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
111 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
112 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
113 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
114 symbols_removed += removed; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
115 symbols_counted += total; |
2336
df1347358fe6
7024584: Symbol printouts shouldnt be under PrintGCDetails
coleenp
parents:
2177
diff
changeset
|
116 // Exclude printing for normal PrintGCDetails because people parse |
df1347358fe6
7024584: Symbol printouts shouldnt be under PrintGCDetails
coleenp
parents:
2177
diff
changeset
|
117 // this output. |
df1347358fe6
7024584: Symbol printouts shouldnt be under PrintGCDetails
coleenp
parents:
2177
diff
changeset
|
118 if (PrintGCDetails && Verbose && WizardMode) { |
df1347358fe6
7024584: Symbol printouts shouldnt be under PrintGCDetails
coleenp
parents:
2177
diff
changeset
|
119 gclog_or_tty->print(" [Symbols=%d size=" SIZE_FORMAT "K] ", total, |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
120 (memory_total*HeapWordSize)/1024); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
121 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
122 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
123 |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
124 |
0 | 125 // Lookup a symbol in a bucket. |
126 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
127 Symbol* SymbolTable::lookup(int index, const char* name, |
0 | 128 int len, unsigned int hash) { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
129 for (HashtableEntry<Symbol*>* e = bucket(index); e != NULL; e = e->next()) { |
0 | 130 if (e->hash() == hash) { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
131 Symbol* sym = e->literal(); |
0 | 132 if (sym->equals(name, len)) { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
133 // something is referencing this symbol now. |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
134 sym->increment_refcount(); |
0 | 135 return sym; |
136 } | |
137 } | |
138 } | |
139 return NULL; | |
140 } | |
141 | |
142 | |
143 // We take care not to be blocking while holding the | |
144 // SymbolTable_lock. Otherwise, the system might deadlock, since the | |
145 // symboltable is used during compilation (VM_thread) The lock free | |
146 // synchronization is simplified by the fact that we do not delete | |
147 // entries in the symbol table during normal execution (only during | |
148 // safepoints). | |
149 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
150 Symbol* SymbolTable::lookup(const char* name, int len, TRAPS) { |
0 | 151 unsigned int hashValue = hash_symbol(name, len); |
152 int index = the_table()->hash_to_index(hashValue); | |
153 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
154 Symbol* s = the_table()->lookup(index, name, len, hashValue); |
0 | 155 |
156 // Found | |
157 if (s != NULL) return s; | |
158 | |
159 // 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
|
160 return the_table()->basic_add(index, (u1*)name, len, hashValue, true, CHECK_NULL); |
0 | 161 } |
162 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
163 Symbol* SymbolTable::lookup(const Symbol* sym, int begin, int end, TRAPS) { |
0 | 164 char* buffer; |
165 int index, len; | |
166 unsigned int hashValue; | |
167 char* name; | |
168 { | |
169 debug_only(No_Safepoint_Verifier nsv;) | |
170 | |
171 name = (char*)sym->base() + begin; | |
172 len = end - begin; | |
173 hashValue = hash_symbol(name, len); | |
174 index = the_table()->hash_to_index(hashValue); | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
175 Symbol* s = the_table()->lookup(index, name, len, hashValue); |
0 | 176 |
177 // Found | |
178 if (s != NULL) return s; | |
179 } | |
180 | |
181 // Otherwise, add to symbol to table. Copy to a C string first. | |
182 char stack_buf[128]; | |
183 ResourceMark rm(THREAD); | |
184 if (len <= 128) { | |
185 buffer = stack_buf; | |
186 } else { | |
187 buffer = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, len); | |
188 } | |
189 for (int i=0; i<len; i++) { | |
190 buffer[i] = name[i]; | |
191 } | |
192 // Make sure there is no safepoint in the code above since name can't move. | |
193 // We can't include the code in No_Safepoint_Verifier because of the | |
194 // ResourceMark. | |
195 | |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
196 return the_table()->basic_add(index, (u1*)buffer, len, hashValue, true, CHECK_NULL); |
0 | 197 } |
198 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
199 Symbol* SymbolTable::lookup_only(const char* name, int len, |
0 | 200 unsigned int& hash) { |
201 hash = hash_symbol(name, len); | |
202 int index = the_table()->hash_to_index(hash); | |
203 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
204 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
|
205 return s; |
0 | 206 } |
207 | |
4800
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
208 // 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
|
209 // Do not create any new symbols |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
210 // 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
|
211 Symbol** SymbolTable::lookup_symbol_addr(Symbol* sym){ |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
212 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
|
213 int index = the_table()->hash_to_index(hash); |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
214 |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
215 for (HashtableEntry<Symbol*>* e = the_table()->bucket(index); e != NULL; e = e->next()) { |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
216 if (e->hash() == hash) { |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
217 Symbol* literal_sym = e->literal(); |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
218 if (sym == literal_sym) { |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
219 return e->literal_addr(); |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
220 } |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
221 } |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
222 } |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
223 return NULL; |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
224 } |
94ec88ca68e2
7115199: Add event tracing hooks and Java Flight Recorder infrastructure
phh
parents:
2418
diff
changeset
|
225 |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
226 // Suggestion: Push unicode-based lookup all the way into the hashing |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
227 // 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
|
228 // an actual new Symbol* is created. |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
229 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
|
230 int utf8_length = UNICODE::utf8_length((jchar*) name, utf16_length); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
231 char stack_buf[128]; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
232 if (utf8_length < (int) sizeof(stack_buf)) { |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
233 char* chars = stack_buf; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
234 UNICODE::convert_to_utf8(name, utf16_length, chars); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
235 return lookup(chars, utf8_length, THREAD); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
236 } else { |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
237 ResourceMark rm(THREAD); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
238 char* chars = NEW_RESOURCE_ARRAY(char, utf8_length + 1);; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
239 UNICODE::convert_to_utf8(name, utf16_length, chars); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
240 return lookup(chars, utf8_length, THREAD); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
241 } |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
242 } |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
243 |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
244 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
|
245 unsigned int& hash) { |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
246 int utf8_length = UNICODE::utf8_length((jchar*) name, utf16_length); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
247 char stack_buf[128]; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
248 if (utf8_length < (int) sizeof(stack_buf)) { |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
249 char* chars = stack_buf; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
250 UNICODE::convert_to_utf8(name, utf16_length, chars); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
251 return lookup_only(chars, utf8_length, hash); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
252 } else { |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
253 ResourceMark rm; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
254 char* chars = NEW_RESOURCE_ARRAY(char, utf8_length + 1);; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
255 UNICODE::convert_to_utf8(name, utf16_length, chars); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
256 return lookup_only(chars, utf8_length, hash); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
257 } |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
258 } |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
605
diff
changeset
|
259 |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
260 void SymbolTable::add(Handle class_loader, constantPoolHandle cp, |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
261 int names_count, |
0 | 262 const char** names, int* lengths, int* cp_indices, |
263 unsigned int* hashValues, TRAPS) { | |
264 SymbolTable* table = the_table(); | |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
265 bool added = table->basic_add(class_loader, cp, names_count, names, lengths, |
0 | 266 cp_indices, hashValues, CHECK); |
267 if (!added) { | |
268 // do it the hard way | |
269 for (int i=0; i<names_count; i++) { | |
270 int index = table->hash_to_index(hashValues[i]); | |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
271 bool c_heap = class_loader() != NULL; |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
272 Symbol* sym = table->basic_add(index, (u1*)names[i], lengths[i], hashValues[i], c_heap, CHECK); |
0 | 273 cp->symbol_at_put(cp_indices[i], sym); |
274 } | |
275 } | |
276 } | |
277 | |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
278 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
|
279 unsigned int hash; |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
280 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
|
281 if (result != NULL) { |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
282 return result; |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
283 } |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
284 SymbolTable* table = the_table(); |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
285 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
|
286 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
|
287 } |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
288 |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
289 Symbol* SymbolTable::basic_add(int index, u1 *name, int len, |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
290 unsigned int hashValue, bool c_heap, TRAPS) { |
0 | 291 assert(!Universe::heap()->is_in_reserved(name) || GC_locker::is_active(), |
292 "proposed name of symbol must be stable"); | |
293 | |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
294 // Grab SymbolTable_lock first. |
0 | 295 MutexLocker ml(SymbolTable_lock, THREAD); |
296 | |
297 // Since look-up was done lock-free, we need to check if another | |
298 // 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
|
299 Symbol* test = lookup(index, (char*)name, len, hashValue); |
0 | 300 if (test != NULL) { |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
301 // 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
|
302 assert(test->refcount() != 0, "lookup should have incremented the count"); |
0 | 303 return test; |
304 } | |
305 | |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
306 // Create a new symbol. |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
307 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
|
308 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
|
309 |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
310 HashtableEntry<Symbol*>* entry = new_entry(hashValue, sym); |
0 | 311 add_entry(index, entry); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
312 return sym; |
0 | 313 } |
314 | |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
315 // 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
|
316 // parsing. |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
317 bool SymbolTable::basic_add(Handle class_loader, constantPoolHandle cp, |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
318 int names_count, |
0 | 319 const char** names, int* lengths, |
320 int* cp_indices, unsigned int* hashValues, | |
321 TRAPS) { | |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
322 |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
323 // 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
|
324 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
|
325 if (lengths[i] > Symbol::max_length()) { |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
326 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
|
327 "name is too long to represent"); |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
328 } |
0 | 329 } |
330 | |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
331 // Hold SymbolTable_lock through the symbol creation |
0 | 332 MutexLocker ml(SymbolTable_lock, THREAD); |
333 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
334 for (int i=0; i<names_count; i++) { |
0 | 335 // Since look-up was done lock-free, we need to check if another |
336 // thread beat us in the race to insert the symbol. | |
337 int index = hash_to_index(hashValues[i]); | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
338 Symbol* test = lookup(index, names[i], lengths[i], hashValues[i]); |
0 | 339 if (test != NULL) { |
605 | 340 // A race occurred and another thread introduced the symbol, this one |
0 | 341 // will be dropped and collected. Use test instead. |
342 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
|
343 assert(test->refcount() != 0, "lookup should have incremented the count"); |
0 | 344 } else { |
5979
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
345 // 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
|
346 // are allocated specially in a permanent arena. |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
347 bool c_heap = class_loader() != NULL; |
fc9d8850ab8b
7150058: Allocate symbols from null boot loader to an arena for NMT
coleenp
parents:
4800
diff
changeset
|
348 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
|
349 assert(sym->equals(names[i], lengths[i]), "symbol must be properly initialized"); // why wouldn't it be??? |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
350 HashtableEntry<Symbol*>* entry = new_entry(hashValues[i], sym); |
0 | 351 add_entry(index, entry); |
352 cp->symbol_at_put(cp_indices[i], sym); | |
353 } | |
354 } | |
355 return true; | |
356 } | |
357 | |
358 | |
359 void SymbolTable::verify() { | |
360 for (int i = 0; i < the_table()->table_size(); ++i) { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
361 HashtableEntry<Symbol*>* p = the_table()->bucket(i); |
0 | 362 for ( ; p != NULL; p = p->next()) { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
363 Symbol* s = (Symbol*)(p->literal()); |
0 | 364 guarantee(s != NULL, "symbol is NULL"); |
365 unsigned int h = hash_symbol((char*)s->bytes(), s->utf8_length()); | |
366 guarantee(p->hash() == h, "broken hash in symbol table entry"); | |
367 guarantee(the_table()->hash_to_index(h) == i, | |
368 "wrong index in symbol table"); | |
369 } | |
370 } | |
371 } | |
372 | |
373 | |
374 //--------------------------------------------------------------------------- | |
375 // Non-product code | |
376 | |
377 #ifndef PRODUCT | |
378 | |
379 void SymbolTable::print_histogram() { | |
380 MutexLocker ml(SymbolTable_lock); | |
381 const int results_length = 100; | |
382 int results[results_length]; | |
383 int i,j; | |
384 | |
385 // initialize results to zero | |
386 for (j = 0; j < results_length; j++) { | |
387 results[j] = 0; | |
388 } | |
389 | |
390 int total = 0; | |
391 int max_symbols = 0; | |
392 int out_of_range = 0; | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
393 int memory_total = 0; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
394 int count = 0; |
0 | 395 for (i = 0; i < the_table()->table_size(); i++) { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
396 HashtableEntry<Symbol*>* p = the_table()->bucket(i); |
0 | 397 for ( ; p != NULL; p = p->next()) { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
398 memory_total += p->literal()->object_size(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
399 count++; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
400 int counter = p->literal()->utf8_length(); |
0 | 401 total += counter; |
402 if (counter < results_length) { | |
403 results[counter]++; | |
404 } else { | |
405 out_of_range++; | |
406 } | |
407 max_symbols = MAX2(max_symbols, counter); | |
408 } | |
409 } | |
410 tty->print_cr("Symbol Table:"); | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
411 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
|
412 tty->print_cr("Total size in memory %5dK", |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
413 (memory_total*HeapWordSize)/1024); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
414 tty->print_cr("Total counted %5d", symbols_counted); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
415 tty->print_cr("Total removed %5d", symbols_removed); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
416 if (symbols_counted > 0) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
417 tty->print_cr("Percent removed %3.2f", |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
418 ((float)symbols_removed/(float)symbols_counted)* 100); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
419 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
420 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
|
421 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
|
422 arena()->size_in_bytes(), arena()->used()); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
423 tty->print_cr("Histogram of symbol length:"); |
0 | 424 tty->print_cr("%8s %5d", "Total ", total); |
425 tty->print_cr("%8s %5d", "Maximum", max_symbols); | |
426 tty->print_cr("%8s %3.2f", "Average", | |
427 ((float) total / (float) the_table()->table_size())); | |
428 tty->print_cr("%s", "Histogram:"); | |
429 tty->print_cr(" %s %29s", "Length", "Number chains that length"); | |
430 for (i = 0; i < results_length; i++) { | |
431 if (results[i] > 0) { | |
432 tty->print_cr("%6d %10d", i, results[i]); | |
433 } | |
434 } | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
435 if (Verbose) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
436 int line_length = 70; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
437 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
|
438 for (i = 0; i < results_length; i++) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
439 if (results[i] > 0) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
440 tty->print("%4d", i); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
441 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
|
442 tty->print("%1s", "*"); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
443 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
444 if (j == line_length) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
445 tty->print("%1s", "+"); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
446 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
447 tty->cr(); |
0 | 448 } |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
449 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
450 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
451 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
|
452 results_length, out_of_range); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
453 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
454 |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
455 void SymbolTable::print() { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
456 for (int i = 0; i < the_table()->table_size(); ++i) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
457 HashtableEntry<Symbol*>** p = the_table()->bucket_addr(i); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
458 HashtableEntry<Symbol*>* entry = the_table()->bucket(i); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
459 if (entry != NULL) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
460 while (entry != NULL) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
461 tty->print(PTR_FORMAT " ", entry->literal()); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
462 entry->literal()->print(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
463 tty->print(" %d", entry->literal()->refcount()); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
464 p = entry->next_addr(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
465 entry = (HashtableEntry<Symbol*>*)HashtableEntry<Symbol*>::make_ptr(*p); |
0 | 466 } |
467 tty->cr(); | |
468 } | |
469 } | |
470 } | |
471 | |
472 #endif // PRODUCT | |
473 | |
474 // -------------------------------------------------------------------------- | |
475 | |
476 #ifdef ASSERT | |
477 class StableMemoryChecker : public StackObj { | |
478 enum { _bufsize = wordSize*4 }; | |
479 | |
480 address _region; | |
481 jint _size; | |
482 u1 _save_buf[_bufsize]; | |
483 | |
484 int sample(u1* save_buf) { | |
485 if (_size <= _bufsize) { | |
486 memcpy(save_buf, _region, _size); | |
487 return _size; | |
488 } else { | |
489 // copy head and tail | |
490 memcpy(&save_buf[0], _region, _bufsize/2); | |
491 memcpy(&save_buf[_bufsize/2], _region + _size - _bufsize/2, _bufsize/2); | |
492 return (_bufsize/2)*2; | |
493 } | |
494 } | |
495 | |
496 public: | |
497 StableMemoryChecker(const void* region, jint size) { | |
498 _region = (address) region; | |
499 _size = size; | |
500 sample(_save_buf); | |
501 } | |
502 | |
503 bool verify() { | |
504 u1 check_buf[sizeof(_save_buf)]; | |
505 int check_size = sample(check_buf); | |
506 return (0 == memcmp(_save_buf, check_buf, check_size)); | |
507 } | |
508 | |
509 void set_region(const void* region) { _region = (address) region; } | |
510 }; | |
511 #endif | |
512 | |
513 | |
514 // -------------------------------------------------------------------------- | |
515 StringTable* StringTable::_the_table = NULL; | |
516 | |
517 oop StringTable::lookup(int index, jchar* name, | |
518 int len, unsigned int hash) { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
519 for (HashtableEntry<oop>* l = bucket(index); l != NULL; l = l->next()) { |
0 | 520 if (l->hash() == hash) { |
521 if (java_lang_String::equals(l->literal(), name, len)) { | |
522 return l->literal(); | |
523 } | |
524 } | |
525 } | |
526 return NULL; | |
527 } | |
528 | |
529 | |
530 oop StringTable::basic_add(int index, Handle string_or_null, jchar* name, | |
531 int len, unsigned int hashValue, TRAPS) { | |
532 debug_only(StableMemoryChecker smc(name, len * sizeof(name[0]))); | |
533 assert(!Universe::heap()->is_in_reserved(name) || GC_locker::is_active(), | |
534 "proposed name of symbol must be stable"); | |
535 | |
536 Handle string; | |
537 // try to reuse the string if possible | |
2379
b099aaf51bf8
6962931: move interned strings out of the perm gen
jcoomes
parents:
2336
diff
changeset
|
538 if (!string_or_null.is_null() && (!JavaObjectsInPerm || string_or_null()->is_perm())) { |
0 | 539 string = string_or_null; |
540 } else { | |
541 string = java_lang_String::create_tenured_from_unicode(name, len, CHECK_NULL); | |
542 } | |
543 | |
544 // Allocation must be done before grapping the SymbolTable_lock lock | |
545 MutexLocker ml(StringTable_lock, THREAD); | |
546 | |
547 assert(java_lang_String::equals(string(), name, len), | |
548 "string must be properly initialized"); | |
549 | |
550 // Since look-up was done lock-free, we need to check if another | |
551 // thread beat us in the race to insert the symbol. | |
552 | |
553 oop test = lookup(index, name, len, hashValue); // calls lookup(u1*, int) | |
554 if (test != NULL) { | |
555 // Entry already added | |
556 return test; | |
557 } | |
558 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
559 HashtableEntry<oop>* entry = new_entry(hashValue, string()); |
0 | 560 add_entry(index, entry); |
561 return string(); | |
562 } | |
563 | |
564 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
565 oop StringTable::lookup(Symbol* symbol) { |
0 | 566 ResourceMark rm; |
567 int length; | |
568 jchar* chars = symbol->as_unicode(length); | |
2418
352622fd140a
7032129: Native memory usage grow unexpectedly for vm/oom/*InternedString tests
never
parents:
2379
diff
changeset
|
569 unsigned int hashValue = java_lang_String::hash_string(chars, length); |
0 | 570 int index = the_table()->hash_to_index(hashValue); |
571 return the_table()->lookup(index, chars, length, hashValue); | |
572 } | |
573 | |
574 | |
575 oop StringTable::intern(Handle string_or_null, jchar* name, | |
576 int len, TRAPS) { | |
2418
352622fd140a
7032129: Native memory usage grow unexpectedly for vm/oom/*InternedString tests
never
parents:
2379
diff
changeset
|
577 unsigned int hashValue = java_lang_String::hash_string(name, len); |
0 | 578 int index = the_table()->hash_to_index(hashValue); |
579 oop string = the_table()->lookup(index, name, len, hashValue); | |
580 | |
581 // Found | |
582 if (string != NULL) return string; | |
583 | |
584 // Otherwise, add to symbol to table | |
585 return the_table()->basic_add(index, string_or_null, name, len, | |
586 hashValue, CHECK_NULL); | |
587 } | |
588 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
589 oop StringTable::intern(Symbol* symbol, TRAPS) { |
0 | 590 if (symbol == NULL) return NULL; |
591 ResourceMark rm(THREAD); | |
592 int length; | |
593 jchar* chars = symbol->as_unicode(length); | |
594 Handle string; | |
595 oop result = intern(string, chars, length, CHECK_NULL); | |
596 return result; | |
597 } | |
598 | |
599 | |
600 oop StringTable::intern(oop string, TRAPS) | |
601 { | |
602 if (string == NULL) return NULL; | |
603 ResourceMark rm(THREAD); | |
604 int length; | |
605 Handle h_string (THREAD, string); | |
606 jchar* chars = java_lang_String::as_unicode_string(string, length); | |
607 oop result = intern(h_string, chars, length, CHECK_NULL); | |
608 return result; | |
609 } | |
610 | |
611 | |
612 oop StringTable::intern(const char* utf8_string, TRAPS) { | |
613 if (utf8_string == NULL) return NULL; | |
614 ResourceMark rm(THREAD); | |
615 int length = UTF8::unicode_length(utf8_string); | |
616 jchar* chars = NEW_RESOURCE_ARRAY(jchar, length); | |
617 UTF8::convert_to_unicode(utf8_string, chars, length); | |
618 Handle string; | |
619 oop result = intern(string, chars, length, CHECK_NULL); | |
620 return result; | |
621 } | |
622 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
623 void StringTable::unlink(BoolObjectClosure* is_alive) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
624 // 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
|
625 // entries at a safepoint. |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
626 assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint"); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
627 for (int i = 0; i < the_table()->table_size(); ++i) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
628 for (HashtableEntry<oop>** p = the_table()->bucket_addr(i); *p != NULL; ) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
629 HashtableEntry<oop>* entry = *p; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
630 if (entry->is_shared()) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
631 break; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
632 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
633 assert(entry->literal() != NULL, "just checking"); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
634 if (is_alive->do_object_b(entry->literal())) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
635 p = entry->next_addr(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
636 } else { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
637 *p = entry->next(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
638 the_table()->free_entry(entry); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
639 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
640 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
641 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
642 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
643 |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
644 void StringTable::oops_do(OopClosure* f) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
645 for (int i = 0; i < the_table()->table_size(); ++i) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
646 HashtableEntry<oop>** p = the_table()->bucket_addr(i); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
647 HashtableEntry<oop>* entry = the_table()->bucket(i); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
648 while (entry != NULL) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
649 f->do_oop((oop*)entry->literal_addr()); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
650 |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
651 // Did the closure remove the literal from the table? |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
652 if (entry->literal() == NULL) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
653 assert(!entry->is_shared(), "immutable hashtable entry?"); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
654 *p = entry->next(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
655 the_table()->free_entry(entry); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
656 } else { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
657 p = entry->next_addr(); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
658 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
659 entry = (HashtableEntry<oop>*)HashtableEntry<oop>::make_ptr(*p); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
660 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
661 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
662 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
663 |
0 | 664 void StringTable::verify() { |
665 for (int i = 0; i < the_table()->table_size(); ++i) { | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
666 HashtableEntry<oop>* p = the_table()->bucket(i); |
0 | 667 for ( ; p != NULL; p = p->next()) { |
668 oop s = p->literal(); | |
669 guarantee(s != NULL, "interned string is NULL"); | |
2379
b099aaf51bf8
6962931: move interned strings out of the perm gen
jcoomes
parents:
2336
diff
changeset
|
670 guarantee(s->is_perm() || !JavaObjectsInPerm, "interned string not in permspace"); |
2418
352622fd140a
7032129: Native memory usage grow unexpectedly for vm/oom/*InternedString tests
never
parents:
2379
diff
changeset
|
671 unsigned int h = java_lang_String::hash_string(s); |
0 | 672 guarantee(p->hash() == h, "broken hash in string table entry"); |
673 guarantee(the_table()->hash_to_index(h) == i, | |
674 "wrong index in string table"); | |
675 } | |
676 } | |
677 } |