Skip to content

Commit a240b8c

Browse files
committed
EmulatedPosixSupport: should re-interrupt if interrupted
1 parent 9492376 commit a240b8c

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import static com.oracle.graal.python.runtime.PosixConstants.LOCK_NB;
5151
import static com.oracle.graal.python.runtime.PosixConstants.LOCK_SH;
5252
import static com.oracle.graal.python.runtime.PosixConstants.LOCK_UN;
53+
import static com.oracle.graal.python.runtime.PosixConstants.MAP_ANONYMOUS;
5354
import static com.oracle.graal.python.runtime.PosixConstants.O_ACCMODE;
5455
import static com.oracle.graal.python.runtime.PosixConstants.O_APPEND;
5556
import static com.oracle.graal.python.runtime.PosixConstants.O_CREAT;
@@ -62,7 +63,6 @@
6263
import static com.oracle.graal.python.runtime.PosixConstants.O_TMPFILE;
6364
import static com.oracle.graal.python.runtime.PosixConstants.O_TRUNC;
6465
import static com.oracle.graal.python.runtime.PosixConstants.O_WRONLY;
65-
import static com.oracle.graal.python.runtime.PosixConstants.MAP_ANONYMOUS;
6666
import static com.oracle.graal.python.runtime.PosixConstants.PROT_EXEC;
6767
import static com.oracle.graal.python.runtime.PosixConstants.PROT_NONE;
6868
import static com.oracle.graal.python.runtime.PosixConstants.PROT_READ;
@@ -1537,6 +1537,7 @@ public long[] waitpid(long pid, int options) throws PosixException {
15371537
throw posixException(OSErrorEnum.ESRCH);
15381538
}
15391539
} catch (InterruptedException e) {
1540+
Thread.currentThread().interrupt();
15401541
throw posixException(OSErrorEnum.EINTR);
15411542
}
15421543
}
@@ -1836,6 +1837,7 @@ private void execvInternal(String[] cmd) throws IOException {
18361837
try {
18371838
pr.waitFor();
18381839
} catch (InterruptedException e) {
1840+
Thread.currentThread().interrupt();
18391841
throw new IOException(e);
18401842
}
18411843
// TODO python-specific, missing location

0 commit comments

Comments
 (0)