Cheaper and safe caching for py_capsule! and py_capsule_fn!#268
Open
SimonSapin wants to merge 1 commit intodgrunwald:masterfrom
Open
Cheaper and safe caching for py_capsule! and py_capsule_fn!#268SimonSapin wants to merge 1 commit intodgrunwald:masterfrom
SimonSapin wants to merge 1 commit intodgrunwald:masterfrom
Conversation
The `py_capsule!` and `py_capsule_fn!` macros generate `retrieve` functions that cache their results for subsequent calls. Prior to this commit, caching is done with a generated unsafe `static mut` item whose access is made thread-safe by a `std::sync::Once` on the side. However this synchronization is unnecessary since `retreive` takes a `Python<'_>` parameter that indicates that the GIL is held. This changes the cache to use safe `static` item instead, with `GILProtected` for synchronization-free thread-safety and `OnceCell` for interior mutability. As a bonus, this removes the need for cache-related `unsafe` code in generated `retrieve` functions. This adds a dependency to the `once_cell` crate, which can be removed when `OnceCell` becomes stable in the standard library: rust-lang/rust#74465 Alternatively `OnceCell` could be replaced with `UnsafeCell` plus some `unsafe` code, effectively inlining the core of the logic of `OnceCell`. Fixes dgrunwald#263
eb121f0 to
4649d3e
Compare
Contributor
Author
|
@markbt, any thought on this? |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The
py_capsule!andpy_capsule_fn!macros generateretrievefunctions that cache their results for subsequent calls.Prior to this commit, caching is done with a generated unsafe
static mutitem whose access is made thread-safe by astd::sync::Onceon the side. However this synchronization is unnecessary sinceretreivetakes aPython<'_>parameter that indicates that the GIL is held.This changes the cache to use safe
staticitem instead, withGILProtectedfor synchronization-free thread-safety andOnceCellfor interior mutability. As a bonus, this removes the need for cache-relatedunsafecode in generatedretrievefunctions.This adds a dependency to the
once_cellcrate, which can be removed whenOnceCellbecomes stable in the standard library: rust-lang/rust#74465Alternatively
OnceCellcould be replaced withUnsafeCellplus someunsafecode, effectively inlining the core of the logic ofOnceCell.Fixes #263