src/hotspot/share/gc/z/zDriver.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 39,49 ****
  static const ZStatPhaseCycle      ZPhaseCycle("Garbage Collection Cycle");
  static const ZStatPhasePause      ZPhasePauseMarkStart("Pause Mark Start");
  static const ZStatPhaseConcurrent ZPhaseConcurrentMark("Concurrent Mark");
  static const ZStatPhaseConcurrent ZPhaseConcurrentMarkContinue("Concurrent Mark Continue");
  static const ZStatPhasePause      ZPhasePauseMarkEnd("Pause Mark End");
! static const ZStatPhaseConcurrent ZPhaseConcurrentWeakProcessing("Concurrent Weak Processing");
  static const ZStatPhaseConcurrent ZPhaseConcurrentResetRelocationSet("Concurrent Reset Relocation Set");
  static const ZStatPhaseConcurrent ZPhaseConcurrentDestroyDetachedPages("Concurrent Destroy Detached Pages");
  static const ZStatPhaseConcurrent ZPhaseConcurrentSelectRelocationSet("Concurrent Select Relocation Set");
  static const ZStatPhaseConcurrent ZPhaseConcurrentPrepareRelocationSet("Concurrent Prepare Relocation Set");
  static const ZStatPhasePause      ZPhasePauseRelocateStart("Pause Relocate Start");
--- 39,49 ----
  static const ZStatPhaseCycle      ZPhaseCycle("Garbage Collection Cycle");
  static const ZStatPhasePause      ZPhasePauseMarkStart("Pause Mark Start");
  static const ZStatPhaseConcurrent ZPhaseConcurrentMark("Concurrent Mark");
  static const ZStatPhaseConcurrent ZPhaseConcurrentMarkContinue("Concurrent Mark Continue");
  static const ZStatPhasePause      ZPhasePauseMarkEnd("Pause Mark End");
! static const ZStatPhaseConcurrent ZPhaseConcurrentProcessNonStrongReferences("Concurrent Process Non-Strong References");
  static const ZStatPhaseConcurrent ZPhaseConcurrentResetRelocationSet("Concurrent Reset Relocation Set");
  static const ZStatPhaseConcurrent ZPhaseConcurrentDestroyDetachedPages("Concurrent Destroy Detached Pages");
  static const ZStatPhaseConcurrent ZPhaseConcurrentSelectRelocationSet("Concurrent Select Relocation Set");
  static const ZStatPhaseConcurrent ZPhaseConcurrentPrepareRelocationSet("Concurrent Prepare Relocation Set");
  static const ZStatPhasePause      ZPhasePauseRelocateStart("Pause Relocate Start");
*** 321,334 ****
        ZStatTimer timer(ZPhaseConcurrentMarkContinue);
        ZHeap::heap()->mark();
      }
    }
  
!   // Phase 4: Concurrent Reference Processing
    {
!     ZStatTimer timer(ZPhaseConcurrentWeakProcessing);
!     ZHeap::heap()->concurrent_weak_processing();
    }
  
    // Phase 5: Concurrent Reset Relocation Set
    {
      ZStatTimer timer(ZPhaseConcurrentResetRelocationSet);
--- 321,334 ----
        ZStatTimer timer(ZPhaseConcurrentMarkContinue);
        ZHeap::heap()->mark();
      }
    }
  
!   // Phase 4: Concurrent Process Non-Strong References
    {
!     ZStatTimer timer(ZPhaseConcurrentProcessNonStrongReferences);
!     ZHeap::heap()->process_non_strong_references();
    }
  
    // Phase 5: Concurrent Reset Relocation Set
    {
      ZStatTimer timer(ZPhaseConcurrentResetRelocationSet);