Skip to content

Commit

Permalink
Merge pull request #943 from fusion-engineering-forks/atexit
Browse files Browse the repository at this point in the history
Call Py_Finalize at exit using libc::atexit.
  • Loading branch information
davidhewitt authored May 24, 2020
2 parents 072be6c + febccbf commit 4355360
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

### Changed
- Simplify internals of `#[pyo3(get)]` attribute. (Remove the hidden API `GetPropertyValue`.) [#934](https://github.com/PyO3/pyo3/pull/934)
- Call `Py_Finalize` at exit to flush buffers, etc. [#943](https://github.com/PyO3/pyo3/pull/943)

### Removed
- Remove `ManagedPyRef` (unused, and needs specialization) [#930](https://github.com/PyO3/pyo3/pull/930)
Expand Down
16 changes: 15 additions & 1 deletion src/gil.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,12 @@ pub fn prepare_freethreaded_python() {

// PyPy does not support the embedding API
#[cfg(not(PyPy))]
ffi::Py_InitializeEx(0);
{
ffi::Py_InitializeEx(0);

// Make sure Py_Finalize will be called before exiting.
libc::atexit(finalize);
}

// > Changed in version 3.7: This function is now called by Py_Initialize(), so you don’t have
// > to call it yourself anymore.
Expand Down Expand Up @@ -356,6 +361,15 @@ fn decrement_gil_count() {
})
}

extern "C" fn finalize() {
unsafe {
if ffi::Py_IsInitialized() != 0 {
ffi::PyGILState_Ensure();
ffi::Py_Finalize();
}
}
}

#[cfg(test)]
mod test {
use super::{gil_is_acquired, GILPool, GIL_COUNT, OWNED_OBJECTS, POOL};
Expand Down

0 comments on commit 4355360

Please sign in to comment.