mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
0809bd6859
full diff: https://github.com/klauspost/compress/compare/v1.12.3...v1.14.2 Relevant changes affecting vendor: - docs: Add combined LICENSE file - Add snappy replacement package - tests: Remove snappy dependency for tests - huff0: Add size estimation function - huff0: Improve 4X decompression speed - huff0: Improve 4X decompression speed 5-10% - huff0: Faster 1X Decompression - zstd: Spawn decoder goroutine only if needed - zstd: Detect short invalid signatures - zstd: Add configurable Decoder window size - zstd: Add stream content size - zstd: Simplify hashing functions - zstd: use SpeedBestCompression for level >= 10 - zstd: Fix WriteTo error forwarding - zstd: Improve Best compression - zstd: Fix incorrect encoding in best mode - zstd: pooledZipWriter should return Writers to the same pool - zstd: Upgrade xxhash - zstd: Improve block encoding speed - zstd: add arm64 xxhash assembly - zstd: Minor decoder improvements - zstd: Minor performance tweaks - zstd: Add bigger default blocks - zstd: Remove unused decompression buffer - zstd: fix logically dead code - zstd: Add noasm tag for xxhash - zstd: improve header decoder Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
122 lines
2.8 KiB
Go
122 lines
2.8 KiB
Go
// Copyright 2019+ Klaus Post. All rights reserved.
|
|
// License information can be found in the LICENSE file.
|
|
|
|
package zstd
|
|
|
|
import (
|
|
"errors"
|
|
"io"
|
|
"sync"
|
|
)
|
|
|
|
// ZipMethodWinZip is the method for Zstandard compressed data inside Zip files for WinZip.
|
|
// See https://www.winzip.com/win/en/comp_info.html
|
|
const ZipMethodWinZip = 93
|
|
|
|
// ZipMethodPKWare is the original method number used by PKWARE to indicate Zstandard compression.
|
|
// Deprecated: This has been deprecated by PKWARE, use ZipMethodWinZip instead for compression.
|
|
// See https://pkware.cachefly.net/webdocs/APPNOTE/APPNOTE-6.3.9.TXT
|
|
const ZipMethodPKWare = 20
|
|
|
|
var zipReaderPool sync.Pool
|
|
|
|
// newZipReader cannot be used since we would leak goroutines...
|
|
func newZipReader(r io.Reader) io.ReadCloser {
|
|
dec, ok := zipReaderPool.Get().(*Decoder)
|
|
if ok {
|
|
dec.Reset(r)
|
|
} else {
|
|
d, err := NewReader(r, WithDecoderConcurrency(1), WithDecoderLowmem(true))
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
dec = d
|
|
}
|
|
return &pooledZipReader{dec: dec}
|
|
}
|
|
|
|
type pooledZipReader struct {
|
|
mu sync.Mutex // guards Close and Read
|
|
dec *Decoder
|
|
}
|
|
|
|
func (r *pooledZipReader) Read(p []byte) (n int, err error) {
|
|
r.mu.Lock()
|
|
defer r.mu.Unlock()
|
|
if r.dec == nil {
|
|
return 0, errors.New("Read after Close")
|
|
}
|
|
dec, err := r.dec.Read(p)
|
|
|
|
return dec, err
|
|
}
|
|
|
|
func (r *pooledZipReader) Close() error {
|
|
r.mu.Lock()
|
|
defer r.mu.Unlock()
|
|
var err error
|
|
if r.dec != nil {
|
|
err = r.dec.Reset(nil)
|
|
zipReaderPool.Put(r.dec)
|
|
r.dec = nil
|
|
}
|
|
return err
|
|
}
|
|
|
|
type pooledZipWriter struct {
|
|
mu sync.Mutex // guards Close and Read
|
|
enc *Encoder
|
|
pool *sync.Pool
|
|
}
|
|
|
|
func (w *pooledZipWriter) Write(p []byte) (n int, err error) {
|
|
w.mu.Lock()
|
|
defer w.mu.Unlock()
|
|
if w.enc == nil {
|
|
return 0, errors.New("Write after Close")
|
|
}
|
|
return w.enc.Write(p)
|
|
}
|
|
|
|
func (w *pooledZipWriter) Close() error {
|
|
w.mu.Lock()
|
|
defer w.mu.Unlock()
|
|
var err error
|
|
if w.enc != nil {
|
|
err = w.enc.Close()
|
|
w.pool.Put(w.enc)
|
|
w.enc = nil
|
|
}
|
|
return err
|
|
}
|
|
|
|
// ZipCompressor returns a compressor that can be registered with zip libraries.
|
|
// The provided encoder options will be used on all encodes.
|
|
func ZipCompressor(opts ...EOption) func(w io.Writer) (io.WriteCloser, error) {
|
|
var pool sync.Pool
|
|
return func(w io.Writer) (io.WriteCloser, error) {
|
|
enc, ok := pool.Get().(*Encoder)
|
|
if ok {
|
|
enc.Reset(w)
|
|
} else {
|
|
var err error
|
|
enc, err = NewWriter(w, opts...)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
return &pooledZipWriter{enc: enc, pool: &pool}, nil
|
|
}
|
|
}
|
|
|
|
// ZipDecompressor returns a decompressor that can be registered with zip libraries.
|
|
// See ZipCompressor for example.
|
|
func ZipDecompressor() func(r io.Reader) io.ReadCloser {
|
|
return func(r io.Reader) io.ReadCloser {
|
|
d, err := NewReader(r, WithDecoderConcurrency(1), WithDecoderLowmem(true))
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
return d.IOReadCloser()
|
|
}
|
|
}
|