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

rev 13257 : [mq]: 8184346-cleanup-g1cmbitmap
rev 13259 : [mq]: 8184347-move-g1cmbitmap-into-own-files
rev 13261 : imported patch 8184348-merge-par_mark-and_gray_root
rev 13262 : imported patch 8184348-ashipilev-review

*** 545,564 ****
    uint scale_parallel_threads(uint n_par_threads);
  
    // Calculates the number of GC threads to be used in a concurrent phase.
    uint calc_parallel_marking_threads();
  
-   // The following three are interaction between CM and
-   // G1CollectedHeap
- 
-   // This notifies CM that a root during initial-mark needs to be
-   // grayed. It is MT-safe. hr is the region that
-   // contains the object and it's passed optionally from callers who
-   // might already have it (no point in recalculating it).
-   inline void grayRoot(oop obj,
-                        HeapRegion* hr = NULL);
- 
    // Prepare internal data structures for the next mark cycle. This includes clearing
    // the next mark bitmap and some internal data structures. This method is intended
    // to be called concurrently to the mutator. It will yield to safepoint requests.
    void cleanup_for_next_mark();
  
--- 545,554 ----
*** 621,632 ****
    void print_worker_threads_on(outputStream* st) const;
    void threads_do(ThreadClosure* tc) const;
  
    void print_on_error(outputStream* st) const;
  
!   // Attempts to mark the given object on the next mark bitmap.
!   inline bool par_mark(oop obj);
  
    // Returns true if initialization was successfully completed.
    bool completed_initialization() const {
      return _completed_initialization;
    }
--- 611,624 ----
    void print_worker_threads_on(outputStream* st) const;
    void threads_do(ThreadClosure* tc) const;
  
    void print_on_error(outputStream* st) const;
  
!   // Mark the given object on the next bitmap if it is below nTAMS. Returns whether
!   // the mark has been actually set.
!   inline bool mark_in_next_bitmap(HeapRegion* const hr, oop const obj);
!   inline bool mark_in_next_bitmap(oop const obj);
  
    // Returns true if initialization was successfully completed.
    bool completed_initialization() const {
      return _completed_initialization;
    }