Visitar URL original
Add freelists for PyComplex, PyInt, PyRange by youknowone 路 Pull Request #7345 路 RustPython/RustPython 路 GitHub
Skip to content

Add freelists for PyComplex, PyInt, PyRange #7345

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 6 commits into from
Mar 5, 2026
Merged

Add freelists for PyComplex, PyInt, PyRange #7345

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d3cc53a
Add freelists for PyComplex, PyInt, PyBoundMethod, PyRange
youknowone Mar 4, 2026
3d4951d
Use alloc::dealloc in FreeList::Drop to avoid thread-local access panic
youknowone Mar 4, 2026
7b25894
Auto-format: cargo fmt --all
github-actions[bot] Mar 4, 2026
b962909
Fix clippy: use core::alloc::Layout instead of alloc::alloc::Layout
youknowone Mar 4, 2026
7b614ae
Address review: PyBoundMethod clear=false, update FreeList doc comment
youknowone Mar 4, 2026
01b5319
Remove PyBoundMethod freelist to fix refcount/weakref test failures
youknowone Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Remove PyBoundMethod freelist to fix refcount/weakref test failures 
Non-Option PyObjectRef fields retain references in freelist, causing
weakref and refcount assertions to fail in test_unittest, test_multiprocessing,
and test_socket.
  • Loading branch information
@youknowone
youknowone committed Mar 4, 2026
commit 01b5319e46129fd68dcf291fc9e641cb2f71cf56
42 changes: 1 addition & 41 deletions crates/vm/src/builtins/function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ use crate::{
Callable, Comparable, Constructor, GetAttr, GetDescriptor, PyComparisonOp, Representable,
},
};
use core::cell::Cell;
use core::ptr::NonNull;
use core::sync::atomic::{AtomicU32, Ordering::Relaxed};
use itertools::Itertools;
#[cfg(feature = "jit")]
Expand Down Expand Up @@ -1084,7 +1082,7 @@ impl Constructor for PyFunction {
}
}

#[pyclass(module = false, name = "method", traverse, clear = false)]
#[pyclass(module = false, name = "method", traverse)]
#[derive(Debug)]
pub struct PyBoundMethod {
object: PyObjectRef,
Expand Down Expand Up @@ -1207,49 +1205,11 @@ impl PyBoundMethod {
}
}

// spell-checker:ignore MAXFREELIST
thread_local! {
static BOUND_METHOD_FREELIST: Cell<crate::object::FreeList<PyBoundMethod>> = const { Cell::new(crate::object::FreeList::new()) };
}

impl PyPayload for PyBoundMethod {
const MAX_FREELIST: usize = 20;
const HAS_FREELIST: bool = true;

#[inline]
fn class(ctx: &Context) -> &'static Py<PyType> {
ctx.types.bound_method_type
}

#[inline]
unsafe fn freelist_push(obj: *mut PyObject) -> bool {
BOUND_METHOD_FREELIST
.try_with(|fl| {
let mut list = fl.take();
let stored = if list.len() < Self::MAX_FREELIST {
list.push(obj);
true
} else {
false
};
fl.set(list);
stored
})
.unwrap_or(false)
}

#[inline]
unsafe fn freelist_pop() -> Option<NonNull<PyObject>> {
BOUND_METHOD_FREELIST
.try_with(|fl| {
let mut list = fl.take();
let result = list.pop().map(|p| unsafe { NonNull::new_unchecked(p) });
fl.set(list);
result
})
.ok()
.flatten()
}
}

impl Representable for PyBoundMethod {
Expand Down