Merge pull request #166 from mrocklin/avoid-segfault

Remove with nogil statement to avoid segfault
Blosc · Mar 26, 2015 · 09550e2 · 09550e2
2 parents 648b7f9 + 46b6b59
commit 09550e2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst
@@ -24,6 +24,9 @@ Changes from 0.8.1 to 0.9.0
 - Add ``safe=`` keyword argument to control dtype/stride checking on append
   (#163 @mrocklin)
 
+- Hold GIL during c-blosc compression/decompression, avoiding some segfaults
+  (#166 @mrocklin)
+
 Changes from 0.8.0 to 0.8.1
 ===========================
 

diff --git a/bcolz/carray_ext.pyx b/bcolz/carray_ext.pyx
@@ -422,9 +422,8 @@ cdef class chunk:
             raise ValueError(
                 "Compressor '%s' is not available in this build" % cname)
         dest = <char *> malloc(nbytes + BLOSC_MAX_OVERHEAD)
-        with nogil:
-            ret = blosc_compress(clevel, shuffle, itemsize, nbytes,
-                                 data, dest, nbytes + BLOSC_MAX_OVERHEAD)
+        ret = blosc_compress(clevel, shuffle, itemsize, nbytes,
+                             data, dest, nbytes + BLOSC_MAX_OVERHEAD)
         if ret <= 0:
             raise RuntimeError(
                 "fatal error during Blosc compression: %d" % ret)
@@ -454,8 +453,7 @@ cdef class chunk:
 
         dest = <char *> malloc(self.nbytes)
         # Fill dest with uncompressed data
-        with nogil:
-            ret = blosc_decompress(self.data, dest, self.nbytes)
+        ret = blosc_decompress(self.data, dest, self.nbytes)
         if ret < 0:
             raise RuntimeError(
                 "fatal error during Blosc decompression: %d" % ret)
@@ -480,11 +478,10 @@ cdef class chunk:
             return
 
         # Fill dest with uncompressed data
-        with nogil:
-            if bsize == self.nbytes:
-                ret = blosc_decompress(self.data, dest, bsize)
-            else:
-                ret = blosc_getitem(self.data, nstart, nitems, dest)
+        if bsize == self.nbytes:
+            ret = blosc_decompress(self.data, dest, bsize)
+        else:
+            ret = blosc_getitem(self.data, nstart, nitems, dest)
         if ret < 0:
             raise RuntimeError(
                 "fatal error during Blosc decompression: %d" % ret)
@@ -709,8 +706,7 @@ cdef class chunks(object):
                 # Fill lastchunk with data on disk
                 scomp = self.read_chunk(self.nchunks)
                 compressed = PyString_AsString(scomp)
-                with nogil:
-                    ret = blosc_decompress(compressed, lastchunk, chunksize)
+                ret = blosc_decompress(compressed, lastchunk, chunksize)
                 if ret < 0:
                     raise RuntimeError(
                         "error decompressing the last chunk (error code: "