Skip to content
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bpo-28254: Add a C-API for controlling the state of the garbage collector #25687

Merged
merged 17 commits into from
Apr 28, 2021

Conversation

scoder
Copy link
Contributor

@scoder scoder commented Apr 28, 2021

@pablogsal
Copy link
Member

Looks good, I will review it in more detail today, but please, add an entry to the what's new document for 3.10 in the meantime.

Doc/whatsnew/3.10.rst Outdated Show resolved Hide resolved
pablogsal and others added 2 commits April 28, 2021 14:44
…ions to make it easy for users to ('atomically') know whether they actually changed something and what state to go back to later. Also, returning an "int" may make it easier to add error handling later, if that becomes needed at some point.
Modules/_testcapimodule.c Outdated Show resolved Hide resolved
Modules/_testcapimodule.c Outdated Show resolved Hide resolved
Modules/_testcapimodule.c Outdated Show resolved Hide resolved
@pablogsal
Copy link
Member

Thanks for the PR @scoder! Make sure to merge it before end of the week 😉

@scoder
Copy link
Contributor Author

scoder commented Apr 28, 2021

I changed the functions to return the previous state. That's a common idiom in C, and I think a useful one in this case.

int old_state;

old_state = PyGC_Enable();
msg = "Enable(1)";
Copy link
Member

Choose a reason for hiding this comment

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

Bugs are unlikely. IMO using assert() is good enough for _testcapi tests. You can leave the code as it is ;-)

See for example test_refcount_funcs() which uses assert().

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I was thinking that assertions can be compiled out, which is decidedly not intended here.

Copy link
Member

Choose a reason for hiding this comment

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

In general yes, but _testcapimodule.c starts with:

/* Always enable assertions */
#undef NDEBUG

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good to know! I'd keep the test as it is though. It doesn't really hurt, I think.

@scoder
Copy link
Contributor Author

scoder commented Apr 28, 2021

Are the C functions prototypes defined in the right place? Limited API, header file hierarchy, etc.?

@vstinner
Copy link
Member

Are the C functions prototypes defined in the right place? Limited API, header file hierarchy, etc.?

You added them to the stable ABI and so you should run "regen-limited-abi".

@scoder
Copy link
Contributor Author

scoder commented Apr 28, 2021

Are the C functions prototypes defined in the right place? Limited API, header file hierarchy, etc.?

You added them to the stable ABI and so you should run "regen-limited-abi".

That added more than the three. I only committed the ones I added here in order to keep the PR clean.
I'll check where the others came from.

Doc/c-api/gcsupport.rst Outdated Show resolved Hide resolved
If the garbage collector is disabled or already running,
returns ``0`` immediately.
Errors during garbage collection are ignored and printed.
This function does not raise exceptions.
Copy link
Member

Choose a reason for hiding this comment

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

@pablogsal: Do we want to document that it's safe to call this function with an exception raised, and that the exception is saved and then restored?

.. c:function:: Py_ssize_t PyGC_Collect(void)

Performs a garbage collection, if the garbage collector is enabled.
Returns the number of collected + uncollectable objects.
Copy link
Member

Choose a reason for hiding this comment

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

Hum, uncollectable objects are stored in gc.garbage no? Shoud we document that?

The C code uses "unreachable objects that couldn't be collected" in a comment instead of "uncollectable objects". Maybe it's a more explicit definition.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't think this C-API function is the right place to document these details. That's what the gc module is for.

Doc/c-api/gcsupport.rst Outdated Show resolved Hide resolved
Doc/c-api/gcsupport.rst Outdated Show resolved Hide resolved
Doc/c-api/gcsupport.rst Show resolved Hide resolved
@vstinner
Copy link
Member

That added more than the three. I only committed the ones I added here in order to keep the PR clean.
I'll check where the others came from.

Right, thanks: https://bugs.python.org/issue43795#msg392212

Doc/c-api/gcsupport.rst Outdated Show resolved Hide resolved
Doc/c-api/gcsupport.rst Outdated Show resolved Hide resolved
Doc/c-api/gcsupport.rst Outdated Show resolved Hide resolved
Co-authored-by: Victor Stinner <vstinner@python.org>
Copy link
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

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

LGTM but please fix the Sphinx markup.

Doc/c-api/gcsupport.rst Outdated Show resolved Hide resolved
@@ -199,20 +199,20 @@ garbage collection runs.
Enable the garbage collector: similar to :func:`gc.enable`.
Returns the previous state, 0 for disabled and 1 for enabled.

.. versionchanged:: 3.10
.. versionadded:: 3.10
Copy link
Member

Choose a reason for hiding this comment

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

Please fix also the indentation.

Copy link
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

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

LGTM.

@vstinner vstinner merged commit 3cc481b into python:master Apr 28, 2021
@scoder scoder deleted the bpo-28254_gc_capi branch April 28, 2021 16:12
@vstinner
Copy link
Member

Merged, thanks @scoder!

I'm not really excited by adding a C API for each Python function, but this one seems common enough to justify adding an API. Also, @pablogsal liked the idea ;-)

@pablogsal
Copy link
Member

Merged, thanks @scoder!

I'm not really excited by adding a C API for each Python function, but this one seems common enough to justify adding an API. Also, @pablogsal liked the idea ;-)

The GC gods we all serve are pleased with the new API ;)

@scoder
Copy link
Contributor Author

scoder commented Apr 28, 2021

Thanks Victor and Pablo!

@vstinner
Copy link
Member

I created PR #25693 which shows how useful are these new C API functions ;-) Ok, maybe, it makes the C code a little bit simpler ;-)

@scoder
Copy link
Contributor Author

scoder commented Apr 28, 2021

35 lines added, 116 lines saved. Seems a good deal.

@markshannon
Copy link
Member

FYI, this has broken CI
Example: https://github.com/python/cpython/pull/25719/checks?check_run_id=2466874649
Proposed fix:
#25716

@encukou
Copy link
Member

encukou commented Apr 29, 2021

Yes, this adds things to Doc/data/stable_abi.dat but not PC/python3dll.c, which is quite wrong.
Meanwhile, I merged the part of PEP-652 that will prevent these from going out of sync (by generating them both from a single manifest), but the CI on this PR ran before that and the merge happened after.

From now on, CI will be fail on the pull request when issues like this happen, but this one's timing was unfortunate.

@pablogsal
Copy link
Member

Ok, then let's merge #25720 to unblock this

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants