Reduce memory usage, part 1

AdoptOpenJDK · Jun 12, 2016 · 5d96a23 · 5d96a23
1 parent 39a8a44
commit 5d96a23
Show file tree

Hide file tree

Showing 18 changed files with 240 additions and 173 deletions.
diff --git a/core/src/main/java/org/adoptopenjdk/jitwatch/chain/CompileChainWalker.java b/core/src/main/java/org/adoptopenjdk/jitwatch/chain/CompileChainWalker.java
@@ -1,17 +1,18 @@
 /*
- * Copyright (c) 2013-2015 Chris Newland.
+ * Copyright (c) 2013-2016 Chris Newland.
  * Licensed under https://github.com/AdoptOpenJDK/jitwatch/blob/master/LICENSE-BSD
  * Instructions: https://github.com/AdoptOpenJDK/jitwatch/wiki
  */
 package org.adoptopenjdk.jitwatch.chain;
 
-import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.ATTR_ID;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.ATTR_COMPILE_ID;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.ATTR_ID;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.ATTR_METHOD;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.ATTR_NAME;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.ATTR_REASON;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.S_PARSE_HIR;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_BC;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_BRANCH;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_CALL;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_DEPENDENCY;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_DIRECT_CALL;
@@ -23,9 +24,8 @@
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_PARSE_DONE;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_PHASE;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_PHASE_DONE;
-import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_TYPE;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_PREDICTED_CALL;
-import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_BRANCH;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_TYPE;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_UNCOMMON_TRAP;
 
 import java.util.HashMap;
@@ -197,7 +197,7 @@ private CompileNode handleInline(CompileNode parentNode, String methodID, IParse
 	@Override
 	public void visitTag(Tag parseTag, IParseDictionary parseDictionary) throws LogParseException
 	{
-		String methodID = parseTag.getAttribute(ATTR_METHOD);
+		String methodID = parseTag.getAttributes().get(ATTR_METHOD);
 
 		// only initialise on first parse tag.
 		// there may be multiple if late_inline
@@ -209,4 +209,4 @@ public void visitTag(Tag parseTag, IParseDictionary parseDictionary) throws LogP
 
 		processParseTag(parseTag, root, parseDictionary);
 	}
-}
+}
diff --git a/core/src/main/java/org/adoptopenjdk/jitwatch/core/HotSpotLogParser.java b/core/src/main/java/org/adoptopenjdk/jitwatch/core/HotSpotLogParser.java
@@ -32,6 +32,7 @@
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_CODE_CACHE;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_CODE_CACHE_FULL;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_COMMAND;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_HOTSPOT_LOG_DONE;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_NMETHOD;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_OPEN_CDATA;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_OPEN_CLOSE_CDATA;
@@ -46,7 +47,6 @@
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_VM_ARGUMENTS;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_VM_VERSION;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_XML;
-import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_HOTSPOT_LOG_DONE;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -273,6 +273,14 @@ public void processLogFile(File hotspotLog, ILogParseErrorListener errorListener
 		}
 
 		parseLogFile();
+
+		cleanup();
+	}
+
+	private void cleanup()
+	{
+		splitLog.clear();
+		splitLog = new SplitLog();
 	}
 
 	private void parseLogFile()
