diff options
| author | Eric Snow <ericsnowcurrently@gmail.com> | 2019-04-12 16:20:10 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-12 16:20:10 (GMT) |
| commit | b75b1a3504a0cea6fac6ecba44c10b2629577025 (patch) | |
| tree | 14d6fd9909a1f4ec1ca70ba012569bd495d35d5a /Modules | |
| parent | f938d8be4ce3e1ccca7c31cf673265634307147f (diff) | |
| download | cpython-b75b1a3504a0cea6fac6ecba44c10b2629577025.zip cpython-b75b1a3504a0cea6fac6ecba44c10b2629577025.tar.gz cpython-b75b1a3504a0cea6fac6ecba44c10b2629577025.tar.bz2 | |
bpo-33608: Revert "Factor out a private, per-interpreter _Py_AddPendingCall()." (gh-12806)
This reverts commit f13c5c8b9401a9dc19e95d8b420ee100ac022208 (gh-12360).
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_testcapimodule.c | 1 | ||||
| -rw-r--r-- | Modules/signalmodule.c | 13 |
2 files changed, 4 insertions, 10 deletions
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c index 71356fb..1180b4b 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -2445,7 +2445,6 @@ pending_threadfunc(PyObject *self, PyObject *arg) Py_INCREF(callable); Py_BEGIN_ALLOW_THREADS - /* XXX Use the internal _Py_AddPendingCall(). */ r = Py_AddPendingCall(&_pending_callback, callable); Py_END_ALLOW_THREADS diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index 962174d..4590017 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -19,7 +19,6 @@ #include <process.h> #endif #endif -#include "internal/pycore_pystate.h" #ifdef HAVE_SIGNAL_H #include <signal.h> @@ -296,10 +295,8 @@ trip_signal(int sig_num) { /* Py_AddPendingCall() isn't signal-safe, but we still use it for this exceptional case. */ - _Py_AddPendingCall(_PyRuntime.interpreters.main, - main_thread, - report_wakeup_send_error, - (void *)(intptr_t) last_error); + Py_AddPendingCall(report_wakeup_send_error, + (void *)(intptr_t) last_error); } } } @@ -316,10 +313,8 @@ trip_signal(int sig_num) { /* Py_AddPendingCall() isn't signal-safe, but we still use it for this exceptional case. */ - _Py_AddPendingCall(_PyRuntime.interpreters.main, - main_thread, - report_wakeup_write_error, - (void *)(intptr_t)errno); + Py_AddPendingCall(report_wakeup_write_error, + (void *)(intptr_t)errno); } } } |