changeset 12923:ab8c2b15a29a

Merge
author dlong
date Sat, 17 Oct 2015 15:41:07 -0400
parents 6bacc922bef7 8ed2bee756d6
children eb6219ff2930 9fef91483af7
files
diffstat 4 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/make/src/classes/build/tools/module/boot.modules	Thu Oct 15 13:23:25 2015 +0200
+++ b/make/src/classes/build/tools/module/boot.modules	Sat Oct 17 15:41:07 2015 -0400
@@ -29,3 +29,4 @@
 jdk.security.auth
 jdk.security.jgss
 jdk.snmp
+jdk.vm.ci
--- a/src/java.management/share/classes/sun/management/CompilerThreadStat.java	Thu Oct 15 13:23:25 2015 +0200
+++ b/src/java.management/share/classes/sun/management/CompilerThreadStat.java	Sat Oct 17 15:41:07 2015 -0400
@@ -27,6 +27,7 @@
 
 /**
  */
+@Deprecated
 public class CompilerThreadStat implements java.io.Serializable {
     private String name;
     private long taskCount;
--- a/src/java.management/share/classes/sun/management/HotspotCompilation.java	Thu Oct 15 13:23:25 2015 +0200
+++ b/src/java.management/share/classes/sun/management/HotspotCompilation.java	Sat Oct 17 15:41:07 2015 -0400
@@ -90,6 +90,7 @@
             this.time = (LongCounter) lookup(basename + "time");
         }
 
+        @SuppressWarnings("deprecation")
         CompilerThreadStat getCompilerThreadStat() {
             MethodInfo minfo = new MethodInfo(method.stringValue(),
                                               (int) type.longValue(),
@@ -182,6 +183,7 @@
         return nmethodSize.longValue();
     }
 
+    @Deprecated
     public List<CompilerThreadStat> getCompilerThreadStats() {
         List<CompilerThreadStat> list = new ArrayList<>(threads.size());
         for (CompilerThreadInfo info : threads) {
--- a/src/java.management/share/classes/sun/management/HotspotCompilationMBean.java	Thu Oct 15 13:23:25 2015 +0200
+++ b/src/java.management/share/classes/sun/management/HotspotCompilationMBean.java	Sat Oct 17 15:41:07 2015 -0400
@@ -46,6 +46,7 @@
      * the statistic of a compiler thread.
      *
      */
+    @Deprecated
     public java.util.List<CompilerThreadStat> getCompilerThreadStats();
 
     /**