NotificationsYou must be signed in to change notification settings
Fork32.1k
Star67.3k

bpo-45953: Statically allocate the main interpreter (and initial thread state).#29883

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.

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

Already on GitHub?Sign in to your account

Jump to bottom

Merged

ericsnowcurrently merged 78 commits intopython:mainfromericsnowcurrently:preallocate-main

Jan 12, 2022

Merged

bpo-45953: Statically allocate the main interpreter (and initial thread state).#29883

ericsnowcurrently merged 78 commits intopython:mainfromericsnowcurrently:preallocate-main

Jan 12, 2022

Conversation

Copy link

Member

ericsnowcurrently commentedDec 1, 2021•
edited by bedevere-bot
Loading

Currently the main interpreter is allocated on the heap during runtime initialization. Here we are instead embedding it into_PyRuntimeState, which means it is statically allocated as part of the_PyRuntime global. The same goes for the initial thread state (of each interpreter, including the main one). Consequently there are fewer allocations during runtime/interpreter init, fewer possible failures, and better memory locality.

FYI, this also helps efforts to consolidate globals, which in turns helps work on subinterpreter isolation.

https://bugs.python.org/issue45953

ericsnowcurrently added11 commits

December 1, 2021 10:54

Return void from _PyEval_InitState().

5e6eda9

Fix a memory leak.

de12b98

Move thread-related interpreter state into a sub-struct.

035eff3

Factor out init_threadstate().

1569a53

Do not initialize a thread state if already initialized.

518e3f3

Avoid allocating the first thread state.

9995a84

Factor out init_interpreter().

f22d0da

Preallocate the main interpreter.

cf39d57

Add a note about expectations for init_interpreter().

b840213

Add a NEWS entry.

3bf69b0

Add _PyInterpreterState_Main().

4de466e

ericsnowcurrently requested a review frommarkshannon as acode owner

December 1, 2021 19:30

the-knights-who-say-ni added the CLA signed label

Dec 1, 2021

bedevere-bot added the awaiting core review label

Dec 1, 2021

ericsnowcurrently mentioned this pull request

Dec 1, 2021

Use member non-pointer declarations in Py*State structs instead of heap-allocated pointers.faster-cpython/ideas#79

Closed

markshannon reviewed

Dec 2, 2021

View reviewed changes

Python/ceval.c Outdated

		int
		_PyEval_InitState(struct _ceval_state *ceval)
		void
		_PyEval_InitState(struct _ceval_state *ceval, PyThread_type_lock pending_lock)

Copy link

Member

markshannonDec 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Would this be a good opportunity to remove this function?
The_pending_calls struct belongs on the interpreter state, not on theceval as only the main interpreter can handle them.

Copy link

MemberAuthor

ericsnowcurrentlyDec 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

There's enough going on in this PR that I'd rather not.

markshannon reviewed

Dec 2, 2021

View reviewed changes

Modules/posixmodule.c OutdatedShow resolvedHide resolved

markshannon reviewed

Dec 2, 2021

View reviewed changes

Modules/posixmodule.c OutdatedShow resolvedHide resolved

markshannon requested changes

Dec 2, 2021

View reviewed changes

Copy link

Member

markshannon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

A couple of tests have been inverted.

bedevere-bot removed the awaiting core review label

Dec 2, 2021

Copy link

bedevere-bot commentedDec 2, 2021

When you're done making the requested changes, leave the comment:I have made the requested changes; please review again.

bedevere-bot added the awaiting changes label

Dec 2, 2021

ericsnowcurrently added8 commits

December 2, 2021 16:43

Fix a check for the main interpreter.

9bb32a6

Ensure no subinterpreters are created until after the main interprete…

385f298

…r is.

Make sure the interpreter is fully initialized.

354997f

Use PyMem_RawCalloc() to allocate thread states.

9bbf8a0

Make sure the thread state is fully initialized.

8d1cf35

Clear the preallocated states when "deleted".

188aed8

Statically initialize the "preallocated" states.

e0da483

Fix a typo.

46c7767

markshannon reviewed

Jan 10, 2022

View reviewed changes

Include/cpython/pystate.h OutdatedShow resolvedHide resolved

Include/internal/pycore_interp.h OutdatedShow resolvedHide resolved

Include/internal/pycore_interp.h Outdated

		};

		#define _PyInterpreterState_INIT \

Copy link

Member

markshannonJan 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

This is only used once, please remove it.

Copy link

MemberAuthor

ericsnowcurrentlyJan 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

FYI, I brought this back to avoid so much nesting and clutter in_PyRuntimeState_INIT.

Include/internal/pycore_runtime.h OutdatedShow resolvedHide resolved

Include/internal/pycore_runtime.h

		// because on Windows we only get a pointer type.
		// All other pointers in PyThreadState are either
		// populated lazily or change but default to NULL.
		} _preallocated;
		} _PyRuntimeState;

		#define _PyRuntimeState_INIT \

Copy link

Member

markshannonJan 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Might as well remove this as well. It is also only used once.

Copy link

MemberAuthor

ericsnowcurrentlyJan 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Should_Py_global_objects_INIT also move? It's pretty big and likely to get much bigger.

