8000 gh-133885: Use locks instead of critical sections for _zstd by emmatyping · Pull Request #134289 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-133885: Use locks instead of critical sections for _zstd #134289

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

Merged
merged 18 commits into from
May 23, 2025
Merged

gh-133885: Use locks instead of critical sections for _zstd #134289

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
daa5f43
Use locks instead of critical sections
emmatyping May 19, 2025
0d14dc2
Remove one more critical section
emmatyping May 19, 2025
1b68e1e
Make capsule management threadsafe
emmatyping May 20, 2025
f6602f4
Add a test for sharing a dictionary across threads
emmatyping May 20, 2025
d8854c5
Move lock check in dealloc to an assert
emmatyping May 20, 2025
02fc2b3
Run threading checks on GIL builds too
emmatyping May 20, 2025
edbf444
Remove extra blank line
emmatyping May 20, 2025
bf287cf
Remove extraneous whitespace
emmatyping May 20, 2025
005d1a0
Remove unused includes
emmatyping May 21, 2025
84c5b30
Revert "Remove unused includes"
emmatyping May 21, 2025
ec31019
Put locks around ZstdDict usage
emmatyping May 21, 2025
2dbed4e
Add tests for sharing all types of ZstdDict
emmatyping May 21, 2025
afdabd5
Remove @critical_section
emmatyping May 21, 2025
d8d48c2
Add missing include
emmatyping May 21, 2025
d142aa8
Updates based on Sam's review
emmatyping May 21, 2025
43d3dea
Pass NULL to PyDict_SetDefaultRef
emmatyping May 22, 2025
93dec23
Put locks around relevant functions and use PyDict_GetItemRef
emmatyping May 23, 2025
69a755b
Remove unused decref
emmatyping May 23, 2025
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
Remove unused includes
  • Loading branch information
@emmatyping
emmatyping committed May 21, 2025
commit 005d1a06ba8cd1fcef01f4fbcc57b010657f0f7e
1 change: 0 additions & 1 deletion Modules/_zstd/compressor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#include "_zstdmodule.h"
#include "buffer.h"
#include "zstddict.h"
#include "internal/pycore_lock.h" // PyMutex_IsLocked

#include <stddef.h> // offsetof()
#include <zstd.h> // ZSTD_*()
Expand Down Expand Up @@ -402,7 +401,7 @@
ZSTD_freeCCtx(self->cctx);
}

assert(!PyMutex_IsLocked(&self->lock));

Check failure on line 404 in Modules/_zstd/compressor.c

View workflow job for this annotation

GitHub Actions / Ubuntu / build and test (ubuntu-24.04) 

implicit declaration of function ‘PyMutex_IsLocked’; did you mean ‘PyMutex_Lock’? [-Werror=implicit-function-declaration]

Check failure on line 404 in Modules/_zstd/compressor.c

View workflow job for this annotation

GitHub Actions / Ubuntu (bolt) / build and test (ubuntu-24.04) 

implicit declaration of function ‘PyMutex_IsLocked’; did you mean ‘PyMutex_Lock’? [-Werror=implicit-function-declaration]

Check failure on line 404 in Modules/_zstd/compressor.c

View workflow job for this annotation

GitHub Actions / Hypothesis tests on Ubuntu 

implicit declaration of function ‘PyMutex_IsLocked’; did you mean ‘PyMutex_Lock’? [-Werror=implicit-function-declaration]

Check failure on line 404 in Modules/_zstd/compressor.c

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test (ubuntu-24.04) 

implicit declaration of function ‘PyMutex_IsLocked’; did you mean ‘PyMutex_Lock’? [-Werror=implicit-function-declaration]

/* Py_XDECREF the dict after free the compression context */
Py_CLEAR(self->dict);
Expand Down
1 change: 0 additions & 1 deletion Modules/_zstd/decompressor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ class _zstd.ZstdDecompressor "ZstdDecompressor *" "&zstd_decompressor_type_spec"
#include "_zstdmodule.h"
#include "buffer.h"
#include "zstddict.h"
#include "internal/pycore_lock.h" // PyMutex_IsLocked

#include <stdbool.h> // bool
#include <stddef.h> // offsetof()
Expand Down
Loading
0