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

*** 26,35 ****
--- 26,36 ----
  #define SHARE_VM_GC_IMPLEMENTATION_CONCURRENTMARKSWEEP_CONCURRENTMARKSWEEPGENERATION_HPP
  
  #include "gc_implementation/shared/gcHeapSummary.hpp"
  #include "gc_implementation/shared/gSpaceCounters.hpp"
  #include "gc_implementation/shared/gcStats.hpp"
+ #include "gc_implementation/shared/gcTrace.hpp"
  #include "gc_implementation/shared/gcWhen.hpp"
  #include "gc_implementation/shared/generationCounters.hpp"
  #include "memory/freeBlockDictionary.hpp"
  #include "memory/generation.hpp"
  #include "memory/iterator.hpp"
*** 1176,1186 ****
    // reset after each young gen collection.
    size_t direct_allocated_words() const { return _direct_allocated_words; }
    void reset_direct_allocated_words()   { _direct_allocated_words = 0; }
  
    // Overrides for parallel promotion.
!   virtual oop par_promote(int thread_num,
                            oop obj, markOop m, size_t word_sz);
    // This one should not be called for CMS.
    virtual void par_promote_alloc_undo(int thread_num,
                                        HeapWord* obj, size_t word_sz);
    virtual void par_promote_alloc_done(int thread_num);
--- 1177,1188 ----
    // reset after each young gen collection.
    size_t direct_allocated_words() const { return _direct_allocated_words; }
    void reset_direct_allocated_words()   { _direct_allocated_words = 0; }
  
    // Overrides for parallel promotion.
!   virtual oop par_promote(const ParNewTracer* gc_tracer,
!                           int thread_num,
                            oop obj, markOop m, size_t word_sz);
    // This one should not be called for CMS.
    virtual void par_promote_alloc_undo(int thread_num,
                                        HeapWord* obj, size_t word_sz);
    virtual void par_promote_alloc_done(int thread_num);
*** 1224,1234 ****
    void expand(size_t bytes, size_t expand_bytes,
      CMSExpansionCause::Cause cause);
    virtual bool expand(size_t bytes, size_t expand_bytes);
    void shrink(size_t bytes);
    void shrink_by(size_t bytes);
!   HeapWord* expand_and_par_lab_allocate(CMSParGCThreadState* ps, size_t word_sz);
    bool expand_and_ensure_spooling_space(PromotionInfo* promo);
  
    // Iteration support and related enquiries
    void save_marks();
    bool no_allocs_since_save_marks();
--- 1226,1240 ----
    void expand(size_t bytes, size_t expand_bytes,
      CMSExpansionCause::Cause cause);
    virtual bool expand(size_t bytes, size_t expand_bytes);
    void shrink(size_t bytes);
    void shrink_by(size_t bytes);
!   // The oop (old) is used to extract information for promotion trace event
!   HeapWord* expand_and_par_lab_allocate(CMSParGCThreadState* ps, 
!                                         const ParNewTracer* gc_tracer, 
!                                         size_t word_sz,
!                                         const oop old, const markOop m);
    bool expand_and_ensure_spooling_space(PromotionInfo* promo);
  
    // Iteration support and related enquiries
    void save_marks();
    bool no_allocs_since_save_marks();