src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp

rev 7209 : [mq]: inccms

*** 47,63 ****
  CMSCollector* ConcurrentMarkSweepThread::_collector = NULL;
  bool ConcurrentMarkSweepThread::_should_terminate = false;
  int  ConcurrentMarkSweepThread::_CMS_flag         = CMS_nil;
  
  volatile jint ConcurrentMarkSweepThread::_pending_yields      = 0;
- volatile jint ConcurrentMarkSweepThread::_pending_decrements  = 0;
- 
- volatile jint ConcurrentMarkSweepThread::_icms_disabled   = 0;
- volatile bool ConcurrentMarkSweepThread::_should_run     = false;
- // When icms is enabled, the icms thread is stopped until explicitly
- // started.
- volatile bool ConcurrentMarkSweepThread::_should_stop    = true;
  
  SurrogateLockerThread*
       ConcurrentMarkSweepThread::_slt = NULL;
  SurrogateLockerThread::SLT_msg_type
       ConcurrentMarkSweepThread::_sltBuffer = SurrogateLockerThread::empty;
--- 47,56 ----
*** 97,107 ****
      if (!DisableStartThread) {
        os::start_thread(this);
      }
    }
    _sltMonitor = SLT_lock;
-   assert(!CMSIncrementalMode || icms_is_enabled(), "Error");
  }
  
  void ConcurrentMarkSweepThread::run() {
    assert(this == cmst(), "just checking");
  
--- 90,99 ----
*** 182,196 ****
    }
    return NULL;
  }
  
  void ConcurrentMarkSweepThread::stop() {
-   if (CMSIncrementalMode) {
-     // Disable incremental mode and wake up the thread so it notices the change.
-     disable_icms();
-     start_icms();
-   }
    // it is ok to take late safepoints here, if needed
    {
      MutexLockerEx x(Terminator_lock);
      _should_terminate = true;
    }
--- 174,183 ----
*** 385,457 ****
    }
  }
  
  void ConcurrentMarkSweepThread::sleepBeforeNextCycle() {
    while (!_should_terminate) {
-     if (CMSIncrementalMode) {
-       icms_wait();
-       if(CMSWaitDuration >= 0) {
-         // Wait until the next synchronous GC, a concurrent full gc
-         // request or a timeout, whichever is earlier.
-         wait_on_cms_lock_for_scavenge(CMSWaitDuration);
-       }
-       return;
-     } else {
        if(CMSWaitDuration >= 0) {
          // Wait until the next synchronous GC, a concurrent full gc
          // request or a timeout, whichever is earlier.
          wait_on_cms_lock_for_scavenge(CMSWaitDuration);
        } else {
          // Wait until any cms_lock event or check interval not to call shouldConcurrentCollect permanently
          wait_on_cms_lock(CMSCheckInterval);
        }
-     }
      // Check if we should start a CMS collection cycle
      if (_collector->shouldConcurrentCollect()) {
        return;
      }
      // .. collection criterion not yet met, let's go back
      // and wait some more
    }
  }
  
- // Incremental CMS
- void ConcurrentMarkSweepThread::start_icms() {
-   assert(UseConcMarkSweepGC && CMSIncrementalMode, "just checking");
-   MutexLockerEx x(iCMS_lock, Mutex::_no_safepoint_check_flag);
-   trace_state("start_icms");
-   _should_run = true;
-   iCMS_lock->notify_all();
- }
- 
- void ConcurrentMarkSweepThread::stop_icms() {
-   assert(UseConcMarkSweepGC && CMSIncrementalMode, "just checking");
-   MutexLockerEx x(iCMS_lock, Mutex::_no_safepoint_check_flag);
-   if (!_should_stop) {
-     trace_state("stop_icms");
-     _should_stop = true;
-     _should_run = false;
-     asynchronous_yield_request();
-     iCMS_lock->notify_all();
-   }
- }
- 
- void ConcurrentMarkSweepThread::icms_wait() {
-   assert(UseConcMarkSweepGC && CMSIncrementalMode, "just checking");
-   if (_should_stop && icms_is_enabled()) {
-     MutexLockerEx x(iCMS_lock, Mutex::_no_safepoint_check_flag);
-     trace_state("pause_icms");
-     _collector->stats().stop_cms_timer();
-     while(!_should_run && icms_is_enabled()) {
-       iCMS_lock->wait(Mutex::_no_safepoint_check_flag);
-     }
-     _collector->stats().start_cms_timer();
-     _should_stop = false;
-     trace_state("pause_icms end");
-   }
- }
- 
  // Note: this method, although exported by the ConcurrentMarkSweepThread,
  // which is a non-JavaThread, can only be called by a JavaThread.
  // Currently this is done at vm creation time (post-vm-init) by the
  // main/Primordial (Java)Thread.
  // XXX Consider changing this in the future to allow the CMS thread
--- 372,398 ----