[GR-40923] Profiler steps into async actions.

PullRequest: graalpython/2431

Author: tomasstupka

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/runtime/ProfileTests.java

@@ -40,24 +40,23 @@
  */
 package com.oracle.graal.python.test.runtime;
 
+import org.junit.Assert;
 import org.junit.Before;
 
 import com.oracle.graal.python.test.PythonTests;
-import org.junit.Ignore;
+import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 
-import static org.junit.Assert.assertEquals;
-
 public class ProfileTests {
 
     @Before
     public void ensureBytecode() {
         PythonTests.skipOnLegacyASTInterpreter();
     }
 
-    @Ignore("due to GR-40923")
+    @Test
     public void profileYield() {
         String source = "import sys\n" +
                         "def f(frame, event, arg): print(frame, event, arg)\n" +
@@ -72,7 +71,7 @@ public void profileYield() {
                         "<module>> return None\n", source);
     }
 
-    @Ignore("due to GR-40923")
+    @Test
     public void profileException() {
         String source = "import sys\n" +
                         "def f(frame, event, arg): print(frame, event, arg)\n" +
@@ -91,6 +90,6 @@ private static void assertPrints(String expected, String code) {
         final PrintStream printStream = new PrintStream(byteArray);
         PythonTests.runScript(new String[0], code, printStream, System.err);
         String result = byteArray.toString().replaceAll("\r\n", "\n");
-        assertEquals(expected, result.replaceAll(".*code ", ""));
+        Assert.assertEquals(expected, result.replaceAll(".*code ", ""));
     }
 }

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

@@ -145,6 +145,10 @@ public final void execute(PythonContext context) {
                     if (!alreadyTracing) {
                         threadState.tracingStart(PythonContext.TraceEvent.DISABLED);
                     }
+                    boolean alreadyProfiling = threadState.isProfiling();
+                    if (!alreadyProfiling) {
+                        threadState.profilingStart();
+                    }
                     debugger.disableStepping();
                     try {
                         GenericInvokeNode.getUncached().execute(context.getAsyncHandler().callTarget, args);
@@ -160,6 +164,9 @@ public final void execute(PythonContext context) {
                         if (!alreadyTracing) {
                             threadState.tracingStop();
                         }
+                        if (!alreadyProfiling) {
+                            threadState.profilingStop();
+                        }
                     }
                 }
             } while (proceed());