jdk8-mips64-public/hotspot: comparison src/share/vm/gc

-:36d1d483d5d6
+:da91efe96a93
 assert(rp == G1CollectedHeap::heap()->ref_processor_stw(), "Precondition");
 GenMarkSweep::_ref_processor = rp;
 rp->setup_policy(clear_all_softrefs);
-// When collecting the permanent generation methodOops may be moving,
+// When collecting the permanent generation Method*s may be moving,
 // so we either have to flush all bcp data or convert it into bci.
 CodeCache::gc_prologue();
 Threads::gc_prologue();
-// Increment the invocation count for the permanent generation, since it is
-// implicitly collected whenever we do a full mark sweep collection.
-sh->perm_gen()->stat_record()->invocations++;
 bool marked_for_unloading = false;
 allocate_stacks();
 // We should save the marks of the currently locked biased monitors.
 mark_sweep_phase4();
 GenMarkSweep::restore_marks();
 BiasedLocking::restore_marks();
 GenMarkSweep::deallocate_stacks();
-// We must invalidate the perm-gen rs, so that it gets rebuilt.
-GenRemSet* rs = sh->rem_set();
-rs->invalidate(sh->perm_gen()->used_region(), true /*whole_heap*/);
 // "free at last gc" is calculated from these.
 // CHF: cheating for now!!!
 //  Universe::set_heap_capacity_at_last_gc(Universe::heap()->capacity());
 //  Universe::set_heap_used_at_last_gc(Universe::heap()->used());
 TraceTime tm("phase 1", G1Log::fine() && Verbose, true, gclog_or_tty);
 GenMarkSweep::trace(" 1");
 SharedHeap* sh = SharedHeap::heap();
-sh->process_strong_roots(true,  // activeate StrongRootsScope
+// Need cleared claim bits for the strong roots processing
-true,  // Collecting permanent generation.
+ClassLoaderDataGraph::clear_claimed_marks();
+sh->process_strong_roots(true,  // activate StrongRootsScope
+false, // not scavenging.
 SharedHeap::SO_SystemClasses,
 &GenMarkSweep::follow_root_closure,
 &GenMarkSweep::follow_code_root_closure,
-&GenMarkSweep::follow_root_closure);
+&GenMarkSweep::follow_klass_closure);
 // Process reference objects found during marking
 ReferenceProcessor* rp = GenMarkSweep::ref_processor();
 assert(rp == G1CollectedHeap::heap()->ref_processor_stw(), "Sanity");
 &GenMarkSweep::keep_alive,
 purged_class);
 GenMarkSweep::follow_stack();
 // Update subklass/sibling/implementor links of live klasses
-GenMarkSweep::follow_weak_klass_links();
+Klass::clean_weak_klass_links(&GenMarkSweep::is_alive);
 assert(GenMarkSweep::_marking_stack.is_empty(),
 "stack should be empty by now");
-// Visit memoized MDO's and clear any unmarked weak refs
-GenMarkSweep::follow_mdo_weak_refs();
-assert(GenMarkSweep::_marking_stack.is_empty(), "just drained");
 // Visit interned string tables and delete unmarked oops
 StringTable::unlink(&GenMarkSweep::is_alive);
 // Clean up unreferenced symbols in symbol table.
 SymbolTable::unlink();
 };
 void G1MarkSweep::mark_sweep_phase2() {
 // Now all live objects are marked, compute the new object addresses.
-// It is imperative that we traverse perm_gen LAST. If dead space is
-// allowed a range of dead object may get overwritten by a dead int
-// array. If perm_gen is not traversed last a klassOop may get
-// overwritten. This is fine since it is dead, but if the class has dead
-// instances we have to skip them, and in order to find their size we
-// need the klassOop!
-//
 // It is not required that we traverse spaces in the same order in
 // phase2, phase3 and phase4, but the ValidateMarkSweep live oops
 // tracking expects us to do so. See comment under phase4.
 G1CollectedHeap* g1h = G1CollectedHeap::heap();
-Generation* pg = g1h->perm_gen();
 TraceTime tm("phase 2", G1Log::fine() && Verbose, true, gclog_or_tty);
 GenMarkSweep::trace("2");
 // find the first region
 }
 G1PrepareCompactClosure blk(sp);
 g1h->heap_region_iterate(&blk);
 blk.update_sets();
-CompactPoint perm_cp(pg, NULL, NULL);
-pg->prepare_for_compaction(&perm_cp);
 }
 class G1AdjustPointersClosure: public HeapRegionClosure {
 public:
 bool doHeapRegion(HeapRegion* r) {
 }
 };
 void G1MarkSweep::mark_sweep_phase3() {
 G1CollectedHeap* g1h = G1CollectedHeap::heap();
-Generation* pg = g1h->perm_gen();
 // Adjust the pointers to reflect the new locations
 TraceTime tm("phase 3", G1Log::fine() && Verbose, true, gclog_or_tty);
 GenMarkSweep::trace("3");
 SharedHeap* sh = SharedHeap::heap();
+// Need cleared claim bits for the strong roots processing
+ClassLoaderDataGraph::clear_claimed_marks();
 sh->process_strong_roots(true,  // activate StrongRootsScope
-true,  // Collecting permanent generation.
+false, // not scavenging.
 SharedHeap::SO_AllClasses,
 &GenMarkSweep::adjust_root_pointer_closure,
 NULL,  // do not touch code cache here
-&GenMarkSweep::adjust_pointer_closure);
+&GenMarkSweep::adjust_klass_closure);
 assert(GenMarkSweep::ref_processor() == g1h->ref_processor_stw(), "Sanity");
 g1h->ref_processor_stw()->weak_oops_do(&GenMarkSweep::adjust_root_pointer_closure);
 // Now adjust pointers in remaining weak roots.  (All of which should
 GenMarkSweep::adjust_marks();
 G1AdjustPointersClosure blk;
 g1h->heap_region_iterate(&blk);
-pg->adjust_pointers();
 }
 class G1SpaceCompactClosure: public HeapRegionClosure {
 public:
 G1SpaceCompactClosure() {}
 };
 void G1MarkSweep::mark_sweep_phase4() {
 // All pointers are now adjusted, move objects accordingly
-// It is imperative that we traverse perm_gen first in phase4. All
-// classes must be allocated earlier than their instances, and traversing
-// perm_gen first makes sure that all klassOops have moved to their new
-// location before any instance does a dispatch through it's klass!
 // The ValidateMarkSweep live oops tracking expects us to traverse spaces
 // in the same order in phase2, phase3 and phase4. We don't quite do that
-// here (perm_gen first rather than last), so we tell the validate code
+// here (code and comment not fixed for perm removal), so we tell the validate code
 // to use a higher index (saved from phase2) when verifying perm_gen.
 G1CollectedHeap* g1h = G1CollectedHeap::heap();
-Generation* pg = g1h->perm_gen();
 TraceTime tm("phase 4", G1Log::fine() && Verbose, true, gclog_or_tty);
 GenMarkSweep::trace("4");
-pg->compact();
 G1SpaceCompactClosure blk;
 g1h->heap_region_iterate(&blk);
 }

comparison: src/share/vm/gc_implementation/g1/g1MarkSweep.cpp

src/share/vm/gc_implementation/g1/g1MarkSweep.cpp

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

comparison: src/share/vm/gc_implementation/g1/g1MarkSweep.cpp

src/share/vm/gc_implementation/g1/g1MarkSweep.cpp