gh-81057: Move Signal-Related Globals to _PyRuntimeState by ericsnowcurrently · Pull Request #100085 · python/cpython

ericsnowcurrently · 2022-12-07T17:25:38Z

Issue: [subinterpreters] Global C variables are a problem #81057

netlify · 2022-12-07T17:25:42Z

✅ Deploy Preview for python-cpython-preview canceled.

Name	Link
🔨 Latest commit	`38596a0`
🔍 Latest deploy log	https://app.netlify.com/sites/python-cpython-preview/deploys/6397b5e1a4ac130008314bbc

ericsnowcurrently · 2022-12-12T15:58:56Z

+#ifdef MS_WINDOWS
+# ifdef PYCORE_SIGNAL_WITH_PRE_INCLUDES
+# ifndef SOCKET
+# error "<winsock2.h> must be included before this header"
+# endif
+# ifndef HANDLE
+# error "<windows.h> must be included before this header"
+# endif
+# endif
+#endif


@zooba, did I do this right? This is how I understood your recommendation.

I don't think you want PYCORE_SIGNAL_WITH_PRE_INCLUDES in there. The header file is simply wrong if the system headers haven't been included, so it should always fail.
If the header needs to be used somewhere else, then that somewhere else also needs to include the headers. Alternatively, if it doesn't need to use the values (but just be able to allocate the structures), replace the SOCKET and HANDLE types entirely with void * and do casts anywhere they're actually being used.

This reverts commit d9a5dfa.

…includes.

