Skip to content

bpo-28166: Continue to read after Ctrl+C if SIGINT was ignored #8344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 15 commits into from
Closed

bpo-28166: Continue to read after Ctrl+C if SIGINT was ignored #8344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9c166f4
convert content length to string before putting to header
ValeriyaSinevich Jun 16, 2018
02842b6
news entry
ValeriyaSinevich Jun 17, 2018
11a898a
output error when ReadConsole is canceled by CancelSynchronousIo inst…
ValeriyaSinevich Jun 25, 2018
c2dfff7
news
ValeriyaSinevich Jun 25, 2018
7145a7f
output error when ReadConsole is canceled by CancelSynchronousIo inst…
ValeriyaSinevich Jun 25, 2018
34e5061
news
ValeriyaSinevich Jun 25, 2018
c09a4c6
Merge branch 'bpo-30237' of https://github.com/ValeriyaSinevich/cpyth…
ValeriyaSinevich Jun 25, 2018
29dd01f
output error in myreadline.c
ValeriyaSinevich Jun 25, 2018
79ca38a
remove spaces around -
ValeriyaSinevich Jul 19, 2018
d4c4682
Continue reading when SIGINT is ignored
ValeriyaSinevich Jul 19, 2018
531e40b
news
ValeriyaSinevich Jul 19, 2018
c9079cc
Merge branch 'master' into bpo-28166
ValeriyaSinevich Jul 20, 2018
3c37a08
remove trailing space
ValeriyaSinevich Jul 20, 2018
14eac50
trailing whitespace
ValeriyaSinevich Jul 20, 2018
3d5be97
remove unrelated changes
ValeriyaSinevich Jul 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Windows/2018-07-19-16-37-47.bpo-28166.bBdWo8.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Continue reading when SIGINT is ignored.
6 changes: 4 additions & 2 deletions Modules/_io/winconsoleio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,14 +574,16 @@ read_console_w(HANDLE handle, DWORD maxlen, DWORD *readlen) {
break;
err = 0;
HANDLE hInterruptEvent = _PyOS_SigintEvent();
if (WaitForSingleObjectEx(hInterruptEvent, 100, FALSE)
== WAIT_OBJECT_0) {
DWORD state = WaitForSingleObjectEx(hInterruptEvent, 100, FALSE);
if (state == WAIT_OBJECT_0 || state == WAIT_TIMEOUT) {
ResetEvent(hInterruptEvent);
Py_BLOCK_THREADS
sig = PyErr_CheckSignals();
Py_UNBLOCK_THREADS
if (sig < 0)
break;
else
continue;
}
}
*readlen += n;
Expand Down
20 changes: 11 additions & 9 deletions Parser/myreadline.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,17 @@ _PyOS_WindowsConsoleReadline(HANDLE hStdIn)
goto exit;
err = 0;
HANDLE hInterruptEvent = _PyOS_SigintEvent();
if (WaitForSingleObjectEx(hInterruptEvent, 100, FALSE)
== WAIT_OBJECT_0) {
ResetEvent(hInterruptEvent);
PyEval_RestoreThread(_PyOS_ReadlineTState);
s = PyErr_CheckSignals();
PyEval_SaveThread();
if (s < 0)
goto exit;
}
DWORD state = WaitForSingleObjectEx(hInterruptEvent, 100, FALSE);
if (state == WAIT_OBJECT_0 || state == WAIT_TIMEOUT) {
ResetEvent(hInterruptEvent);
PyEval_RestoreThread(_PyOS_ReadlineTState);
s = PyErr_CheckSignals();
PyEval_SaveThread();
if (s < 0)
goto exit;
else
continue;
}
break;
}

Expand Down