src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp

*** 1,7 ****
  /*
!  * Copyright (c) 2001, 2014, 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) 2001, 2015, 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.
*** 798,808 ****
                          uint worker_i);
  
    // The concurrent marker (and the thread it runs in.)
    ConcurrentMark* _cm;
    ConcurrentMarkThread* _cmThread;
-   bool _mark_in_progress;
  
    // The concurrent refiner.
    ConcurrentG1Refine* _cg1r;
  
    // The parallel task queues
--- 798,807 ----
*** 1441,1459 ****
    // that this is always a safe operation, since it doesn't clear any
    // bits.
    void markModUnionRange(MemRegion mr);
  
    // Records the fact that a marking phase is no longer in progress.
!   void set_marking_complete() {
!     _mark_in_progress = false;
!   }
!   void set_marking_started() {
!     _mark_in_progress = true;
!   }
!   bool mark_in_progress() {
!     return _mark_in_progress;
!   }
  
    // Print the maximum heap capacity.
    virtual size_t max_capacity() const;
  
    virtual jlong millis_since_last_gc();
--- 1440,1452 ----
    // that this is always a safe operation, since it doesn't clear any
    // bits.
    void markModUnionRange(MemRegion mr);
  
    // Records the fact that a marking phase is no longer in progress.
!   void set_marking_complete();
!   void set_marking_started();
!   bool mark_in_progress();
  
    // Print the maximum heap capacity.
    virtual size_t max_capacity() const;
  
    virtual jlong millis_since_last_gc();