@@ -652,7 +660,7 @@ private void handleTagQueued(Tag tag)
 
 	private void renameCompilationCompletedTimestamp(Tag tag)
 	{
-		String compilationCompletedStamp = tag.getAttribute(ATTR_STAMP);
+		String compilationCompletedStamp = tag.getAttributes().get(ATTR_STAMP);
 
 		if (compilationCompletedStamp != null)
 		{
@@ -663,7 +671,9 @@ private void renameCompilationCompletedTimestamp(Tag tag)
 
 	private void handleTagNMethod(Tag tag)
 	{
-		String attrCompiler = tag.getAttribute(ATTR_COMPILER);
+		Map<String, String> tagAttributes = tag.getAttributes();
+
+		String attrCompiler = tagAttributes.get(ATTR_COMPILER);
 
 		renameCompilationCompletedTimestamp(tag);
 
@@ -684,7 +694,7 @@ else if (C2.equals(attrCompiler))
 		}
 		else
 		{
-			String attrCompileKind = tag.getAttribute(ATTR_COMPILE_KIND);
+			String attrCompileKind = tagAttributes.get(ATTR_COMPILE_KIND);
 
 			if (attrCompileKind != null && C2N.equals(attrCompileKind))
 			{
@@ -707,7 +717,7 @@ private void handleTagTask(Tag tag)
 		{
 			// copy timestamp from parent <task> tag used for graphing code
 			// cache
-			String stamp = tag.getAttribute(ATTR_STAMP);
+			String stamp = tag.getAttributes().get(ATTR_STAMP);
 			tagCodeCache.getAttributes().put(ATTR_STAMP, stamp);
 
 			model.addCodeCacheTag(tagCodeCache);

diff --git a/core/src/main/java/org/adoptopenjdk/jitwatch/core/TagProcessor.java b/core/src/main/java/org/adoptopenjdk/jitwatch/core/TagProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015 Chris Newland.
+ * Copyright (c) 2013-2016 Chris Newland.
  * Licensed under https://github.com/AdoptOpenJDK/jitwatch/blob/master/LICENSE-BSD
  * Instructions: https://github.com/AdoptOpenJDK/jitwatch/wiki
  */
@@ -174,19 +174,19 @@ private Tag processValidLine(String line, int indexEndName, boolean selfClosing)
 
 		String name = line.substring(1, indexEndName);
 
-		String remainder = line.substring(indexEndName);
+		String attributeString = line.substring(indexEndName);
 
-		Map<String, String> attrs = StringUtil.getLineAttributes(remainder);
+		Map<String, String> attrs = StringUtil.getLineAttributes(attributeString);
 
 		Tag nextTag;
 
 		if (JITWatchConstants.TAG_TASK.equals(name))
 		{
-			nextTag = new Task(name, attrs, selfClosing);
+			nextTag = new Task(name, attributeString, selfClosing);
 		}
 		else
 		{
-			nextTag = new Tag(name, attrs, selfClosing);
+			nextTag = new Tag(name, attributeString, selfClosing);
 		}
 
 		if (DEBUG_LOGGING_TAGPROCESSOR)
@@ -265,4 +265,4 @@ private Tag processValidLine(String line, int indexEndName, boolean selfClosing)
 
 		return result;
 	}
-}
+}
diff --git a/core/src/main/java/org/adoptopenjdk/jitwatch/histo/InlineSizeHistoVisitable.java b/core/src/main/java/org/adoptopenjdk/jitwatch/histo/InlineSizeHistoVisitable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015 Chris Newland.
+ * Copyright (c) 2013-2016 Chris Newland.
  * Licensed under https://github.com/AdoptOpenJDK/jitwatch/blob/master/LICENSE-BSD
  * Instructions: https://github.com/AdoptOpenJDK/jitwatch/wiki
  */
@@ -102,7 +102,7 @@ private void processParseTag(Tag parseTag, IParseDictionary parseDictionary)
 
 					if (klassTag != null)
 					{
-						String fqName = klassTag.getAttribute(ATTR_NAME) + C_SLASH + currentMethod;
+						String fqName = klassTag.getAttributes().get(ATTR_NAME) + C_SLASH + currentMethod;
 
 						if (!inlinedCounted.contains(fqName))
 						{
@@ -151,4 +151,4 @@ public void visitTag(Tag parseTag, IParseDictionary parseDictionary) throws LogP
 	{
 		processParseTag(parseTag, parseDictionary);
 	}
-}
+}
diff --git a/core/src/main/java/org/adoptopenjdk/jitwatch/inline/InlineVisitor.java b/core/src/main/java/org/adoptopenjdk/jitwatch/inline/InlineVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Jean Phillipe BEMPEL
+ * Copyright (c) 2015-2016 Jean Phillipe BEMPEL
  * Licensed under https://github.com/AdoptOpenJDK/jitwatch/blob/master/LICENSE-BSD
  * Instructions: https://github.com/AdoptOpenJDK/jitwatch/wiki
  */
@@ -158,7 +158,7 @@ private void processParseTag(Tag parseTag, IParseDictionary parseDictionary)
                             if (inlineFailureInfo == null)
                             {
                                 Tag methodTag = parseDictionary.getMethod(methodID);
-                                int byteCodeSize = Integer.parseInt(methodTag.getAttribute(ATTR_BYTES));
+                                int byteCodeSize = Integer.parseInt(methodTag.getAttributes().get(ATTR_BYTES));
                                 inlineFailureInfo = new InlineFailureInfo(memberName, byteCodeSize);
                                 inlineFailureInfos.put(memberName, inlineFailureInfo);
                             }

diff --git a/core/src/main/java/org/adoptopenjdk/jitwatch/intrinsic/IntrinsicFinder.java b/core/src/main/java/org/adoptopenjdk/jitwatch/intrinsic/IntrinsicFinder.java
@@ -1,11 +1,34 @@
 /*
- * Copyright (c) 2013-2015 Chris Newland.
+ * Copyright (c) 2013-2016 Chris Newland.
  * Licensed under https://github.com/AdoptOpenJDK/jitwatch/blob/master/LICENSE-BSD
  * Instructions: https://github.com/AdoptOpenJDK/jitwatch/wiki
  */
 package org.adoptopenjdk.jitwatch.intrinsic;
 
-import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.*;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.ATTR_HOLDER;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.ATTR_ID;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.ATTR_METHOD;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.ATTR_NAME;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.C_DOT;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.C_SLASH;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.S_PARSE_HIR;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_BC;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_BRANCH;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_CALL;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_CAST_UP;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_DEPENDENCY;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_DIRECT_CALL;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_INLINE_FAIL;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_INLINE_SUCCESS;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_INTRINSIC;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_KLASS;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_METHOD;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_PARSE;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_PARSE_DONE;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_PHASE;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_PREDICTED_CALL;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_TYPE;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_UNCOMMON_TRAP;
 
 import java.util.HashMap;
 import java.util.List;
@@ -90,8 +113,11 @@ public void visitTag(Tag parseTag, IParseDictionary parseDictionary) throws LogP
 				String methodID = attrs.get(ATTR_METHOD);
 
 				Tag methodTag = parseDictionary.getMethod(methodID);
-				currentMethod = methodTag.getAttribute(ATTR_NAME);
+
-				holder = methodTag.getAttribute(ATTR_HOLDER);
+				Map<String, String> methodTagAttributes = methodTag.getAttributes();
+
+				currentMethod = methodTagAttributes.get(ATTR_NAME);
+				holder = methodTagAttributes.get(ATTR_HOLDER);
 				break;
 			}
 
@@ -101,11 +127,11 @@ public void visitTag(Tag parseTag, IParseDictionary parseDictionary) throws LogP
 				{
 					Tag klassTag = parseDictionary.getKlass(holder);
 
-					String intrinsic = child.getAttribute(ATTR_ID);
+					String intrinsic = child.getAttributes().get(ATTR_ID);
 
 					if (klassTag != null)
 					{
-						String fqName = klassTag.getAttribute(ATTR_NAME).replace(C_SLASH, C_DOT) + C_DOT + currentMethod;
+						String fqName = klassTag.getAttributes().get(ATTR_NAME).replace(C_SLASH, C_DOT) + C_DOT + currentMethod;
 
 						result.put(fqName, intrinsic);
 					}
@@ -138,4 +164,4 @@ public void visitTag(Tag parseTag, IParseDictionary parseDictionary) throws LogP
 			}
 		}
 	}
