Skip to content

Release the input buffer when SChunk(data=...) fails; test the prefilter writes without the GIL #777

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

Open
FabianIsensee wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Release the input buffer when SChunk(data=...) fails; test the prefilter writes without the GIL #777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 11 additions & 10 deletions src/blosc2/blosc2_ext.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4184,16 +4184,17 @@ cdef class SChunk:
len_data = buf.len
nchunks = (len_data + chunksize - 1) // chunksize if len_data > 0 else 0
len_chunk = chunksize
for i in range(nchunks):
if i == (nchunks - 1):
len_chunk = len_data - i * chunksize
index = i * chunksize
rc = _store_buffer(self.schunk, _WRITE_APPEND, i, buf_ptr + index, len_chunk)
if rc < 0:
PyBuffer_Release(&buf)
_raise_callback_error()
raise RuntimeError("Could not compress and append the chunk")
PyBuffer_Release(&buf)
try:
for i in range(nchunks):
if i == (nchunks - 1):
len_chunk = len_data - i * chunksize
index = i * chunksize
rc = _store_buffer(self.schunk, _WRITE_APPEND, i, buf_ptr + index, len_chunk)
if rc < 0:
_raise_callback_error()
raise RuntimeError("Could not compress and append the chunk")
finally:
PyBuffer_Release(&buf)

@property
def c_schunk(self):
Expand Down
4 changes: 2 additions & 2 deletions tests/test_schunk_data_writes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ def test_data_writes(storage, releasegil):
np.testing.assert_array_equal(got, exp)


def test_data_writes_reach_prefilter(storage):
def test_data_writes_reach_prefilter(storage, releasegil):
# The prefilter computes each item from its position, so it must see the right chunk number.
# With the GIL held only: Python prefilters crash with set_releasegil(True).
# It runs Python, so the writes keep the GIL even with set_releasegil(True).
schunk = new_schunk(storage, nthreads=1)

@schunk.prefilter(np.int32, np.int32)
Expand Down
Loading