[GR-40754] Stop tracing async actions

PullRequest: graalpython/2424

Author: Adam Hrbac

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

@@ -40,6 +40,7 @@
 import unittest
 import difflib
 import sys
+import signal
 
 import builtins
 
@@ -155,7 +156,6 @@ def test_case(self):
     return test_case
 
 @unittest.skipIf(skip, 'sys.settrace only works in the bytecode interpreter')
-@unittest.skipIf(True, 'Disabled due to GR-40754')
 class TraceTests(unittest.TestCase):
     def trace(self, frame, event, arg):
         code = frame.f_code
@@ -198,3 +198,22 @@ def fun1():
                   (12, 'fun1', 'line', None)]
         if self.events != events:
             self.fail('\n'+'\n'.join(difflib.ndiff([str(x) for x in events], [str(x) for x in self.events])))
+
+    def simpler_trace(self, fr, ev, arg):
+        self.events.append(fr.f_code.co_name)
+
+    @unittest.skipIf(not hasattr(signal, 'SIGUSR1'), "User defined signal not present")
+    @unittest.skipIf(not hasattr(builtins, '__graalpython__'), "async actions do get traced in CPython")
+    def test_07_async_actions_not_traced(self):
+        def handler(*_): handler.called = 1
+
+        def helper(): return 1
+        signal.signal(signal.SIGUSR1, handler)
+        self.events = []
+        sys.settrace(self.simpler_trace)
+        signal.raise_signal(signal.SIGUSR1)
+        for i in range(1000): helper()
+        sys.settrace(None)
+        # handler.called is not checked, since it could cause a transient
+        for name in self.events:
+            self.assertEqual(name, 'helper')

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_sys_settrace.txt

@@ -0,0 +1,31 @@
+*graalpython.lib-python.3.test.test_sys_settrace.RaisingTraceFuncTestCase.test_call
+*graalpython.lib-python.3.test.test_sys_settrace.RaisingTraceFuncTestCase.test_exception
+*graalpython.lib-python.3.test.test_sys_settrace.RaisingTraceFuncTestCase.test_exception_arguments
+*graalpython.lib-python.3.test.test_sys_settrace.RaisingTraceFuncTestCase.test_line
+*graalpython.lib-python.3.test.test_sys_settrace.RaisingTraceFuncTestCase.test_return
+*graalpython.lib-python.3.test.test_sys_settrace.RaisingTraceFuncTestCase.test_trash_stack
+*graalpython.lib-python.3.test.test_sys_settrace.SkipLineEventsTraceTestCase.test_01_basic
+*graalpython.lib-python.3.test.test_sys_settrace.SkipLineEventsTraceTestCase.test_02_arigo0
+*graalpython.lib-python.3.test.test_sys_settrace.SkipLineEventsTraceTestCase.test_02_arigo1
+*graalpython.lib-python.3.test.test_sys_settrace.SkipLineEventsTraceTestCase.test_02_arigo2
+*graalpython.lib-python.3.test.test_sys_settrace.SkipLineEventsTraceTestCase.test_03_one_instr
+*graalpython.lib-python.3.test.test_sys_settrace.SkipLineEventsTraceTestCase.test_04_no_pop_blocks
+*graalpython.lib-python.3.test.test_sys_settrace.SkipLineEventsTraceTestCase.test_05_no_pop_tops
+*graalpython.lib-python.3.test.test_sys_settrace.SkipLineEventsTraceTestCase.test_06_call
+*graalpython.lib-python.3.test.test_sys_settrace.SkipLineEventsTraceTestCase.test_07_raise
+*graalpython.lib-python.3.test.test_sys_settrace.SkipLineEventsTraceTestCase.test_08_settrace_and_return
+*graalpython.lib-python.3.test.test_sys_settrace.SkipLineEventsTraceTestCase.test_14_onliner_if
+*graalpython.lib-python.3.test.test_sys_settrace.SkipLineEventsTraceTestCase.test_15_loops
+*graalpython.lib-python.3.test.test_sys_settrace.SkipLineEventsTraceTestCase.test_17_none_f_trace
+*graalpython.lib-python.3.test.test_sys_settrace.SkipLineEventsTraceTestCase.test_set_and_retrieve_func
+*graalpython.lib-python.3.test.test_sys_settrace.SkipLineEventsTraceTestCase.test_set_and_retrieve_none
+*graalpython.lib-python.3.test.test_sys_settrace.TraceTestCase.test_01_basic
+*graalpython.lib-python.3.test.test_sys_settrace.TraceTestCase.test_03_one_instr
+*graalpython.lib-python.3.test.test_sys_settrace.TraceTestCase.test_04_no_pop_blocks
+*graalpython.lib-python.3.test.test_sys_settrace.TraceTestCase.test_05_no_pop_tops
+*graalpython.lib-python.3.test.test_sys_settrace.TraceTestCase.test_06_call
+*graalpython.lib-python.3.test.test_sys_settrace.TraceTestCase.test_08_settrace_and_return
+*graalpython.lib-python.3.test.test_sys_settrace.TraceTestCase.test_14_onliner_if
+*graalpython.lib-python.3.test.test_sys_settrace.TraceTestCase.test_17_none_f_trace
+*graalpython.lib-python.3.test.test_sys_settrace.TraceTestCase.test_set_and_retrieve_func
+*graalpython.lib-python.3.test.test_sys_settrace.TraceTestCase.test_set_and_retrieve_none

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/PBytecodeRootNode.java

@@ -2349,6 +2349,7 @@ private void invokeTraceFunction(VirtualFrame virtualFrame, Object arg, PythonCo
         if (threadState.isTracing()) {
             return;
         }
+        assert event != PythonContext.TraceEvent.DISABLED;
         threadState.tracingStart(event);
         PFrame pyFrame = mutableData.setPyFrame(ensurePyFrame(virtualFrame, mutableData.getPyFrame()));
         Object traceFn = useLocalFn ? pyFrame.getLocalTraceFun() : threadState.getTraceFun();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/AsyncHandler.java

@@ -122,6 +122,8 @@ protected boolean proceed() {
         @Override
         public final void execute(PythonContext context) {
             Debugger debugger = null;
+            PythonContext.PythonThreadState threadState = null;
+            PythonLanguage language = context.getLanguage();
             do {
                 Object callable = callable();
                 if (callable != null) {
@@ -136,6 +138,13 @@ public final void execute(PythonContext context) {
                     if (debugger == null) {
                         debugger = Debugger.find(context.getEnv());
                     }
+                    if (threadState == null) {
+                        threadState = context.getThreadState(language);
+                    }
+                    boolean alreadyTracing = threadState.isTracing();
+                    if (!alreadyTracing) {
+                        threadState.tracingStart(PythonContext.TraceEvent.DISABLED);
+                    }
                     debugger.disableStepping();
                     try {
                         GenericInvokeNode.getUncached().execute(context.getAsyncHandler().callTarget, args);
@@ -148,6 +157,9 @@ public final void execute(PythonContext context) {
                         ExceptionUtils.printPythonLikeStackTrace(e);
                     } finally {
                         debugger.restoreStepping();
+                        if (!alreadyTracing) {
+                            threadState.tracingStop();
+                        }
                     }
                 }
             } while (proceed());

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java

@@ -193,7 +193,8 @@ public enum TraceEvent {
         CALL("call"),
         EXCEPTION("exception"),
         LINE("line"),
-        RETURN("return");
+        RETURN("return"),
+        DISABLED("");
 
         public final TruffleString pythonName;