Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/.hgtags	Wed Mar 04 01:20:40 2015 -0500
     1.2 +++ b/.hgtags	Wed Mar 04 01:31:16 2015 -0500
     1.3 @@ -593,3 +593,5 @@
     1.4  38f6080523831ae9a6907c780f2042b82f3213ca jdk8u60-b02
     1.5  9d6eb2757167744a17ea71f8b860430d70941eda jdk8u60-b03
     1.6  0fb1ac49ae7764c5d7c6dfb9fe046d0e1a4eb5aa hs25.60-b04
     1.7 +586a449cd30332dd53c0f74bf2ead6f3d4724bfc jdk8u60-b04
     1.8 +74931e85352be8556eaa511ca0dd7c38fe272ec3 hs25.60-b05

     2.1 --- a/make/hotspot_version	Wed Mar 04 01:20:40 2015 -0500
     2.2 +++ b/make/hotspot_version	Wed Mar 04 01:31:16 2015 -0500
     2.3 @@ -35,7 +35,7 @@
     2.4  
     2.5  HS_MAJOR_VER=25
     2.6  HS_MINOR_VER=60
     2.7 -HS_BUILD_NUMBER=05
     2.8 +HS_BUILD_NUMBER=06
     2.9  
    2.10  JDK_MAJOR_VER=1
    2.11  JDK_MINOR_VER=8

     3.1 --- a/src/share/vm/runtime/arguments.cpp	Wed Mar 04 01:20:40 2015 -0500
     3.2 +++ b/src/share/vm/runtime/arguments.cpp	Wed Mar 04 01:31:16 2015 -0500
     3.3 @@ -1572,7 +1572,7 @@
     3.4  
     3.5  void Arguments::select_gc() {
     3.6    if (!gc_selected()) {
     3.7 -    ArgumentsExt::select_gc_ergonomically();
     3.8 +    select_gc_ergonomically();
     3.9    }
    3.10  }
    3.11  
    3.12 @@ -2067,7 +2067,7 @@
    3.13  }
    3.14  
    3.15  // Check consistency of GC selection
    3.16 -bool Arguments::check_gc_consistency_user() {
    3.17 +bool Arguments::check_gc_consistency() {
    3.18    check_gclog_consistency();
    3.19    bool status = true;
    3.20    // Ensure that the user has not selected conflicting sets
    3.21 @@ -2233,7 +2233,7 @@
    3.22      FLAG_SET_DEFAULT(UseGCOverheadLimit, false);
    3.23    }
    3.24  
    3.25 -  status = status && check_gc_consistency_user();
    3.26 +  status = status && check_gc_consistency();
    3.27    status = status && check_stack_pages();
    3.28  
    3.29    if (CMSIncrementalMode) {
    3.30 @@ -4006,7 +4006,7 @@
    3.31    set_shared_spaces_flags();
    3.32  
    3.33    // Check the GC selections again.
    3.34 -  if (!ArgumentsExt::check_gc_consistency_ergo()) {
    3.35 +  if (!check_gc_consistency()) {
    3.36      return JNI_EINVAL;
    3.37    }
    3.38  

     4.1 --- a/src/share/vm/runtime/arguments.hpp	Wed Mar 04 01:20:40 2015 -0500
     4.2 +++ b/src/share/vm/runtime/arguments.hpp	Wed Mar 04 01:31:16 2015 -0500
     4.3 @@ -466,8 +466,7 @@
     4.4    static bool verify_MaxHeapFreeRatio(FormatBuffer<80>& err_msg, uintx max_heap_free_ratio);
     4.5  
     4.6    // Check for consistency in the selection of the garbage collector.
     4.7 -  static bool check_gc_consistency_user();        // Check user-selected gc
     4.8 -  static inline bool check_gc_consistency_ergo(); // Check ergonomic-selected gc
     4.9 +  static bool check_gc_consistency();        // Check user-selected gc
    4.10    static void check_deprecated_gcs();
    4.11    static void check_deprecated_gc_flags();
    4.12    // Check consistecy or otherwise of VM argument settings
    4.13 @@ -615,8 +614,4 @@
    4.14      UseParNewGC || UseSerialGC;
    4.15  }
    4.16  
    4.17 -bool Arguments::check_gc_consistency_ergo() {
    4.18 -  return check_gc_consistency_user();
    4.19 -}
    4.20 -
    4.21  #endif // SHARE_VM_RUNTIME_ARGUMENTS_HPP

     5.1 --- a/src/share/vm/runtime/arguments_ext.hpp	Wed Mar 04 01:20:40 2015 -0500
     5.2 +++ b/src/share/vm/runtime/arguments_ext.hpp	Wed Mar 04 01:31:16 2015 -0500
     5.3 @@ -30,22 +30,12 @@
     5.4  
     5.5  class ArgumentsExt: AllStatic {
     5.6  public:
     5.7 -  static inline void select_gc_ergonomically();
     5.8    static inline void set_gc_specific_flags();
     5.9 -  static inline bool check_gc_consistency_ergo();
    5.10    static        void process_options(const JavaVMInitArgs* args) {}
    5.11  };
    5.12  
    5.13 -void ArgumentsExt::select_gc_ergonomically() {
    5.14 -  Arguments::select_gc_ergonomically();
    5.15 -}
    5.16 -
    5.17  void ArgumentsExt::set_gc_specific_flags() {
    5.18    Arguments::set_gc_specific_flags();
    5.19  }
    5.20  
    5.21 -bool ArgumentsExt::check_gc_consistency_ergo() {
    5.22 -  return Arguments::check_gc_consistency_ergo();
    5.23 -}
    5.24 -
    5.25  #endif // SHARE_VM_RUNTIME_ARGUMENTS_EXT_HPP