Visitar URL original
gh-81057: Move Signal-Related Globals to _PyRuntimeState by ericsnowcurrently · Pull Request #100085 · python/cpython · GitHub
Skip to content

gh-81057: Move Signal-Related Globals to _PyRuntimeState #100085

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

Merged
ericsnowcurrently merged 30 commits into from
Dec 12, 2022
Merged

gh-81057: Move Signal-Related Globals to _PyRuntimeState #100085

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
6dcffac
Add struct _signals_runtime_state.
ericsnowcurrently Dec 6, 2022
5e49464
Move signalmodule.c:Handlers to _PyRuntimeState.
ericsnowcurrently Dec 6, 2022
07332af
Move signalmodule.c:wakeup to _PyRuntimeState.
ericsnowcurrently Dec 6, 2022
1b5ec60
Move signalmodule.c:is_tripped to _PyRuntimeState.
ericsnowcurrently Dec 6, 2022
280f6f4
Move signalmodule.c:signal_global_state to _PyRuntimeState.
ericsnowcurrently Dec 7, 2022
fd6a2de
Fix includes (e.g. for Windows) in pycore_signal.h.
ericsnowcurrently Dec 8, 2022
410190b
Drop the socketmodule.h include.
ericsnowcurrently Dec 8, 2022
1fc3dce
Fix the include for SOCKET on Windows.
ericsnowcurrently Dec 8, 2022
d4f05e4
Fix formatting.
ericsnowcurrently Dec 8, 2022
1ddece1
Fix order of includes on WINDOWS.
ericsnowcurrently Dec 8, 2022
9592a8b
Fix includes on Windows.
ericsnowcurrently Dec 9, 2022
cc43787
Fix INVALID_FD on Windows.
ericsnowcurrently Dec 9, 2022
0164014
Revert "Fix includes on Windows."
ericsnowcurrently Dec 9, 2022
1d8d9e2
Include the headers conditionally.
ericsnowcurrently Dec 9, 2022
555f727
Fail instead of falling back to includes.
ericsnowcurrently Dec 9, 2022
57dc4a8
Reach for a sweet spot.
ericsnowcurrently Dec 10, 2022
08799ad
Pull in HANDLE.
ericsnowcurrently Dec 10, 2022
3bad4d6
Drop an unnecessary ifdef.
ericsnowcurrently Dec 12, 2022
3624161
Force the ifdef checks for the actual definition of _PyRuntime.
ericsnowcurrently Dec 12, 2022
2191c97
Drop the ifdef checks.
ericsnowcurrently Dec 12, 2022
76794fb
Change members/macros to fail (or warn) when used without the proper …
ericsnowcurrently Dec 12, 2022
c9aee62
Make sure the Windows includes happen early enough.
ericsnowcurrently Dec 12, 2022
ca33ad7
Move the includes up.
ericsnowcurrently Dec 12, 2022
7f35360
Check for _WINSOCKAPI_ instead of SOCKET.
ericsnowcurrently Dec 12, 2022
3d23778
Define a HANDLE macro where needed.
ericsnowcurrently Dec 12, 2022
73e3bc1
Use void* for the "fd" field.
ericsnowcurrently Dec 12, 2022
4195e62
Use void* for the "sigint_event" field.
ericsnowcurrently Dec 12, 2022
36cda7b
Use an int for wakeup.fd, instead of SOCKET.
ericsnowcurrently Dec 12, 2022
2a3bdf1
Drop the explicit includes.
ericsnowcurrently Dec 12, 2022
38596a0
Fix a warning.
ericsnowcurrently Dec 12, 2022
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
Prev Previous commit
Next Next commit
Move signalmodule.c:signal_global_state to _PyRuntimeState.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Dec 12, 2022
commit 280f6f47a31048aee590623fc337e3ab314e9f6a
7 changes: 7 additions & 0 deletions Include/internal/pycore_signal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,13 @@ struct _signals_runtime_state {
/* Speed up sigcheck() when none tripped */
_Py_atomic_int is_tripped;

/* These objects necessarily belong to the main interpreter. */
PyObject *default_handler;
PyObject *ignore_handler;
#ifdef MS_WINDOWS
HANDLE sigint_event;
#endif
Comment thread
ericsnowcurrently marked this conversation as resolved.

/* True if the main interpreter thread exited due to an unhandled
* KeyboardInterrupt exception, suggesting the user pressed ^C. */
int unhandled_keyboard_interrupt;
Expand Down
13 changes: 4 additions & 9 deletions Modules/signalmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,9 @@ class sigset_t_converter(CConverter):
#define wakeup _PyRuntime.signals.wakeup
#define is_tripped _PyRuntime.signals.is_tripped

typedef struct {
PyObject *default_handler;
PyObject *ignore_handler;
#ifdef MS_WINDOWS
HANDLE sigint_event;
#endif
} signal_state_t;

// State shared by all Python interpreters
static signal_state_t signal_global_state = {0};
typedef struct _signals_runtime_state signal_state_t;
#define signal_global_state _PyRuntime.signals

#if defined(HAVE_GETITIMER) || defined(HAVE_SETITIMER)
# define PYHAVE_ITIMER_ERROR
Expand Down Expand Up @@ -1627,6 +1620,8 @@ signal_module_exec(PyObject *m)
signal_state_t *state = &signal_global_state;
_signal_module_state *modstate = get_signal_state(m);

// XXX For proper isolation, these values must be guaranteed
// to be effectively const (e.g. immortal).
modstate->default_handler = state->default_handler; // borrowed ref
modstate->ignore_handler = state->ignore_handler; // borrowed ref

Expand Down
5 changes: 1 addition & 4 deletions Tools/c-analyzer/cpython/globals-to-fix.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,10 +365,7 @@ Modules/itertoolsmodule.c - ziplongest_type -
##################################
## global non-objects to fix in builtin modules

##-----------------------
## state

Modules/signalmodule.c - signal_global_state -
# <none>


##################################
Expand Down