comparison src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.cpp @ 139:c0492d52d55b

6539517: CR 6186200 should be extended to perm gen allocation to prevent spurious OOM's from perm gen Reviewed-by: ysr, jmasa
author apetrusenko
date Tue, 01 Apr 2008 15:13:47 +0400
parents a61af66fc99e
children c18cbe5936b8
comparison
equal deleted inserted replaced
95:d05ebaf00ed0 139:c0492d52d55b
42 HeapWord* CMSPermGen::mem_allocate(size_t size) { 42 HeapWord* CMSPermGen::mem_allocate(size_t size) {
43 Mutex* lock = _gen->freelistLock(); 43 Mutex* lock = _gen->freelistLock();
44 bool lock_owned = lock->owned_by_self(); 44 bool lock_owned = lock->owned_by_self();
45 if (lock_owned) { 45 if (lock_owned) {
46 MutexUnlocker mul(lock); 46 MutexUnlocker mul(lock);
47 return mem_allocate_work(size); 47 return mem_allocate_in_gen(size, _gen);
48 } else { 48 } else {
49 return mem_allocate_work(size); 49 return mem_allocate_in_gen(size, _gen);
50 } 50 }
51 }
52
53 HeapWord* CMSPermGen::mem_allocate_work(size_t size) {
54 assert(!_gen->freelistLock()->owned_by_self(), "Potetntial deadlock");
55
56 MutexLocker ml(Heap_lock);
57 HeapWord* obj = NULL;
58
59 obj = _gen->allocate(size, false);
60 // Since we want to minimize pause times, we will prefer
61 // expanding the perm gen rather than doing a stop-world
62 // collection to satisfy the allocation request.
63 if (obj == NULL) {
64 // Try to expand the perm gen and allocate space.
65 obj = _gen->expand_and_allocate(size, false, false);
66 if (obj == NULL) {
67 // Let's see if a normal stop-world full collection will
68 // free up enough space.
69 SharedHeap::heap()->collect_locked(GCCause::_permanent_generation_full);
70 obj = _gen->allocate(size, false);
71 if (obj == NULL) {
72 // The collection above may have shrunk the space, so try
73 // to expand again and allocate space.
74 obj = _gen->expand_and_allocate(size, false, false);
75 }
76 if (obj == NULL) {
77 // We have not been able to allocate space despite a
78 // full stop-world collection. We now make a last-ditch collection
79 // attempt (in which soft refs are all aggressively freed)
80 // that will try to reclaim as much space as possible.
81 SharedHeap::heap()->collect_locked(GCCause::_last_ditch_collection);
82 obj = _gen->allocate(size, false);
83 if (obj == NULL) {
84 // Expand generation in case it was shrunk following the collection.
85 obj = _gen->expand_and_allocate(size, false, false);
86 }
87 }
88 }
89 }
90 return obj;
91 } 51 }
92 52
93 void CMSPermGen::compute_new_size() { 53 void CMSPermGen::compute_new_size() {
94 _gen->compute_new_size(); 54 _gen->compute_new_size();
95 } 55 }