src/share/vm/gc/cms/concurrentMarkSweepGeneration.hpp

*** 33,42 ****
--- 33,43 ----
  #include "gc/shared/gcStats.hpp"
  #include "gc/shared/gcWhen.hpp"
  #include "gc/shared/generationCounters.hpp"
  #include "gc/shared/space.hpp"
  #include "gc/shared/taskqueue.hpp"
+ #include "logging/log.hpp"
  #include "memory/freeBlockDictionary.hpp"
  #include "memory/iterator.hpp"
  #include "memory/virtualspace.hpp"
  #include "runtime/mutexLocker.hpp"
  #include "services/memoryService.hpp"
*** 306,318 ****
      return _array[n];
    }
  
    void reset() {
      _index = 0;
!     if (_overflows > 0 && PrintCMSStatistics > 1) {
!       warning("CMS: ChunkArray[" SIZE_FORMAT "] overflowed " SIZE_FORMAT " times",
!               _capacity, _overflows);
      }
      _overflows = 0;
    }
  
    void record_sample(HeapWord* p, size_t sz) {
--- 307,318 ----
      return _array[n];
    }
  
    void reset() {
      _index = 0;
!     if (_overflows > 0) {
!       log_trace(gc)("CMS: ChunkArray[" SIZE_FORMAT "] overflowed " SIZE_FORMAT " times", _capacity, _overflows);
      }
      _overflows = 0;
    }
  
    void record_sample(HeapWord* p, size_t sz) {
*** 449,459 ****
  
    // End of higher level statistics.
  
    // Debugging.
    void print_on(outputStream* st) const PRODUCT_RETURN;
!   void print() const { print_on(gclog_or_tty); }
  };
  
  // A closure related to weak references processing which
  // we embed in the CMSCollector, since we need to pass
  // it to the reference processor for secondary filtering
--- 449,459 ----
  
    // End of higher level statistics.
  
    // Debugging.
    void print_on(outputStream* st) const PRODUCT_RETURN;
!   void print() const { print_on(tty); }
  };
  
  // A closure related to weak references processing which
  // we embed in the CMSCollector, since we need to pass
  // it to the reference processor for secondary filtering
*** 933,943 ****
  
    // Timer stuff
    void    startTimer() { assert(!_timer.is_active(), "Error"); _timer.start();   }
    void    stopTimer()  { assert( _timer.is_active(), "Error"); _timer.stop();    }
    void    resetTimer() { assert(!_timer.is_active(), "Error"); _timer.reset();   }
!   double  timerValue() { assert(!_timer.is_active(), "Error"); return _timer.seconds(); }
  
    int  yields()          { return _numYields; }
    void resetYields()     { _numYields = 0;    }
    void incrementYields() { _numYields++;      }
    void resetNumDirtyCards()               { _numDirtyCards = 0; }
--- 933,943 ----
  
    // Timer stuff
    void    startTimer() { assert(!_timer.is_active(), "Error"); _timer.start();   }
    void    stopTimer()  { assert( _timer.is_active(), "Error"); _timer.stop();    }
    void    resetTimer() { assert(!_timer.is_active(), "Error"); _timer.reset();   }
!   jlong   timerTicks() { assert(!_timer.is_active(), "Error"); return _timer.ticks(); }
  
    int  yields()          { return _numYields; }
    void resetYields()     { _numYields = 0;    }
    void incrementYields() { _numYields++;      }
    void resetNumDirtyCards()               { _numDirtyCards = 0; }
*** 959,969 ****
  
    static void print_on_error(outputStream* st);
  
    // Debugging
    void verify();
!   bool verify_after_remark(bool silent = VerifySilently);
    void verify_ok_to_terminate() const PRODUCT_RETURN;
    void verify_work_stacks_empty() const PRODUCT_RETURN;
    void verify_overflow_empty() const PRODUCT_RETURN;
  
    // Convenience methods in support of debugging
--- 959,969 ----
  
    static void print_on_error(outputStream* st);
  
    // Debugging
    void verify();
!   bool verify_after_remark();
    void verify_ok_to_terminate() const PRODUCT_RETURN;
    void verify_work_stacks_empty() const PRODUCT_RETURN;
    void verify_overflow_empty() const PRODUCT_RETURN;
  
    // Convenience methods in support of debugging
*** 1232,1242 ****
  
    // Printing
    const char* name() const;
    virtual const char* short_name() const { return "CMS"; }
    void        print() const;
-   void printOccupancy(const char* s);
  
    // Resize the generation after a compacting GC.  The
    // generation can be treated as a contiguous space
    // after the compaction.
    virtual void compute_new_size();
--- 1232,1241 ----