Mercurial > hg > truffle

comparison src/share/vm/classfile/loaderConstraints.cpp @ 2177:3582bf76420e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6990754: Use native memory and reference counting to implement SymbolTable Summary: move symbols from permgen into C heap and reference count them Reviewed-by: never, acorn, jmasa, stefank
author coleenp
date Thu, 27 Jan 2011 16:11:27 -0800
parents f95d63e2154a
children 4f26f535a225
comparison
equal deleted inserted replaced
2176:27e4ea99855d 2177:3582bf76420e
29 #include "runtime/handles.inline.hpp" 29 #include "runtime/handles.inline.hpp"
30 #include "runtime/safepoint.hpp" 30 #include "runtime/safepoint.hpp"
31 #include "utilities/hashtable.inline.hpp" 31 #include "utilities/hashtable.inline.hpp"
32 32
33 LoaderConstraintTable::LoaderConstraintTable(int nof_buckets) 33 LoaderConstraintTable::LoaderConstraintTable(int nof_buckets)
34 : Hashtable(nof_buckets, sizeof(LoaderConstraintEntry)) {}; 34 : Hashtable<klassOop>(nof_buckets, sizeof(LoaderConstraintEntry)) {};
35 35
36 36
37 LoaderConstraintEntry* LoaderConstraintTable::new_entry( 37 LoaderConstraintEntry* LoaderConstraintTable::new_entry(
38 unsigned int hash, symbolOop name, 38 unsigned int hash, Symbol* name,
39 klassOop klass, int num_loaders, 39 klassOop klass, int num_loaders,
40 int max_loaders) { 40 int max_loaders) {
41 LoaderConstraintEntry* entry; 41 LoaderConstraintEntry* entry;
42 entry = (LoaderConstraintEntry*)Hashtable::new_entry(hash, klass); 42 entry = (LoaderConstraintEntry*)Hashtable<klassOop>::new_entry(hash, klass);
43 entry->set_name(name); 43 entry->set_name(name);
44 entry->set_num_loaders(num_loaders); 44 entry->set_num_loaders(num_loaders);
45 entry->set_max_loaders(max_loaders); 45 entry->set_max_loaders(max_loaders);
46 return entry; 46 return entry;
47 }
48
49 void LoaderConstraintTable::free_entry(LoaderConstraintEntry *entry) {
50 // decrement name refcount before freeing
51 entry->name()->decrement_refcount();
52 Hashtable<klassOop>::free_entry(entry);
47 } 53 }
48 54
49 55
50 void LoaderConstraintTable::oops_do(OopClosure* f) { 56 void LoaderConstraintTable::oops_do(OopClosure* f) {
51 for (int index = 0; index < table_size(); index++) { 57 for (int index = 0; index < table_size(); index++) {
52 for (LoaderConstraintEntry* probe = bucket(index); 58 for (LoaderConstraintEntry* probe = bucket(index);
53 probe != NULL; 59 probe != NULL;
54 probe = probe->next()) { 60 probe = probe->next()) {
55 f->do_oop((oop*)(probe->name_addr()));
56 if (probe->klass() != NULL) { 61 if (probe->klass() != NULL) {
57 f->do_oop((oop*)probe->klass_addr()); 62 f->do_oop((oop*)probe->klass_addr());
58 } 63 }
59 for (int n = 0; n < probe->num_loaders(); n++) { 64 for (int n = 0; n < probe->num_loaders(); n++) {
60 if (probe->loader(n) != NULL) { 65 if (probe->loader(n) != NULL) {
63 } 68 }
64 } 69 }
65 } 70 }
66 } 71 }
67 72
68 // We must keep the symbolOop used in the name alive. We'll use the
69 // loaders to decide if a particular entry can be purged.
70 void LoaderConstraintTable::always_strong_classes_do(OopClosure* blk) {
71 // We must keep the symbolOop used in the name alive.
72 for (int cindex = 0; cindex < table_size(); cindex++) {
73 for (LoaderConstraintEntry* lc_probe = bucket(cindex);
74 lc_probe != NULL;
75 lc_probe = lc_probe->next()) {
76 assert (lc_probe->name() != NULL, "corrupted loader constraint table");
77 blk->do_oop((oop*)lc_probe->name_addr());
78 }
79 }
80 }
81
82 73
83 // The loaderConstraintTable must always be accessed with the 74 // The loaderConstraintTable must always be accessed with the
84 // SystemDictionary lock held. This is true even for readers as 75 // SystemDictionary lock held. This is true even for readers as
85 // entries in the table could be being dynamically resized. 76 // entries in the table could be being dynamically resized.
86 77
87 LoaderConstraintEntry** LoaderConstraintTable::find_loader_constraint( 78 LoaderConstraintEntry** LoaderConstraintTable::find_loader_constraint(
88 symbolHandle name, Handle loader) { 79 Symbol* name, Handle loader) {
89 80
90 unsigned int hash = compute_hash(name); 81 unsigned int hash = compute_hash(name);
91 int index = hash_to_index(hash); 82 int index = hash_to_index(hash);
92 LoaderConstraintEntry** pp = bucket_addr(index); 83 LoaderConstraintEntry** pp = bucket_addr(index);
93 while (*pp) { 84 while (*pp) {
94 LoaderConstraintEntry* p = *pp; 85 LoaderConstraintEntry* p = *pp;
95 if (p->hash() == hash) { 86 if (p->hash() == hash) {
96 if (p->name() == name()) { 87 if (p->name() == name) {
97 for (int i = p->num_loaders() - 1; i >= 0; i--) { 88 for (int i = p->num_loaders() - 1; i >= 0; i--) {
98 if (p->loader(i) == loader()) { 89 if (p->loader(i) == loader()) {
99 return pp; 90 return pp;
100 } 91 }
101 } 92 }
175 *p = probe->next(); 166 *p = probe->next();
176 FREE_C_HEAP_ARRAY(oop, probe->loaders()); 167 FREE_C_HEAP_ARRAY(oop, probe->loaders());
177 free_entry(probe); 168 free_entry(probe);
178 } else { 169 } else {
179 #ifdef ASSERT 170 #ifdef ASSERT
180 assert(is_alive->do_object_b(probe->name()), "name should be live");
181 if (probe->klass() != NULL) { 171 if (probe->klass() != NULL) {
182 assert(is_alive->do_object_b(probe->klass()), "klass should be live"); 172 assert(is_alive->do_object_b(probe->klass()), "klass should be live");
183 } 173 }
184 for (n = 0; n < probe->num_loaders(); n++) { 174 for (n = 0; n < probe->num_loaders(); n++) {
185 if (probe->loader(n) != NULL) { 175 if (probe->loader(n) != NULL) {
192 } 182 }
193 } 183 }
194 } 184 }
195 } 185 }
196 186
197 bool LoaderConstraintTable::add_entry(symbolHandle class_name, 187 bool LoaderConstraintTable::add_entry(Symbol* class_name,
198 klassOop klass1, Handle class_loader1, 188 klassOop klass1, Handle class_loader1,
199 klassOop klass2, Handle class_loader2) { 189 klassOop klass2, Handle class_loader2) {
200 int failure_code = 0; // encode different reasons for failing 190 int failure_code = 0; // encode different reasons for failing
201 191
202 if (klass1 != NULL && klass2 != NULL && klass1 != klass2) { 192 if (klass1 != NULL && klass2 != NULL && klass1 != klass2) {
231 if (failure_code == 0) { 221 if (failure_code == 0) {
232 if (*pp1 == NULL && *pp2 == NULL) { 222 if (*pp1 == NULL && *pp2 == NULL) {
233 unsigned int hash = compute_hash(class_name); 223 unsigned int hash = compute_hash(class_name);
234 int index = hash_to_index(hash); 224 int index = hash_to_index(hash);
235 LoaderConstraintEntry* p; 225 LoaderConstraintEntry* p;
236 p = new_entry(hash, class_name(), klass, 2, 2); 226 p = new_entry(hash, class_name, klass, 2, 2);
237 p->set_loaders(NEW_C_HEAP_ARRAY(oop, 2)); 227 p->set_loaders(NEW_C_HEAP_ARRAY(oop, 2));
238 p->set_loader(0, class_loader1()); 228 p->set_loader(0, class_loader1());
239 p->set_loader(1, class_loader2()); 229 p->set_loader(1, class_loader2());
240 p->set_klass(klass); 230 p->set_klass(klass);
241 p->set_next(bucket(index)); 231 p->set_next(bucket(index));
242 set_entry(index, p); 232 set_entry(index, p);
243 if (TraceLoaderConstraints) { 233 if (TraceLoaderConstraints) {
244 ResourceMark rm; 234 ResourceMark rm;
245 tty->print("[Adding new constraint for name: %s, loader[0]: %s," 235 tty->print("[Adding new constraint for name: %s, loader[0]: %s,"
246 " loader[1]: %s ]\n", 236 " loader[1]: %s ]\n",
247 class_name()->as_C_string(), 237 class_name->as_C_string(),
248 SystemDictionary::loader_name(class_loader1()), 238 SystemDictionary::loader_name(class_loader1()),
249 SystemDictionary::loader_name(class_loader2()) 239 SystemDictionary::loader_name(class_loader2())
250 ); 240 );
251 } 241 }
252 } else if (*pp1 == *pp2) { 242 } else if (*pp1 == *pp2) {
255 (*pp1)->set_klass(klass); 245 (*pp1)->set_klass(klass);
256 if (TraceLoaderConstraints) { 246 if (TraceLoaderConstraints) {
257 ResourceMark rm; 247 ResourceMark rm;
258 tty->print("[Setting class object in existing constraint for" 248 tty->print("[Setting class object in existing constraint for"
259 " name: %s and loader %s ]\n", 249 " name: %s and loader %s ]\n",
260 class_name()->as_C_string(), 250 class_name->as_C_string(),
261 SystemDictionary::loader_name(class_loader1()) 251 SystemDictionary::loader_name(class_loader1())
262 ); 252 );
263 } 253 }
264 } else { 254 } else {
265 assert((*pp1)->klass() == klass, "loader constraints corrupted"); 255 assert((*pp1)->klass() == klass, "loader constraints corrupted");
286 " the stored class object in the constraint"; break; 276 " the stored class object in the constraint"; break;
287 default: reason = "unknown reason code"; 277 default: reason = "unknown reason code";
288 } 278 }
289 tty->print("[Failed to add constraint for name: %s, loader[0]: %s," 279 tty->print("[Failed to add constraint for name: %s, loader[0]: %s,"
290 " loader[1]: %s, Reason: %s ]\n", 280 " loader[1]: %s, Reason: %s ]\n",
291 class_name()->as_C_string(), 281 class_name->as_C_string(),
292 SystemDictionary::loader_name(class_loader1()), 282 SystemDictionary::loader_name(class_loader1()),
293 SystemDictionary::loader_name(class_loader2()), 283 SystemDictionary::loader_name(class_loader2()),
294 reason 284 reason
295 ); 285 );
296 } 286 }
301 291
302 // return true if the constraint was updated, false if the constraint is 292 // return true if the constraint was updated, false if the constraint is
303 // violated 293 // violated
304 bool LoaderConstraintTable::check_or_update(instanceKlassHandle k, 294 bool LoaderConstraintTable::check_or_update(instanceKlassHandle k,
305 Handle loader, 295 Handle loader,
306 symbolHandle name) { 296 Symbol* name) {
307 LoaderConstraintEntry* p = *(find_loader_constraint(name, loader)); 297 LoaderConstraintEntry* p = *(find_loader_constraint(name, loader));
308 if (p && p->klass() != NULL && p->klass() != k()) { 298 if (p && p->klass() != NULL && p->klass() != k()) {
309 if (TraceLoaderConstraints) { 299 if (TraceLoaderConstraints) {
310 ResourceMark rm; 300 ResourceMark rm;
311 tty->print("[Constraint check failed for name %s, loader %s: " 301 tty->print("[Constraint check failed for name %s, loader %s: "
312 "the presented class object differs from that stored ]\n", 302 "the presented class object differs from that stored ]\n",
313 name()->as_C_string(), 303 name->as_C_string(),
314 SystemDictionary::loader_name(loader())); 304 SystemDictionary::loader_name(loader()));
315 } 305 }
316 return false; 306 return false;
317 } else { 307 } else {
318 if (p && p->klass() == NULL) { 308 if (p && p->klass() == NULL) {
319 p->set_klass(k()); 309 p->set_klass(k());
320 if (TraceLoaderConstraints) { 310 if (TraceLoaderConstraints) {
321 ResourceMark rm; 311 ResourceMark rm;
322 tty->print("[Updating constraint for name %s, loader %s, " 312 tty->print("[Updating constraint for name %s, loader %s, "
323 "by setting class object ]\n", 313 "by setting class object ]\n",
324 name()->as_C_string(), 314 name->as_C_string(),
325 SystemDictionary::loader_name(loader())); 315 SystemDictionary::loader_name(loader()));
326 } 316 }
327 } 317 }
328 return true; 318 return true;
329 } 319 }
330 } 320 }
331 321
332 klassOop LoaderConstraintTable::find_constrained_klass(symbolHandle name, 322 klassOop LoaderConstraintTable::find_constrained_klass(Symbol* name,
333 Handle loader) { 323 Handle loader) {
334 LoaderConstraintEntry *p = *(find_loader_constraint(name, loader)); 324 LoaderConstraintEntry *p = *(find_loader_constraint(name, loader));
335 if (p != NULL && p->klass() != NULL) 325 if (p != NULL && p->klass() != NULL)
336 return p->klass(); 326 return p->klass();
337 327
440 Thread *thread = Thread::current(); 430 Thread *thread = Thread::current();
441 for (int cindex = 0; cindex < _loader_constraint_size; cindex++) { 431 for (int cindex = 0; cindex < _loader_constraint_size; cindex++) {
442 for (LoaderConstraintEntry* probe = bucket(cindex); 432 for (LoaderConstraintEntry* probe = bucket(cindex);
443 probe != NULL; 433 probe != NULL;
444 probe = probe->next()) { 434 probe = probe->next()) {
445 guarantee(probe->name()->is_symbol(), "should be symbol");
446 if (probe->klass() != NULL) { 435 if (probe->klass() != NULL) {
447 instanceKlass* ik = instanceKlass::cast(probe->klass()); 436 instanceKlass* ik = instanceKlass::cast(probe->klass());
448 guarantee(ik->name() == probe->name(), "name should match"); 437 guarantee(ik->name() == probe->name(), "name should match");
449 symbolHandle name (thread, ik->name()); 438 Symbol* name = ik->name();
450 Handle loader(thread, ik->class_loader()); 439 Handle loader(thread, ik->class_loader());
451 unsigned int d_hash = dictionary->compute_hash(name, loader); 440 unsigned int d_hash = dictionary->compute_hash(name, loader);
452 int d_index = dictionary->hash_to_index(d_hash); 441 int d_index = dictionary->hash_to_index(d_hash);
453 klassOop k = dictionary->find_class(d_index, d_hash, name, loader); 442 klassOop k = dictionary->find_class(d_index, d_hash, name, loader);
454 if (k != NULL) { 443 if (k != NULL) {