-}
+}
diff --git a/core/src/main/java/org/adoptopenjdk/jitwatch/journal/JournalUtil.java b/core/src/main/java/org/adoptopenjdk/jitwatch/journal/JournalUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015 Chris Newland.
+ * Copyright (c) 2013-2016 Chris Newland.
  * Licensed under https://github.com/AdoptOpenJDK/jitwatch/blob/master/LICENSE-BSD
  * Instructions: https://github.com/AdoptOpenJDK/jitwatch/wiki
  */
@@ -16,12 +16,13 @@
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.DEBUG_LOGGING;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.S_CONSTRUCTOR_INIT;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.S_OPTIMIZER;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_ELIMINATE_ALLOCATION;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_NMETHOD;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_PARSE;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_PHASE;
-import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_ELIMINATE_ALLOCATION;
 
 import java.util.List;
+import java.util.Map;
 
 import org.adoptopenjdk.jitwatch.model.IMetaMember;
 import org.adoptopenjdk.jitwatch.model.IParseDictionary;
@@ -158,7 +159,7 @@ public static boolean isJournalForCompile2NativeMember(Journal journal)
 
 				if (TAG_NMETHOD.equals(tagName))
 				{
-					if (C2N.equals(tag.getAttribute(ATTR_COMPILE_KIND)))
+					if (C2N.equals(tag.getAttributes().get(ATTR_COMPILE_KIND)))
 					{
 						result = true;
 					}
@@ -195,7 +196,9 @@ public static boolean memberMatchesMethodID(IMetaMember member, String methodID,
 
 		if (methodTag != null)
 		{
-			String klassID = methodTag.getAttribute(ATTR_HOLDER);
+			Map<String, String> methodTagAttributes = methodTag.getAttributes();
+
+			String klassID = methodTagAttributes.get(ATTR_HOLDER);
 
 			Tag klassTag = parseDictionary.getKlass(klassID);
 
@@ -206,8 +209,8 @@ public static boolean memberMatchesMethodID(IMetaMember member, String methodID,
 					logger.debug("klass tag: {}", klassTag.toString(false));
 				}
 
-				String klassAttrName = klassTag.getAttribute(ATTR_NAME);
+				String klassAttrName = klassTag.getAttributes().get(ATTR_NAME);
-				String methodAttrName = StringUtil.replaceXMLEntities(methodTag.getAttribute(ATTR_NAME));
+				String methodAttrName = StringUtil.replaceXMLEntities(methodTagAttributes.get(ATTR_NAME));
 
 				if (klassAttrName != null)
 				{
@@ -366,4 +369,4 @@ public static int getUnhandledTagCount()
 	{
 		return unhandledTagCount;
 	}
-}
+}