1.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp Tue Sep 28 09:51:37 2010 -0700
1.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp Tue Sep 28 15:56:15 2010 -0700
1.3 @@ -46,23 +46,6 @@
1.4 marking_stack()->initialize();
1.5 _objarray_stack.initialize();
1.6 region_stack()->initialize();
1.7 -
1.8 - // Note that _revisit_klass_stack is allocated out of the
1.9 - // C heap (as opposed to out of ResourceArena).
1.10 - int size =
1.11 - (SystemDictionary::number_of_classes() * 2) * 2 / ParallelGCThreads;
1.12 - _revisit_klass_stack = new (ResourceObj::C_HEAP) GrowableArray<Klass*>(size, true);
1.13 - // From some experiments (#klass/k)^2 for k = 10 seems a better fit, but this will
1.14 - // have to do for now until we are able to investigate a more optimal setting.
1.15 - _revisit_mdo_stack = new (ResourceObj::C_HEAP) GrowableArray<DataLayout*>(size*2, true);
1.16 -}
1.17 -
1.18 -ParCompactionManager::~ParCompactionManager() {
1.19 - delete _revisit_klass_stack;
1.20 - delete _revisit_mdo_stack;
1.21 - // _manager_array and _stack_array are statics
1.22 - // shared with all instances of ParCompactionManager
1.23 - // should not be deallocated.
1.24 }
1.25
1.26 void ParCompactionManager::initialize(ParMarkBitMap* mbm) {
1.27 @@ -134,9 +117,9 @@
1.28 }
1.29
1.30 void ParCompactionManager::reset() {
1.31 - for(uint i=0; i<ParallelGCThreads+1; i++) {
1.32 - manager_array(i)->revisit_klass_stack()->clear();
1.33 - manager_array(i)->revisit_mdo_stack()->clear();
1.34 + for(uint i = 0; i < ParallelGCThreads + 1; i++) {
1.35 + assert(manager_array(i)->revisit_klass_stack()->is_empty(), "sanity");
1.36 + assert(manager_array(i)->revisit_mdo_stack()->is_empty(), "sanity");
1.37 }
1.38 }
1.39
1.40 @@ -178,10 +161,3 @@
1.41 }
1.42 } while (!region_stack()->is_empty());
1.43 }
1.44 -
1.45 -#ifdef ASSERT
1.46 -bool ParCompactionManager::stacks_have_been_allocated() {
1.47 - return (revisit_klass_stack()->data_addr() != NULL &&
1.48 - revisit_mdo_stack()->data_addr() != NULL);
1.49 -}
1.50 -#endif
