src/hotspot/share/gc/g1/g1RootClosures.cpp

rev 49826 : imported patch 6672778-partial-queue-trimming
rev 49827 : imported patch 6672778-refactoring

*** 35,57 ****
    G1EvacuationClosures(G1CollectedHeap* g1h,
                         G1ParScanThreadState* pss,
                         bool in_young_gc) :
        _closures(g1h, pss, in_young_gc, /* must_claim_cld */ false) {}
  
!   OopClosure* weak_oops()   { return &_closures._buffered_oops; }
!   OopClosure* strong_oops() { return &_closures._buffered_oops; }
  
    CLDClosure* weak_clds()             { return &_closures._clds; }
    CLDClosure* strong_clds()           { return &_closures._clds; }
    CLDClosure* second_pass_weak_clds() { return NULL; }
  
    CodeBlobClosure* strong_codeblobs()      { return &_closures._codeblobs; }
    CodeBlobClosure* weak_codeblobs()        { return &_closures._codeblobs; }
  
-   void flush()                 { _closures._buffered_oops.done(); }
-   double closure_app_seconds() { return _closures._buffered_oops.closure_app_seconds(); }
- 
    OopClosure* raw_strong_oops() { return &_closures._oops; }
  
    bool trace_metadata()         { return false; }
  };
  
--- 35,54 ----
    G1EvacuationClosures(G1CollectedHeap* g1h,
                         G1ParScanThreadState* pss,
                         bool in_young_gc) :
        _closures(g1h, pss, in_young_gc, /* must_claim_cld */ false) {}
  
!   OopClosure* weak_oops()   { return &_closures._oops; }
!   OopClosure* strong_oops() { return &_closures._oops; }
  
    CLDClosure* weak_clds()             { return &_closures._clds; }
    CLDClosure* strong_clds()           { return &_closures._clds; }
    CLDClosure* second_pass_weak_clds() { return NULL; }
  
    CodeBlobClosure* strong_codeblobs()      { return &_closures._codeblobs; }
    CodeBlobClosure* weak_codeblobs()        { return &_closures._codeblobs; }
  
    OopClosure* raw_strong_oops() { return &_closures._oops; }
  
    bool trace_metadata()         { return false; }
  };
  
*** 77,88 ****
    G1InitialMarkClosures(G1CollectedHeap* g1h,
                          G1ParScanThreadState* pss) :
        _strong(g1h, pss, /* process_only_dirty_klasses */ false, /* must_claim_cld */ true),
        _weak(g1h, pss,   /* process_only_dirty_klasses */ false, /* must_claim_cld */ true) {}
  
!   OopClosure* weak_oops()   { return &_weak._buffered_oops; }
!   OopClosure* strong_oops() { return &_strong._buffered_oops; }
  
    // If MarkWeak is G1MarkPromotedFromRoot then the weak CLDs must be processed in a second pass.
    CLDClosure* weak_clds()             { return null_if<G1MarkPromotedFromRoot>(&_weak._clds); }
    CLDClosure* strong_clds()           { return &_strong._clds; }
  
--- 74,85 ----
    G1InitialMarkClosures(G1CollectedHeap* g1h,
                          G1ParScanThreadState* pss) :
        _strong(g1h, pss, /* process_only_dirty_klasses */ false, /* must_claim_cld */ true),
        _weak(g1h, pss,   /* process_only_dirty_klasses */ false, /* must_claim_cld */ true) {}
  
!   OopClosure* weak_oops()   { return &_weak._oops; }
!   OopClosure* strong_oops() { return &_strong._oops; }
  
    // If MarkWeak is G1MarkPromotedFromRoot then the weak CLDs must be processed in a second pass.
    CLDClosure* weak_clds()             { return null_if<G1MarkPromotedFromRoot>(&_weak._clds); }
    CLDClosure* strong_clds()           { return &_strong._clds; }
  
*** 91,110 ****
    CLDClosure* second_pass_weak_clds() { return null_if<G1MarkFromRoot>(&_weak._clds); }
  
    CodeBlobClosure* strong_codeblobs()      { return &_strong._codeblobs; }
    CodeBlobClosure* weak_codeblobs()        { return &_weak._codeblobs; }
  
-   void flush() {
-     _strong._buffered_oops.done();
-     _weak._buffered_oops.done();
-   }
- 
-   double closure_app_seconds() {
-     return _strong._buffered_oops.closure_app_seconds() +
-            _weak._buffered_oops.closure_app_seconds();
-   }
- 
    OopClosure* raw_strong_oops() { return &_strong._oops; }
  
    // If we are not marking all weak roots then we are tracing
    // which metadata is alive.
    bool trace_metadata()         { return MarkWeak == G1MarkPromotedFromRoot; }
--- 88,97 ----