src/share/vm/gc/g1/g1RemSet.hpp

rev 9085 : imported patch stefank-patch2
rev 9087 : imported patch parpush

*** 28,39 ****
  #include "gc/g1/g1RemSetSummary.hpp"
  
  // A G1RemSet provides ways of iterating over pointers into a selected
  // collection set.
  
- class G1CollectedHeap;
  class ConcurrentG1Refine;
  class G1ParPushHeapRSClosure;
  
  // A G1RemSet in which each heap region has a rem set that records the
  // external heap references into it.  Uses a mod ref bs to track updates,
  // so that they can be used to update the individual region remsets.
--- 28,40 ----
  #include "gc/g1/g1RemSetSummary.hpp"
  
  // A G1RemSet provides ways of iterating over pointers into a selected
  // collection set.
  
  class ConcurrentG1Refine;
+ class G1CollectedHeap;
+ class G1EvacuationRootClosures;
  class G1ParPushHeapRSClosure;
  
  // A G1RemSet in which each heap region has a rem set that records the
  // external heap references into it.  Uses a mod ref bs to track updates,
  // so that they can be used to update the individual region remsets.
*** 92,115 ****
    // the "i" passed to the calling thread's work(i) function.
    // In the sequential case this param will be ignored.
    //
    // Returns the number of cards scanned while looking for pointers
    // into the collection set.
!   size_t oops_into_collection_set_do(G1ParPushHeapRSClosure* blk,
!                                      CodeBlobClosure* heap_region_codeblobs,
                                       uint worker_i);
  
    // Prepare for and cleanup after an oops_into_collection_set_do
    // call.  Must call each of these once before and after (in sequential
    // code) any threads call oops_into_collection_set_do.  (This offers an
    // opportunity to sequential setup and teardown of structures needed by a
    // parallel iteration over the CS's RS.)
    void prepare_for_oops_into_collection_set_do();
    void cleanup_after_oops_into_collection_set_do();
  
!   size_t scanRS(G1ParPushHeapRSClosure* oc,
!                 CodeBlobClosure* heap_region_codeblobs,
                  uint worker_i);
  
    void updateRS(DirtyCardQueue* into_cset_dcq, uint worker_i);
  
    CardTableModRefBS* ct_bs() { return _ct_bs; }
--- 93,114 ----
    // the "i" passed to the calling thread's work(i) function.
    // In the sequential case this param will be ignored.
    //
    // Returns the number of cards scanned while looking for pointers
    // into the collection set.
!   size_t oops_into_collection_set_do(G1EvacuationRootClosures* closures,
                                       uint worker_i);
  
    // Prepare for and cleanup after an oops_into_collection_set_do
    // call.  Must call each of these once before and after (in sequential
    // code) any threads call oops_into_collection_set_do.  (This offers an
    // opportunity to sequential setup and teardown of structures needed by a
    // parallel iteration over the CS's RS.)
    void prepare_for_oops_into_collection_set_do();
    void cleanup_after_oops_into_collection_set_do();
  
!   size_t scanRS(G1EvacuationRootClosures* closures,
                  uint worker_i);
  
    void updateRS(DirtyCardQueue* into_cset_dcq, uint worker_i);
  
    CardTableModRefBS* ct_bs() { return _ct_bs; }