trigger async actions in loops

Author: timfel

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

@@ -56,12 +56,8 @@ def handler(signal, frame):
 
     _signal.alarm(1)
 
-    def dummy():
-        pass
-
     while not triggered:
-        dummy()
         time.sleep(0.5)
 
     assert triggered[0] == _signal.SIGALRM
-    assert triggered[1].f_code.co_name == "test_alarm2", triggered[1].f_code.co_name
+    assert triggered[1].f_code.co_name == "test_alarm2", triggered[1].f_code

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/ForNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -71,6 +71,7 @@ public boolean executeRepeating(VirtualFrame frame) {
             throw raise(PythonErrorType.RuntimeError, "internal error: unexpected frame slot type");
         }
         body.executeVoid(frame);
+        getContext().triggerAsyncActions();
         return true;
     }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/WhileNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -25,16 +25,16 @@
  */
 package com.oracle.graal.python.nodes.control;
 
+import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.nodes.expression.CastToBooleanNode;
 import com.oracle.graal.python.nodes.statement.StatementNode;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.NodeInfo;
 import com.oracle.truffle.api.nodes.RepeatingNode;
 import com.oracle.truffle.api.profiles.LoopConditionProfile;
 
-final class WhileRepeatingNode extends Node implements RepeatingNode {
+final class WhileRepeatingNode extends PNodeWithContext implements RepeatingNode {
 
     private final LoopConditionProfile conditionProfile = LoopConditionProfile.createCountingProfile();
 
@@ -50,6 +50,7 @@ final class WhileRepeatingNode extends Node implements RepeatingNode {
     public boolean executeRepeating(VirtualFrame frame) {
         if (conditionProfile.profile(condition.executeBoolean(frame))) {
             body.executeVoid(frame);
+            getContext().triggerAsyncActions();
             return true;
         }
         return false;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/GeneratorForNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -31,6 +31,7 @@
 import com.oracle.graal.python.nodes.frame.WriteNode;
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.nodes.statement.StatementNode;
+import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.exception.YieldException;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -93,6 +94,7 @@ public void executeVoid(VirtualFrame frame) {
         }
 
         Object nextIterator = null;
+        PythonContext context = getContext();
         int count = 0;
         try {
             while (true) {
@@ -108,6 +110,7 @@ public void executeVoid(VirtualFrame frame) {
                 if (CompilerDirectives.inInterpreter()) {
                     count++;
                 }
+                context.triggerAsyncActions();
             }
             return;
         } catch (YieldException e) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/GeneratorWhileNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
  * Copyright (c) 2014, Regents of the University of California
  *
  * All rights reserved.
@@ -28,6 +28,7 @@
 import com.oracle.graal.python.nodes.control.LoopNode;
 import com.oracle.graal.python.nodes.expression.CastToBooleanNode;
 import com.oracle.graal.python.nodes.statement.StatementNode;
+import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.exception.BreakException;
 import com.oracle.graal.python.runtime.exception.YieldException;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -68,12 +69,14 @@ public void executeVoid(VirtualFrame frame) {
         }
         boolean nextFlag = false;
         int count = 0;
+        PythonContext context = getContext();
         try {
             do {
                 body.executeVoid(frame);
                 if (CompilerDirectives.inInterpreter()) {
                     count++;
                 }
+                context.triggerAsyncActions();
             } while (condition.executeBoolean(frame));
             return;
         } catch (YieldException e) {

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

@@ -126,7 +126,7 @@ public Object execute(VirtualFrame frame) {
             int frameIndex = (int) frameArguments[1];
             Object[] arguments = Arrays.copyOfRange(frameArguments, 2, frameArguments.length);
             if (frameIndex >= 0) {
-                arguments[frameIndex] = getFrameNode.execute(2);
+                arguments[frameIndex] = getFrameNode.execute(1);
             }
             return callNode.execute(frame, callable, arguments);
         }