src/share/vm/gc/g1/g1CollectorPolicy.hpp

rev 8362 : [mq]: hotspot

*** 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, 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.
*** 20,36 ****
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
! #ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTORPOLICY_HPP
! #define SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTORPOLICY_HPP
  
! #include "gc_implementation/g1/collectionSetChooser.hpp"
! #include "gc_implementation/g1/g1Allocator.hpp"
! #include "gc_implementation/g1/g1MMUTracker.hpp"
! #include "memory/collectorPolicy.hpp"
  
  // A G1CollectorPolicy makes policy decisions that determine the
  // characteristics of the collector.  Examples include:
  //   * choice of collection set.
  //   * when to collect.
--- 20,36 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
! #ifndef SHARE_VM_GC_G1_G1COLLECTORPOLICY_HPP
! #define SHARE_VM_GC_G1_G1COLLECTORPOLICY_HPP
  
! #include "gc/g1/collectionSetChooser.hpp"
! #include "gc/g1/g1Allocator.hpp"
! #include "gc/g1/g1MMUTracker.hpp"
! #include "gc/shared/collectorPolicy.hpp"
  
  // A G1CollectorPolicy makes policy decisions that determine the
  // characteristics of the collector.  Examples include:
  //   * choice of collection set.
  //   * when to collect.
*** 940,945 ****
    double n_d = (double)n;
    double avg = sum/n_d;
    return (sum_of_squares - 2.0 * avg * sum + n_d * avg * avg) / n_d;
  }
  
! #endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTORPOLICY_HPP
--- 940,945 ----
    double n_d = (double)n;
    double avg = sum/n_d;
    return (sum_of_squares - 2.0 * avg * sum + n_d * avg * avg) / n_d;
  }
  
! #endif // SHARE_VM_GC_G1_G1COLLECTORPOLICY_HPP