#71 内存各代大小的数据获取改回用JMX

vipshop · Aug 7, 2018 · d9f0669 · d9f0669
1 parent 21892cf
commit d9f0669
Showing 1 changed file with 25 additions and 54 deletions.
diff --git a/vjtop/src/main/java/com/vip/vjtools/vjtop/VMInfo.java b/vjtop/src/main/java/com/vip/vjtools/vjtop/VMInfo.java
@@ -310,68 +310,39 @@ private void updateClassLoad() throws IOException {
 	private void updateMemoryPool() throws IOException {
 		JmxMemoryPoolManager memoryPoolManager = jmxClient.getMemoryPoolManager();
 
-		// 优先从perfData取值
-		if (perfDataSupport) {
-			// eden
-			edenUsedBytes = (long) perfCounters.get("sun.gc.generation.0.space.0.used").getValue();
-			edenMaxBytes = (long) perfCounters.get("sun.gc.generation.0.space.0.capacity").getValue();
-
-			// old gen
-			oldUsedBytes = (long) perfCounters.get("sun.gc.generation.1.space.0.used").getValue();
-			oldMaxBytes = (long) perfCounters.get("sun.gc.generation.1.space.0.capacity").getValue();
-
-			// survivor
-			surUsedBytes = (long) perfCounters.get("sun.gc.generation.0.space.1.used").getValue()
-					+ (long) perfCounters.get("sun.gc.generation.0.space.2.used").getValue();
-			surMaxBytes = (long) perfCounters.get("sun.gc.generation.0.space.1.capacity").getValue()
-					+ (long) perfCounters.get("sun.gc.generation.0.space.2.capacity").getValue();
-
-			if (jvmMajorVersion >= 8) {
-				// meta space
-				permUsedBytes = (long) perfCounters.get("sun.gc.metaspace.used").getValue();
-				permMaxBytes = (long) perfCounters.get("sun.gc.metaspace.capacity").getValue();
-
-				// compressed class space
-				ccsUsedBytes = (long) perfCounters.get("sun.gc.compressedclassspace.used").getValue();
-				ccsMaxBytes = (long) perfCounters.get("sun.gc.compressedclassspace.capacity").getValue();
-			} else {
-				// perm gen
-				permUsedBytes = memoryPoolManager.getPermMemoryPool().getUsage().getUsed();
-				permMaxBytes = getMemoryPoolMaxOrCommited(memoryPoolManager.getPermMemoryPool());
-			}
-		} else {
-			// eden
-			edenUsedBytes = memoryPoolManager.getEdenMemoryPool().getUsage().getUsed();
-			edenMaxBytes = getMemoryPoolMaxOrCommited(memoryPoolManager.getEdenMemoryPool());
-
-			// old gen
-			oldUsedBytes = memoryPoolManager.getOldMemoryPool().getUsage().getUsed();
-			oldMaxBytes = getMemoryPoolMaxOrCommited(memoryPoolManager.getOldMemoryPool());
-
-			// survivor
-			MemoryPoolMXBean survivorMemoryPool = memoryPoolManager.getSurvivorMemoryPool();
-			if (survivorMemoryPool != null) {
-				surUsedBytes = survivorMemoryPool.getUsage().getUsed();
-				surMaxBytes = getMemoryPoolMaxOrCommited(survivorMemoryPool);
-			}
+		// eden
+		edenUsedBytes = memoryPoolManager.getEdenMemoryPool().getUsage().getUsed();
+		edenMaxBytes = getMemoryPoolMaxOrCommited(memoryPoolManager.getEdenMemoryPool());
+
+		// old gen
+		oldUsedBytes = memoryPoolManager.getOldMemoryPool().getUsage().getUsed();
+		oldMaxBytes = getMemoryPoolMaxOrCommited(memoryPoolManager.getOldMemoryPool());
+
+		// survivor
+		MemoryPoolMXBean survivorMemoryPool = memoryPoolManager.getSurvivorMemoryPool();
+		if (survivorMemoryPool != null) {
+			surUsedBytes = survivorMemoryPool.getUsage().getUsed();
+			surMaxBytes = getMemoryPoolMaxOrCommited(survivorMemoryPool);
+		}
 
-			// perm gen
-			permUsedBytes = memoryPoolManager.getPermMemoryPool().getUsage().getUsed();
-			permMaxBytes = getMemoryPoolMaxOrCommited(memoryPoolManager.getPermMemoryPool());
+		// perm gen
+		permUsedBytes = memoryPoolManager.getPermMemoryPool().getUsage().getUsed();
+		permMaxBytes = getMemoryPoolMaxOrCommited(memoryPoolManager.getPermMemoryPool());
 
-			// compressed class space
-			if (jvmMajorVersion >= 8) {
-				MemoryPoolMXBean compressedClassSpaceMemoryPool = memoryPoolManager.getCompressedClassSpaceMemoryPool();
-				if (compressedClassSpaceMemoryPool != null) {
-					ccsUsedBytes = compressedClassSpaceMemoryPool.getUsage().getUsed();
-					ccsMaxBytes = getMemoryPoolMaxOrCommited(compressedClassSpaceMemoryPool);
-				}
+		// compressed class space
+		if (jvmMajorVersion >= 8) {
+			MemoryPoolMXBean compressedClassSpaceMemoryPool = memoryPoolManager.getCompressedClassSpaceMemoryPool();
+			if (compressedClassSpaceMemoryPool != null) {
+				ccsUsedBytes = compressedClassSpaceMemoryPool.getUsage().getUsed();
+				ccsMaxBytes = getMemoryPoolMaxOrCommited(compressedClassSpaceMemoryPool);
 			}
 		}
 
+		// code cache
 		codeCacheUsedBytes = memoryPoolManager.getCodeCacheMemoryPool().getUsage().getUsed();
 		codeCacheMaxBytes = getMemoryPoolMaxOrCommited(memoryPoolManager.getCodeCacheMemoryPool());
 
+		// direct
 		directUsedBytes = jmxClient.getBufferPoolManager().getDirectBufferPool().getMemoryUsed();
 		directMaxBytes = jmxClient.getBufferPoolManager().getDirectBufferPool().getTotalCapacity();
 	}