aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCristian Staretu <unclejacksons@gmail.com>2014-07-03 09:41:19 +1000
committerDavid Symonds <dsymonds@golang.org>2014-07-03 09:41:19 +1000
commit61ccc1f05fe6e79ec79e59166e1a3fa3454ab406 (patch)
tree33e0d9b3350be9e711c8e17f9bbf32b06edb4f51 /src
parentfe5a358aaeb7e582b763125c1e05e601ccad3b63 (diff)
downloadgo-61ccc1f05fe6e79ec79e59166e1a3fa3454ab406.tar.xz
archive/tar: reuse temporary buffer in readHeader
A temporary 512 bytes buffer is allocated for every call to readHeader. This buffer isn't returned to the caller and it could be reused to lower the number of memory allocations. This CL improves it by using a pool and zeroing out the buffer before putting it back into the pool. benchmark old ns/op new ns/op delta BenchmarkListFiles100k 545249903 538832687 -1.18% benchmark old allocs new allocs delta BenchmarkListFiles100k 2105167 2005692 -4.73% benchmark old bytes new bytes delta BenchmarkListFiles100k 105903472 54831527 -48.22% This improvement is very important if your code has to deal with a lot of tarballs which contain a lot of files. LGTM=dsymonds R=golang-codereviews, dave, dsymonds, bradfitz CC=golang-codereviews https://golang.org/cl/108240044
Diffstat (limited to 'src')
-rw-r--r--src/pkg/archive/tar/reader.go13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/pkg/archive/tar/reader.go b/src/pkg/archive/tar/reader.go
index 920a9b08f9..a27559d0f0 100644
--- a/src/pkg/archive/tar/reader.go
+++ b/src/pkg/archive/tar/reader.go
@@ -29,10 +29,11 @@ const maxNanoSecondIntSize = 9
// The Next method advances to the next file in the archive (including the first),
// and then it can be treated as an io.Reader to access the file's data.
type Reader struct {
- r io.Reader
- err error
- pad int64 // amount of padding (ignored) after current file entry
- curr numBytesReader // reader for current file entry
+ r io.Reader
+ err error
+ pad int64 // amount of padding (ignored) after current file entry
+ curr numBytesReader // reader for current file entry
+ hdrBuff [blockSize]byte // buffer to use in readHeader
}
// A numBytesReader is an io.Reader with a numBytes method, returning the number
@@ -426,7 +427,9 @@ func (tr *Reader) verifyChecksum(header []byte) bool {
}
func (tr *Reader) readHeader() *Header {
- header := make([]byte, blockSize)
+ header := tr.hdrBuff[:]
+ copy(header, zeroBlock)
+
if _, tr.err = io.ReadFull(tr.r, header); tr.err != nil {
return nil
}