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

rev 5869 : [mq]: free-cset-base

*** 1,7 ****
  /*
!  * Copyright (c) 2001, 2013, 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, 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.
*** 842,855 ****
    // adding it to the free list that's passed as a parameter (this is
    // usually a local list which will be appended to the master free
    // list later). The used bytes of freed regions are accumulated in
    // pre_used. If par is true, the region's RSet will not be freed
    // up. The assumption is that this will be done later.
    void free_region(HeapRegion* hr,
                     size_t* pre_used,
                     FreeRegionList* free_list,
!                    bool par);
  
    // Frees a humongous region by collapsing it into individual regions
    // and calling free_region() for each of them. The freed regions
    // will be added to the free list that's passed as a parameter (this
    // is usually a local list which will be appended to the master free
--- 842,857 ----
    // adding it to the free list that's passed as a parameter (this is
    // usually a local list which will be appended to the master free
    // list later). The used bytes of freed regions are accumulated in
    // pre_used. If par is true, the region's RSet will not be freed
    // up. The assumption is that this will be done later.
+   // The locked parameter indicates if the caller has already taken
+   // care of proper synchronization. This may allow some optimizations.
    void free_region(HeapRegion* hr,
                     size_t* pre_used,
                     FreeRegionList* free_list,
!                    bool par, bool locked = false);
  
    // Frees a humongous region by collapsing it into individual regions
    // and calling free_region() for each of them. The freed regions
    // will be added to the free list that's passed as a parameter (this
    // is usually a local list which will be appended to the master free