* main: (103 commits) pythongh-100248: Add missing `ssl_shutdown_timeout` parameter in `asyncio` docs (python#100249) Assorted minor fixes for specialization stats. (pythonGH-100219) pythongh-100176: venv: Remove redundant compat code for Python <= 3.2 (python#100177) pythonGH-100222: Redefine _Py_CODEUNIT as a union to clarify structure of code unit. (pythonGH-100223) pythongh-99955: undef ERROR and SUCCESS before redefining (fixes sanitizer warning) (python#100215) pythonGH-100206: use versionadded for the addition of sysconfig.get_default_scheme (python#100207) pythongh-81057: Move _Py_RefTotal to the "Ignored Globals" List (pythongh-100203) pythongh-81057: Move Signal-Related Globals to _PyRuntimeState (pythongh-100085) pythongh-81057: Move faulthandler Globals to _PyRuntimeState (pythongh-100152) pythongh-81057: Move tracemalloc Globals to _PyRuntimeState (pythongh-100151) pythonGH-100143: Improve collecting pystats for parts of runs (pythonGH-100144) pythongh-99955: standardize return values of functions in compiler's code-gen (python#100010) pythongh-79218: Define `MS_WIN64` macro for Mingw-w64 64bit on Windows (pythonGH-100137) Fix: typo (Indention) (pythonGH-99904) pythongh-96715 Remove redundant NULL check in `profile_trampoline` function (python#96716) pythongh-100176: remove incorrect version compatibility check from argument clinic (python#100190) clarify the 4300-digit limit on int-str conversion (python#100175) pythongh-70393: Clarify mention of "middle" scope (python#98839) pythongh-99688: Fix outdated tests in test_unary (python#99712) pythongh-100174: [Enum] Correct PowersOfThree example. (pythonGH-100178) ...

ericsnowcurrently added the skip news label Dec 7, 2022

bedevere-bot mentioned this pull request Dec 7, 2022
[subinterpreters] Global C variables are a problem #81057
Closed

bedevere-bot added the awaiting core review label Dec 7, 2022

ericsnowcurrently force-pushed the consolidate-signal-globals branch 2 times, most recently from b8ae626 to 3b416b1Compare December 8, 2022 23:45

ericsnowcurrently requested a review from a team as a code owner December 9, 2022 00:15

ericsnowcurrently force-pushed the consolidate-signal-globals branch 2 times, most recently from 5cd67d8 to c1ac129Compare December 9, 2022 17:04

ericsnowcurrently commented Dec 12, 2022
View reviewed changes

ericsnowcurrently added 17 commits December 12, 2022 10:00

Add struct _signals_runtime_state.
6dcffac

Move signalmodule.c:Handlers to _PyRuntimeState.
5e49464

Move signalmodule.c:wakeup to _PyRuntimeState.
07332af

Move signalmodule.c:is_tripped to _PyRuntimeState.
1b5ec60

Move signalmodule.c:signal_global_state to _PyRuntimeState.
280f6f4

Fix includes (e.g. for Windows) in pycore_signal.h.
fd6a2de

Drop the socketmodule.h include.
410190b

Fix the include for SOCKET on Windows.
1fc3dce

Fix formatting.
d4f05e4

Fix order of includes on WINDOWS.
1ddece1

Fix includes on Windows.
9592a8b

Fix INVALID_FD on Windows.
cc43787

Revert "Fix includes on Windows."
0164014
This reverts commit d9a5dfa.

Include the headers conditionally.
1d8d9e2

Fail instead of falling back to includes.
555f727

Reach for a sweet spot.
57dc4a8

Pull in HANDLE.
08799ad

ericsnowcurrently force-pushed the consolidate-signal-globals branch from b8ff9df to 08799adCompare December 12, 2022 17:00

ericsnowcurrently added 2 commits December 12, 2022 10:21

Drop an unnecessary ifdef.
3bad4d6

Force the ifdef checks for the actual definition of _PyRuntime.
3624161

ericsnowcurrently added 2 commits December 12, 2022 11:23

Drop the ifdef checks.
2191c97

Change members/macros to fail (or warn) when used without the proper …
76794fb
…includes.

ericsnowcurrently removed the request for review from a teamDecember 12, 2022 18:45

ericsnowcurrently added 6 commits December 12, 2022 11:56

Make sure the Windows includes happen early enough.
c9aee62

Move the includes up.
ca33ad7

Check for _WINSOCKAPI_ instead of SOCKET.
7f35360

Define a HANDLE macro where needed.
3d23778

Use void* for the "fd" field.
73e3bc1

Use void* for the "sigint_event" field.
4195e62

zooba reviewed Dec 12, 2022
View reviewed changes

Comment threadModules/signalmodule.c Outdated

zooba reviewed Dec 12, 2022
View reviewed changes

Comment threadPython/pylifecycle.c Outdated

ericsnowcurrently added 3 commits December 12, 2022 15:00

Use an int for wakeup.fd, instead of SOCKET.
36cda7b

Drop the explicit includes.
2a3bdf1

Fix a warning.
38596a0

ericsnowcurrently merged commit 5eb28bc into python:mainDec 12, 2022

bedevere-bot removed the awaiting core review label Dec 12, 2022

ericsnowcurrently deleted the consolidate-signal-globals branch December 12, 2022 23:50

Navigation Menu

Uh oh!

Uh oh!

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

gh-81057: Move Signal-Related Globals to _PyRuntimeState#100085
ericsnowcurrently merged 30 commits into
python:mainfrom
ericsnowcurrently:consolidate-signal-globals

ericsnowcurrently commented Dec 7, 2022•
edited by bedevere-bot
Loading

Uh oh!

netlifyBot commented Dec 7, 2022•
edited
Loading

Uh oh!

ericsnowcurrentlyDec 12, 2022

Uh oh!

zoobaDec 12, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Uh oh!

Conversation

ericsnowcurrently commented Dec 7, 2022• edited by bedevere-bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

netlifyBot commented Dec 7, 2022• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Deploy Preview for python-cpython-preview canceled.

Uh oh!

ericsnowcurrentlyDec 12, 2022

Choose a reason for hiding this comment

Uh oh!

zoobaDec 12, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

ericsnowcurrently commented Dec 7, 2022•
edited by bedevere-bot
Loading

netlifyBot commented Dec 7, 2022•
edited
Loading