stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Erik Helin 2013-02-26 22:31:35 +01:00
commit 8f73f7d041
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/PermStat.java → hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/ClassLoaderStats.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 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
@ -35,16 +35,16 @@ import sun.jvm.hotspot.tools.*;
import sun.jvm.hotspot.utilities.*;
/**
A command line tool to print perm. generation statistics.
A command line tool to print class loader statistics.
*/
public class PermStat extends Tool {
public class ClassLoaderStats extends Tool {
boolean verbose = true;
public static void main(String[] args) {
PermStat ps = new PermStat();
ps.start(args);
ps.stop();
ClassLoaderStats cls = new ClassLoaderStats();
cls.start(args);
cls.stop();
}
private static class ClassData {

16
hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/JMap.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 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
@ -45,7 +45,7 @@ public class JMap extends Tool {
}
protected String getCommandFlags() {
return "-heap|-heap:format=b|-histo|-permstat|-finalizerinfo";
return "-heap|-heap:format=b|-histo|-clstats|-finalizerinfo";
}
protected void printFlagsUsage() {
@ -53,14 +53,14 @@ public class JMap extends Tool {
System.out.println(" -heap\tto print java heap summary");
System.out.println(" -heap:format=b\tto dump java heap in hprof binary format");
System.out.println(" -histo\tto print histogram of java object heap");
System.out.println(" -permstat\tto print permanent generation statistics");
System.out.println(" -clstats\tto print class loader statistics");
System.out.println(" -finalizerinfo\tto print information on objects awaiting finalization");
super.printFlagsUsage();
}
public static final int MODE_HEAP_SUMMARY = 0;
public static final int MODE_HISTOGRAM = 1;
public static final int MODE_PERMSTAT = 2;
public static final int MODE_CLSTATS = 2;
public static final int MODE_PMAP = 3;
public static final int MODE_HEAP_GRAPH_HPROF_BIN = 4;
public static final int MODE_HEAP_GRAPH_GXL = 5;
@ -78,8 +78,8 @@ public class JMap extends Tool {
tool = new ObjectHistogram();
break;
case MODE_PERMSTAT:
tool = new PermStat();
case MODE_CLSTATS:
tool = new ClassLoaderStats();
break;
case MODE_PMAP:
@ -118,7 +118,9 @@ public class JMap extends Tool {
} else if (modeFlag.equals("-histo")) {
mode = MODE_HISTOGRAM;
} else if (modeFlag.equals("-permstat")) {
mode = MODE_PERMSTAT;
mode = MODE_CLSTATS;
} else if (modeFlag.equals("-clstats")) {
mode = MODE_CLSTATS;
} else if (modeFlag.equals("-finalizerinfo")) {
mode = MODE_FINALIZERINFO;
} else {