jdk8-mips64-public/hotspot: comparison src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp

-:c4d722788ed6
+:4788266644c1
 // obsolete contents from a short-circuited previous CMS cycle.
 _revisitStack.reset();
 verify_work_stacks_empty();
 verify_overflow_empty();
 assert(_revisitStack.isEmpty(), "tabula rasa");
+DEBUG_ONLY(RememberKlassesChecker cmx(should_unload_classes());)
-DEBUG_ONLY(RememberKlassesChecker cmx(CMSClassUnloadingEnabled);)
 bool result = false;
 if (CMSConcurrentMTEnabled && ParallelCMSThreads > 0) {
 result = do_marking_mt(asynch);
 } else {
 result = do_marking_st(asynch);
 // This is run by the CMS (coordinator) thread.
 void CMSConcMarkingTask::coordinator_yield() {
 assert(ConcurrentMarkSweepThread::cms_thread_has_cms_token(),
 "CMS thread should hold CMS token");
 DEBUG_ONLY(RememberKlassesChecker mux(false);)
 // First give up the locks, then yield, then re-lock
 // We should probably use a constructor/destructor idiom to
 // do this unlock/lock or modify the MutexUnlocker class to
 // serve our purpose. XXX
 // Refs discovery is already non-atomic.
 assert(!ref_processor()->discovery_is_atomic(), "Should be non-atomic");
 // Mutate the Refs discovery so it is MT during the
 // multi-threaded marking phase.
 ReferenceProcessorMTMutator mt(ref_processor(), num_workers > 1);
+DEBUG_ONLY(RememberKlassesChecker cmx(should_unload_classes());)
-DEBUG_ONLY(RememberKlassesChecker cmx(CMSClassUnloadingEnabled);)
 conc_workers()->start_task(&tsk);
 while (tsk.yielded()) {
 tsk.coordinator_yield();
 conc_workers()->continue_task(&tsk);
 }
 // The code in this method may need further
 // tweaking for better performance and some restructuring
 // for cleaner interfaces.
 rp->preclean_discovered_references(
 rp->is_alive_non_header(), &keep_alive, &complete_trace,
-&yield_cl);
+&yield_cl, should_unload_classes());
 }
 if (clean_survivor) {  // preclean the active survivor space(s)
 assert(_young_gen->kind() == Generation::DefNew ||
 _young_gen->kind() == Generation::ParNew ||
 unsigned int before_count =
 GenCollectedHeap::heap()->total_collections();
 SurvivorSpacePrecleanClosure
 sss_cl(this, _span, &_markBitMap, &_markStack,
 &pam_cl, before_count, CMSYield);
-DEBUG_ONLY(RememberKlassesChecker mx(CMSClassUnloadingEnabled);)
+DEBUG_ONLY(RememberKlassesChecker mx(should_unload_classes());)
 dng->from()->object_iterate_careful(&sss_cl);
 dng->to()->object_iterate_careful(&sss_cl);
 }
 MarkRefsIntoAndScanClosure
 mrias_cl(_span, ref_processor(), &_markBitMap, &_modUnionTable,
 startTimer();
 {
 verify_work_stacks_empty();
 verify_overflow_empty();
 sample_eden();
-DEBUG_ONLY(RememberKlassesChecker mx(CMSClassUnloadingEnabled);)
+DEBUG_ONLY(RememberKlassesChecker mx(should_unload_classes());)
 stop_point =
 gen->cmsSpace()->object_iterate_careful_m(dirtyRegion, cl);
 }
 if (stop_point != NULL) {
 // The careful iteration stopped early either because it found an
 CMSTokenSyncWithLocks ts(true, gen->freelistLock(), bitMapLock());
 startTimer();
 sample_eden();
 verify_work_stacks_empty();
 verify_overflow_empty();
-DEBUG_ONLY(RememberKlassesChecker mx(CMSClassUnloadingEnabled);)
+DEBUG_ONLY(RememberKlassesChecker mx(should_unload_classes());)
 HeapWord* stop_point =
 gen->cmsSpace()->object_iterate_careful_m(dirtyRegion, cl);
 if (stop_point != NULL) {
 // The careful iteration stopped early because it found an
 // uninitialized object.  Redirty the bits corresponding to the
 CodeCache::gc_prologue();
 }
 assert(haveFreelistLocks(), "must have free list locks");
 assert_lock_strong(bitMapLock());
-DEBUG_ONLY(RememberKlassesChecker fmx(CMSClassUnloadingEnabled);)
+DEBUG_ONLY(RememberKlassesChecker fmx(should_unload_classes());)
 if (!init_mark_was_synchronous) {
 // We might assume that we need not fill TLAB's when
 // CMSScavengeBeforeRemark is set, because we may have just done
 // a scavenge which would have filled all TLAB's -- and besides
 // Eden would be empty. This however may not always be the case --

Mercurial > jdk8-mips64-public > hotspot / file comparison

comparison: src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp

src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp