add back finalize

.github/workflows/CI.yml

@@ -20,8 +20,9 @@ jobs:
  fail-fast: false
  matrix:
  version:
- - '1.6'
+ - 'min'
  - '1'
+ - 'pre'
  os:
  - ubuntu-latest
  - windows-latest

Project.toml

@@ -12,4 +12,4 @@ Zstd_jll = "3161d3a3-bdf6-5164-811a-617609db77b4"
 [compat]
 TranscodingStreams = "0.9, 0.10, 0.11"
 Zstd_jll = "1.5.5"
-julia = "1.3"
+julia = "1.7"

src/compression.jl

@@ -81,6 +81,15 @@ end
 # Methods
 # -------
 
+function TranscodingStreams.finalize(codec::ZstdCompressor)
+ cstream = codec.cstream
+ p = @atomicswap cstream.ptr = C_NULL
+ # no need to check if p is already C_NULL 
+ # because ZSTD_freeCStream will handle that.
+ LibZstd.ZSTD_freeCStream(p)
+ return
+end
+
 function TranscodingStreams.startproc(codec::ZstdCompressor, mode::Symbol, error::Error)
  code = reset!(codec.cstream, 0 #=unknown source size=#)
  if iserror(code)

src/libzstd.jl

@@ -59,7 +59,7 @@ end
 
 # ZSTD_CStream
 mutable struct CStream
- ptr::Ptr{LibZstd.ZSTD_CStream}
+ @atomic ptr::Ptr{LibZstd.ZSTD_CStream}
  ibuffer::InBuffer
  obuffer::OutBuffer
 
@@ -80,8 +80,9 @@ mutable struct CStream
  end
  cstream = new(ptr, InBuffer(), OutBuffer())
  finalizer(cstream) do x
- local p = x.ptr
- x.ptr = C_NULL
+ local p = @atomicswap x.ptr = C_NULL
+ # no need to check if p is already C_NULL 
+ # because ZSTD_freeCStream will handle that.
  LibZstd.ZSTD_freeCStream(p)
  nothing
  end