hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp

rev 611 : Merge

*** 1,10 ****
  #ifdef USE_PRAGMA_IDENT_SRC
  #pragma ident "@(#)parMarkBitMap.cpp    1.31 07/10/04 10:49:33 JVM"
  #endif
  /*
!  * Copyright 2005-2006 Sun Microsystems, Inc.  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,10 ----
  #ifdef USE_PRAGMA_IDENT_SRC
  #pragma ident "@(#)parMarkBitMap.cpp    1.31 07/10/04 10:49:33 JVM"
  #endif
  /*
!  * Copyright 2005-2008 Sun Microsystems, Inc.  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.
*** 42,52 ****
    const size_t granularity = os::vm_allocation_granularity();
    const size_t bytes = align_size_up(raw_bytes, MAX2(page_sz, granularity));
  
    const size_t rs_align = page_sz == (size_t) os::vm_page_size() ? 0 :
      MAX2(page_sz, granularity);
!   ReservedSpace rs(bytes, rs_align, false);
    os::trace_page_sizes("par bitmap", raw_bytes, raw_bytes, page_sz,
                         rs.base(), rs.size());
    _virtual_space = new PSVirtualSpace(rs, page_sz);
    if (_virtual_space != NULL && _virtual_space->expand_by(bytes)) {
      _region_start = covered_region.start();
--- 42,52 ----
    const size_t granularity = os::vm_allocation_granularity();
    const size_t bytes = align_size_up(raw_bytes, MAX2(page_sz, granularity));
  
    const size_t rs_align = page_sz == (size_t) os::vm_page_size() ? 0 :
      MAX2(page_sz, granularity);
!   ReservedSpace rs(bytes, rs_align, rs_align > 0);
    os::trace_page_sizes("par bitmap", raw_bytes, raw_bytes, page_sz,
                         rs.base(), rs.size());
    _virtual_space = new PSVirtualSpace(rs, page_sz);
    if (_virtual_space != NULL && _virtual_space->expand_by(bytes)) {
      _region_start = covered_region.start();
*** 62,71 ****
--- 62,73 ----
    _region_start = 0;
    _region_size = 0;
    if (_virtual_space != NULL) {
      delete _virtual_space;
      _virtual_space = NULL;
+     // Release memory reserved in the space.
+     rs.release();
    }
    return false;
  }
  
  #ifdef ASSERT