Copy link

MemberAuthor

ericsnowcurrentlyJan 10, 2022•
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Actually,_PyRuntimeState_INIT is used twice.

This comment was marked as off-topic.

ericsnowcurrently added5 commits

January 10, 2022 13:55

Fold _PyThreadState_INIT into _PyInterpreterState_INIT.

5b34b42

Fold _PyInterpreterState_INIT into _PyRuntimeState_INIT.

837bfe6

Drop PyThreadState._preallocated.

ebefa35

tstate -> initial_thread.

eb7a080

Mirror the top-level structure in _preallocated.

1ef4a39

ericsnowcurrently requested a review frommarkshannon

January 11, 2022 00:16

ericsnowcurrently added13 commits

January 11, 2022 09:41

Merge branch 'main' into preallocate-main

771e574

Clarify some comments.

b5c43f1

Fold in _PyRuntimeState._preallocated.

bfc3906

Make "initial" const.

9b25c8b

Fold in PyInterpreterState._preallocated.

e776c31

Move the initial thread to the bottom of PyInterpreterState.

c6bda1f

Split up _PyRuntimeState_INIT for less nesting and clutter.

8ab6261

Fix a comment.

ff8de28

Move the main interpreter to the bottom of _PyRuntimeState.

b28afb3

Clarify some comments.

0d30300

Add a comment for the _static field.

e193794

Move the comments about pre-allocated data down.

e9f1262

Fix a typo.

a6a6471

Copy link

MemberAuthor

ericsnowcurrently commentedJan 12, 2022

With basically all feedback addressed I plan on merging this soon, to unblock other changes I have waiting. If I missed something, I'd be glad to address it in a follow-up PR.

Copy link

Member

gvanrossum commentedJan 12, 2022 via email

Fine with me.

…

On Wed, Jan 12, 2022 at 2:56 PM Eric Snow ***@***.***> wrote: With basically all feedback addressed I plan on merging this soon, to unblock other changes I have waiting. If I missed something, I'd be glad to address it in a follow-up PR. — Reply to this email directly, view it on GitHub <#29883 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAWCWMXNEYDUC6YIRLTJAEDUVYBIXANCNFSM5JFJMYAA> . Triage notifications on the go with GitHub Mobile for iOS <https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675> or Android <https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub>. You are receiving this because you are subscribed to this thread.Message ID: ***@***.***>

-- --Guido van Rossum (python.org/~guido)

ericsnowcurrently merged commited57b36 intopython:main

Jan 12, 2022

bedevere-bot removed the awaiting change review label

Jan 12, 2022

ericsnowcurrently deleted the preallocate-main branch

January 12, 2022 23:28

tacaswell added a commit to tacaswell/typed_ast that referenced this pull request

Jan 25, 2022

FIX: Account form stdbool.h being included in Python.h

9b849ca

As of CPython 3.11 (viapython/cpython#29883) stdbool.his now included in Python.h so do attempt to redefine bool/true/false.

tacaswell mentioned this pull request

Jan 25, 2022

FIX: Account form stdbool.h being included in Python.hpython/typed_ast#184

Merged

srittau pushed a commit to python/typed_ast that referenced this pull request

Jan 25, 2022

FIX: Account form stdbool.h being included in Python.h (#184)

36110cf

As of CPython 3.11 (viapython/cpython#29883) stdbool.his now included in Python.h so do attempt to redefine bool/true/false.

ericsnowcurrently mentioned this pull request

Nov 8, 2022

Statically allocate interpreter states as much as possible.#90111

Open

Labels

None yet

6 participants

Movatterモバイル変換

Uh oh!

bpo-45953: Statically allocate the main interpreter (and initial thread state).#29883

bpo-45953: Statically allocate the main interpreter (and initial thread state).#29883

Uh oh!

Conversation

ericsnowcurrently commentedDec 1, 2021• edited by bedevere-botLoading Uh oh!There was an error while loading.Please reload this page.

Uh oh!

Uh oh!

markshannonDec 2, 2021

Choose a reason for hiding this comment

Uh oh!

ericsnowcurrentlyDec 2, 2021

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

markshannon left a comment

Choose a reason for hiding this comment

Uh oh!

bedevere-bot commentedDec 2, 2021

Uh oh!

Uh oh!

Uh oh!

markshannonJan 10, 2022

Choose a reason for hiding this comment

Uh oh!

ericsnowcurrentlyJan 11, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

markshannonJan 10, 2022

Choose a reason for hiding this comment

Uh oh!

ericsnowcurrentlyJan 10, 2022

Choose a reason for hiding this comment

Uh oh!

ericsnowcurrentlyJan 10, 2022• editedLoading Uh oh!There was an error while loading.Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

This comment was marked as off-topic.

Uh oh!

ericsnowcurrently commentedJan 12, 2022

Uh oh!

gvanrossum commentedJan 12, 2022 via email

Uh oh!

Uh oh!

ericsnowcurrently commentedDec 1, 2021•
edited by bedevere-bot
Loading

ericsnowcurrentlyJan 10, 2022•
edited
Loading