Skip to content

Commit

Permalink
Add finalizers to prevent memory leaking
Browse files Browse the repository at this point in the history
  • Loading branch information
ains-stripe authored and mostynb committed Aug 28, 2020
1 parent a1d604f commit 60a87b5
Showing 1 changed file with 22 additions and 3 deletions.
25 changes: 22 additions & 3 deletions zstd/zstd.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ package zstd
import (
"io"
"io/ioutil"
"runtime"
"sync"

zstdlib "github.com/klauspost/compress/zstd"
Expand Down Expand Up @@ -56,7 +57,9 @@ func init() {
if err != nil {
panic(err)
}
return &writer{Encoder: w, pool: &c.poolCompressor}
writer := &writer{Encoder: w, pool: &c.poolCompressor}
runtime.SetFinalizer(writer, finalizeWriter)
return writer
}
encoding.RegisterCompressor(c)
}
Expand All @@ -73,7 +76,9 @@ func SetLevel(level zstdlib.EncoderLevel) error {
return err
}

return &writer{Encoder: w, pool: &c.poolCompressor}
writer := &writer{Encoder: w, pool: &c.poolCompressor}
runtime.SetFinalizer(writer, finalizeWriter)
return writer
}

return nil
Expand All @@ -92,7 +97,9 @@ func (c *compressor) Decompress(r io.Reader) (io.Reader, error) {
if err != nil {
return nil, err
}
return &reader{Decoder: newZ, pool: &c.poolDecompressor}, nil
reader := &reader{Decoder: newZ, pool: &c.poolDecompressor}
runtime.SetFinalizer(reader, finalizeReader)
return reader, nil
}
if err := z.Reset(r); err != nil {
c.poolDecompressor.Put(z)
Expand All @@ -118,3 +125,15 @@ func (z *reader) Read(p []byte) (n int, err error) {
}
return n, err
}

func finalizeReader(r *reader) {
if r.Decoder != nil {
r.Decoder.Close()
}
}

func finalizeWriter(w *writer) {
if w.Encoder != nil {
w.Encoder.Close()
}
}

0 comments on commit 60a87b5

Please sign in to comment.