[GR-40199] Fix trace module coverage reporting, add smoke test

PullRequest: graalpython/2381

Author: timfel

graalpython/com.oracle.graal.python.test/src/tests/test_trace.py

@@ -0,0 +1,68 @@
+# Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# The Universal Permissive License (UPL), Version 1.0
+#
+# Subject to the condition set forth below, permission is hereby granted to any
+# person obtaining a copy of this software, associated documentation and/or
+# data (collectively the "Software"), free of charge and under any and all
+# copyright rights in the Software, and any and all patent rights owned or
+# freely licensable by each licensor hereunder covering either (i) the
+# unmodified Software as contributed to or provided by such licensor, or (ii)
+# the Larger Works (as defined below), to deal in both
+#
+# (a) the Software, and
+#
+# (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+# one is included with the Software each a "Larger Work" to which the Software
+# is contributed by such licensors),
+#
+# without restriction, including without limitation the rights to copy, create
+# derivative works of, display, perform, and distribute the Software and make,
+# use, sell, offer for sale, import, export, have made, and have sold the
+# Software and the Larger Work(s), and to sublicense the foregoing rights on
+# either these or other terms.
+#
+# This license is subject to the following condition:
+#
+# The above copyright notice and either this complete permission notice or at a
+# minimum a reference to the UPL must be included in all copies or substantial
+# portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+
+def test_trace_module():
+    import trace
+    import sys
+
+    tracer = trace.Trace(ignoredirs=[], trace=1, count=1, countfuncs=1, countcallers=1)
+
+    tracer.runctx("""
+def main():
+    import os
+    import distutils
+    import email
+    import lib2to3
+    from email.parser import Parser
+    Parser().parsestr('Hello world')
+
+main()
+    """)
+
+    r = tracer.results()
+    r.outfile = None
+    lines = []
+    trace.print = lambda *a: lines.append(" ".join(a))
+    try:
+        r.write_results(summary=True)
+    except:
+        assert False, "writing trace results should not fail"
+    finally:
+        del trace.print

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TraceModuleBuiltins.java

@@ -229,7 +229,7 @@ PTuple start(VirtualFrame frame, PythonModule mod,
                     continue;
                 }
 
-                String modName;
+                TruffleString modName;
                 TruffleFile file = getContext().getEnv().getPublicTruffleFile(filename);
                 String baseName = file.getName();
                 if (baseName != null) {
@@ -240,12 +240,12 @@ PTuple start(VirtualFrame frame, PythonModule mod,
 
                 RootCoverage[] rootCoverage = getRootCoverage(c);
                 for (RootCoverage r : rootCoverage) {
-                    String name = getRootName(r);
+                    TruffleString name = toTruffleStringUncached(getRootName(r));
                     if (name == null) {
                         continue;
                     }
                     if (countFuncs) {
-                        PTuple tp = factory().createTuple(new Object[]{filename, modName, name});
+                        PTuple tp = factory().createTuple(new Object[]{toTruffleStringUncached(filename), modName, name});
                         setItemNode.execute(frame, calledFuncs, tp, 1);
                     }
                     SectionCoverage[] sectionCoverage = getSectionCoverage(r);
@@ -256,7 +256,7 @@ PTuple start(VirtualFrame frame, PythonModule mod,
                             if (cnt < 0) {
                                 cnt = 1;
                             }
-                            PTuple ctp = factory().createTuple(new Object[]{filename, startLine});
+                            PTuple ctp = factory().createTuple(new Object[]{toTruffleStringUncached(filename), startLine});
                             setItemNode.execute(frame, counts, ctp, cnt);
                         }
                     }
@@ -296,11 +296,11 @@ private static RootCoverage[] getRootCoverage(SourceCoverage c) {
         }
 
         @TruffleBoundary
-        private static String deriveModuleName(TruffleFile file, String baseName) {
+        private static TruffleString deriveModuleName(TruffleFile file, String baseName) {
             if (baseName.endsWith("__init__.py")) {
-                return file.getParent().getName();
+                return toTruffleStringUncached(file.getParent().getName());
             } else {
-                return baseName.replaceFirst("\\.py$", "");
+                return toTruffleStringUncached(baseName.replaceFirst("\\.py$", ""));
             }
         }