mirror of
https://github.com/python/cpython.git
synced 2025-08-03 08:34:29 +00:00
bpo-33608: Revert "Factor out a private, per-interpreter _Py_AddPendingCall()." (gh-12806)
This reverts commit f13c5c8b94
(gh-12360).
This commit is contained in:
parent
f938d8be4c
commit
b75b1a3504
11 changed files with 108 additions and 151 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue