src/org/jruby/management/ParserStats.java src/org/jruby/management/ParserStatsMBean.java @@ -96,6 +96,7 @@ import org.jruby.javasupport.JavaSupport; import org.jruby.management.BeanManager; import org.jruby.management.ClassCache; import org.jruby.management.Config; +import org.jruby.management.ParserStats; import org.jruby.parser.Parser; import org.jruby.parser.ParserConfiguration; import org.jruby.runtime.Binding; @@ -205,8 +206,10 @@ public final class Ruby { this.kcode = config.getKCode(); this.beanManager = new BeanManager(this, config.isManagementEnabled()); this.jitCompiler = new JITCompiler(this); + this.parserStats = new ParserStats(this); this.beanManager.register(new Config(this)); + this.beanManager.register(parserStats); this.beanManager.register(new ClassCache(this)); this.cacheMap = new CacheMap(this); @@ -566,6 +569,10 @@ public final class Ruby { return (IRubyObject) rj.getValue(); } } + + public Parser getParser() { + return parser; + } public BeanManager getBeanManager() { return beanManager; @@ -1899,10 +1906,12 @@ public final class Ruby { } public Node parseFile(InputStream in, String file, DynamicScope scope) { + if (parserStats != null) parserStats.addLoadParse(); return parser.parse(file, in, scope, new ParserConfiguration(0, false, false, true)); } public Node parseInline(InputStream in, String file, DynamicScope scope) { + if (parserStats != null) parserStats.addEvalParse(); return parser.parse(file, in, scope, new ParserConfiguration(0, false, true)); } @@ -1915,10 +1924,12 @@ public final class Ruby { bytes = content.getBytes(); } + if (parserStats != null) parserStats.addEvalParse(); return parser.parse(file, new ByteArrayInputStream(bytes), scope, new ParserConfiguration(lineNumber, false)); } + @Deprecated public Node parse(String content, String file, DynamicScope scope, int lineNumber, boolean extraPositionInformation) { byte[] bytes; @@ -1934,11 +1945,13 @@ public final class Ruby { } public Node parseEval(ByteList content, String file, DynamicScope scope, int lineNumber) { + if (parserStats != null) parserStats.addEvalParse(); return parser.parse(file, content, scope, new ParserConfiguration(lineNumber, false)); } public Node parse(ByteList content, String file, DynamicScope scope, int lineNumber, boolean extraPositionInformation) { + if (parserStats != null) parserStats.addJRubyModuleParse(); return parser.parse(file, content, scope, new ParserConfiguration(lineNumber, extraPositionInformation, false)); } @@ -2340,6 +2353,7 @@ public final class Ruby { getBeanManager().unregisterCompiler(); getBeanManager().unregisterConfig(); + getBeanManager().unregisterParserStats(); getBeanManager().unregisterClassCache(); getBeanManager().unregisterMethodCache(); @@ -2976,6 +2990,9 @@ public final class Ruby { // Management/monitoring private BeanManager beanManager; + + // Parser stats + private ParserStats parserStats; // Compilation private final JITCompiler jitCompiler; src/org/jruby/Ruby.java @@ -33,6 +33,10 @@ public class BeanManager { if (managementEnabled) register(base + "service=Config", config); } + public void register(ParserStatsMBean parserStats) { + if (managementEnabled) register(base + "service=ParserStats", parserStats); + } + public void register(MethodCacheMBean methodCache) { if (managementEnabled) register(base + "service=MethodCache", methodCache); } @@ -47,6 +51,9 @@ public class BeanManager { public void unregisterConfig() { if (managementEnabled) unregister(base + "service=Config"); } + public void unregisterParserStats() { + if (managementEnabled) unregister(base + "service=ParserStats"); + } public void unregisterClassCache() { if (managementEnabled) unregister(base + "service=ClassCache"); } src/org/jruby/management/BeanManager.java @@ -54,22 +54,34 @@ import org.jruby.util.ByteList; */ public class Parser { private final Ruby runtime; + private volatile long totalTime; + private volatile int totalBytes; public Parser(Ruby runtime) { this.runtime = runtime; } + + public long getTotalTime() { + return totalTime; + } + + public int getTotalBytes() { + return totalBytes; + } public Node parseRewriter(String file, InputStream content, ParserConfiguration configuration) throws SyntaxException { - + long startTime = System.nanoTime(); DefaultRubyParser parser = RubyParserPool.getInstance().borrowParser(); + parser.setWarnings(new NullWarnings()); + LexerSource lexerSource = LexerSource.getSource(file, content, null, configuration); + try { - parser.setWarnings(new NullWarnings()); - LexerSource lexerSource = LexerSource.getSource(file, content, null, configuration); - return parser.parse(configuration, lexerSource).getAST(); } finally { RubyParserPool.getInstance().returnParser(parser); + totalTime += System.nanoTime() - startTime; + totalBytes += lexerSource.getOffset(); } } @@ -82,6 +94,7 @@ public class Parser { @SuppressWarnings("unchecked") public Node parse(String file, InputStream content, DynamicScope blockScope, ParserConfiguration configuration) { + long startTime = System.nanoTime(); IRubyObject scriptLines = runtime.getObject().fastGetConstantAt("SCRIPT_LINES__"); RubyArray list = null; @@ -106,10 +119,10 @@ public class Parser { DefaultRubyParser parser = null; RubyParserResult result = null; + parser = RubyParserPool.getInstance().borrowParser(); + parser.setWarnings(runtime.getWarnings()); + LexerSource lexerSource = LexerSource.getSource(file, content, list, configuration); try { - parser = RubyParserPool.getInstance().borrowParser(); - parser.setWarnings(runtime.getWarnings()); - LexerSource lexerSource = LexerSource.getSource(file, content, list, configuration); result = parser.parse(configuration, lexerSource); if (result.getEndOffset() >= 0) { IRubyObject verbose = runtime.getVerbose(); @@ -137,6 +150,11 @@ public class Parser { result.getScope().growIfNeeded(); } - return result.getAST(); + Node ast = result.getAST(); + + totalTime += System.nanoTime() - startTime; + totalBytes += lexerSource.getOffset(); + + return ast; } } src/org/jruby/parser/Parser.java acfa0b5f5fbfbd608c4aefe65d4a895d89730b36 headius headius@961051c9-f516-0410-bf72-c9f7e237a7b7 http://github.com/vvs/jruby/commit/8ddd9b8feae1f499156e2aa70312174060354c32 8ddd9b8feae1f499156e2aa70312174060354c32 2008-08-31T03:14:21-07:00 2008-08-31T03:14:21-07:00 Add a ParserStats MBean to gather metrics on time spent parsing. git-svn-id: https://svn.codehaus.org/jruby/trunk/jruby@7608 961051c9-f516-0410-bf72-c9f7e237a7b7 58d79c9c477d03f50a827c63256cbc74983a4b53 headius headius@961051c9-f516-0410-bf72-c9f7e237a7b7