[pypy-svn] jitviewer default: kill parse(), use the version in the jitlogparser

antocuni commits-noreply at bitbucket.org
Fri Feb 25 14:59:41 CET 2011


Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: 
Changeset: r95:de507e82569f
Date: 2011-02-25 14:41 +0100
http://bitbucket.org/pypy/jitviewer/changeset/de507e82569f/

Log:	kill parse(), use the version in the jitlogparser

diff --git a/bin/jitviewer.py b/bin/jitviewer.py
--- a/bin/jitviewer.py
+++ b/bin/jitviewer.py
@@ -23,7 +23,7 @@
 from pypy.tool.jitlogparser.storage import LoopStorage
 from pypy.tool.jitlogparser.parser import adjust_bridges
 #
-from _jitviewer.parser import parse, FunctionHtml, parse_log_counts
+from _jitviewer.parser import ParserWithHtmlRepr, FunctionHtml, parse_log_counts
 from _jitviewer.display import CodeRepr, CodeReprNoFile
 import _jitviewer
 
@@ -137,7 +137,8 @@
     else:
         port = int(sys.argv[2])
     storage = LoopStorage(extra_path)
-    loops = [parse(l) for l in extract_category(log, "jit-log-opt-")]
+    loops = [ParserWithHtmlRepr.parse_from_input(l)
+             for l in extract_category(log, "jit-log-opt-")]
     parse_log_counts(extract_category(log, 'jit-backend-count'), loops)
     storage.reconnect_loops(loops)
     app = OverrideFlask('__name__', root_path=PATH)

diff --git a/_jitviewer/parser.py b/_jitviewer/parser.py
--- a/_jitviewer/parser.py
+++ b/_jitviewer/parser.py
@@ -139,7 +139,3 @@
             loops[i].count = count
             i += 1
     return nums
-
-def parse(input):
-    return ParserWithHtmlRepr(input, None, {}, 'lltype', None,
-                              nonstrict=True).parse()


More information about the Pypy-commit mailing list