hotspot/src/share/vm/memory/heap.cpp

rev 611 : Merge

*** 1,10 ****
  #ifdef USE_PRAGMA_IDENT_SRC
  #pragma ident "@(#)heap.cpp     1.55 07/10/04 10:49:31 JVM"
  #endif
  /*
!  * Copyright 1997-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 "@(#)heap.cpp     1.55 07/10/04 10:49:31 JVM"
  #endif
  /*
!  * Copyright 1997-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.
*** 103,122 ****
  
    _segment_size      = segment_size;
    _log2_segment_size = exact_log2(segment_size);
  
    // Reserve and initialize space for _memory.
!   const size_t page_size = os::page_size_for_region(committed_size,
!                                                     reserved_size, 8);
    const size_t granularity = os::vm_allocation_granularity();
    const size_t r_align = MAX2(page_size, granularity);
    const size_t r_size = align_size_up(reserved_size, r_align);
    const size_t c_size = align_size_up(committed_size, page_size);
    
    const size_t rs_align = page_size == (size_t) os::vm_page_size() ? 0 :
      MAX2(page_size, granularity);
!   ReservedSpace rs(r_size, rs_align, false);
    os::trace_page_sizes("code heap", committed_size, reserved_size, page_size,
                         rs.base(), rs.size());
    if (!_memory.initialize(rs, c_size)) {
      return false;
    }
--- 103,123 ----
  
    _segment_size      = segment_size;
    _log2_segment_size = exact_log2(segment_size);
  
    // Reserve and initialize space for _memory.
!   const size_t page_size = os::can_execute_large_page_memory() ?
!           os::page_size_for_region(committed_size, reserved_size, 8) :
!           os::vm_page_size();
    const size_t granularity = os::vm_allocation_granularity();
    const size_t r_align = MAX2(page_size, granularity);
    const size_t r_size = align_size_up(reserved_size, r_align);
    const size_t c_size = align_size_up(committed_size, page_size);
    
    const size_t rs_align = page_size == (size_t) os::vm_page_size() ? 0 :
      MAX2(page_size, granularity);
!   ReservedSpace rs(r_size, rs_align, rs_align > 0);
    os::trace_page_sizes("code heap", committed_size, reserved_size, page_size,
                         rs.base(), rs.size());
    if (!_memory.initialize(rs, c_size)) {
      return false;
    }