1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8264309: JFR: Improve .jfc parser

Browse Source 
Reviewed-by: mgronlun
This commit is contained in:
Erik Gahlin 2021-03-29 13:56:44 +00:00
parent 364cce1485
commit 963f1fc6de
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/JFCParserHandler.java
View File

@ -42,9 +42,9 @@ final class JFCParserHandler extends DefaultHandler {
private static final String ATTRIBUTE_VERSION = "version"; private static final String ATTRIBUTE_VERSION = "version";
final Map<String, String> settings = new LinkedHashMap<String, String>(); final Map<String, String> settings = new LinkedHashMap<String, String>();
private String currentEventPath; private final StringBuilder currentCharacters = new StringBuilder();
private String currentEventName;
private String currentSettingsName; private String currentSettingsName;
private StringBuilder currentCharacters;
String label; String label;
String provider; String provider;
String description; String description;
@ -62,13 +62,13 @@ final class JFCParserHandler extends DefaultHandler {
provider = getOptional(attributes, ATTRIBUTE_PROVIDER, ""); provider = getOptional(attributes, ATTRIBUTE_PROVIDER, "");
break; break;
case ELEMENT_EVENT_TYPE: case ELEMENT_EVENT_TYPE:
currentEventPath = attributes.getValue(ATTRIBUTE_NAME); currentEventName = attributes.getValue(ATTRIBUTE_NAME);
break; break;
case ELEMENT_SETTING: case ELEMENT_SETTING:
currentSettingsName = attributes.getValue(ATTRIBUTE_NAME); currentSettingsName = attributes.getValue(ATTRIBUTE_NAME);
break; break;
} }
currentCharacters = null; currentCharacters.setLength(0);
} }
private String getOptional(Attributes attributes, String name, String defaultValue) { private String getOptional(Attributes attributes, String name, String defaultValue) {
@ -78,10 +78,9 @@ final class JFCParserHandler extends DefaultHandler {
@Override @Override
public void characters(char[] ch, int start, int length) throws SAXException { public void characters(char[] ch, int start, int length) throws SAXException {
if (currentCharacters == null) { if (currentSettingsName != null) {
currentCharacters = new StringBuilder(length); currentCharacters.append(ch, start, length);
} }
currentCharacters.append(ch, start, length);
} }
@Override @Override
@ -90,17 +89,13 @@ final class JFCParserHandler extends DefaultHandler {
case ELEMENT_CONFIGURATION: case ELEMENT_CONFIGURATION:
break; break;
case ELEMENT_EVENT_TYPE: case ELEMENT_EVENT_TYPE:
currentEventPath = null; currentEventName = null;
break; break;
case ELEMENT_SETTING: case ELEMENT_SETTING:
String settingsValue = currentCharacters == null ? "" : currentCharacters.toString(); String settingsValue = currentCharacters.toString();
settings.put(currentEventPath + "#" + currentSettingsName, "" + settingsValue); settings.put(currentEventName + "#" + currentSettingsName, settingsValue);
currentSettingsName = null; currentSettingsName = null;
break; break;
} }
} }
public Map<String, String> getSettings() {
return settings;
}
} }