Skip to content

gh-105766: Add Locking Around Custom Allocators #105619

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ericsnowcurrently wants to merge 8 commits into from
Closed

gh-105766: Add Locking Around Custom Allocators #105619

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fcbeb6d
Add wrapper allocators with locking when needed.
ericsnowcurrently Jun 7, 2023
fbe26eb
Fix set_allocator_unlocked.
ericsnowcurrently Jun 10, 2023
7191629
Implement should_lock().
ericsnowcurrently Jun 7, 2023
dd60989
Implement acquire_custom_allocator_lock() and release_custom_allocato…
ericsnowcurrently Jun 7, 2023
0f2a242
Merge branch 'main' into lock-around-custom-allocators
ericsnowcurrently Jul 27, 2023
321d1c2
Check for overflow/underflow.
ericsnowcurrently Jul 27, 2023
52c01ea
Use an unsigned int.
ericsnowcurrently Jul 27, 2023
a213597
Only modify num_gils if the interpreter has its own GIL.
ericsnowcurrently Jul 28, 2023
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
Next Next commit
Fix set_allocator_unlocked.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Jun 10, 2023
commit fbe26ebccf37a7f4175cbd253a9b64941de86105
4 changes: 2 additions & 2 deletions Objects/obmalloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,12 +580,12 @@ set_allocator_unlocked(PyMemAllocatorDomain domain, PyMemAllocatorEx *allocator)
_PyMem_Raw = *allocator;
break;
case PYMEM_DOMAIN_MEM:
maybe_add_locking_wrapper(domain, allocator, &_PyMem_Wrapped);
_PyMem = *allocator;
maybe_add_locking_wrapper(domain, &_PyMem, &_PyMem_Wrapped);
break;
case PYMEM_DOMAIN_OBJ:
maybe_add_locking_wrapper(domain, allocator, &_PyObject_Wrapped);
_PyObject = *allocator;
maybe_add_locking_wrapper(domain, &_PyObject, &_PyObject_Wrapped);
break;
default:
/* ignore unknown domain */
Expand Down