mirror
/
restic
mirror of https://github.com/restic/restic.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2602 from greatroar/no-bufpool 

Remove sync.Pool from internal/repository
This commit is contained in:
Alexander Neumann 2020-03-01 10:50:57 +01:00 committed by GitHub
parent e851d29565 8526cc6647
commit c50f91b7f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
internal/repository/pool.go
View File

@ -1,21 +0,0 @@
package repository
import (
"sync"
"github.com/restic/chunker"
)
var bufPool = sync.Pool{
New: func() interface{} {
return make([]byte, chunker.MaxSize/3)
},
}
func getBuf() []byte {
return bufPool.Get().([]byte)
}
func freeBuf(data []byte) {
bufPool.Put(data)
}

7
internal/repository/repository.go
View File

@ -225,13 +225,10 @@ func (r *Repository) SaveAndEncrypt(ctx context.Context, t restic.BlobType, data
debug.Log("save id %v (%v, %d bytes)", id, t, len(data)) debug.Log("save id %v (%v, %d bytes)", id, t, len(data))
// get buf from the pool
ciphertext := getBuf()
ciphertext = ciphertext[:0]
nonce := crypto.NewRandomNonce() nonce := crypto.NewRandomNonce()
ciphertext := make([]byte, 0, restic.CiphertextLength(len(data)))
ciphertext = append(ciphertext, nonce...) ciphertext = append(ciphertext, nonce...)
defer freeBuf(ciphertext)
// encrypt blob // encrypt blob
ciphertext = r.key.Seal(ciphertext, nonce, data, nil) ciphertext = r.key.Seal(ciphertext, nonce, data, nil)

1
internal/repository/repository_test.go
View File

@ -104,6 +104,7 @@ func BenchmarkSaveAndEncrypt(t *testing.B) {
id := restic.ID(sha256.Sum256(data)) id := restic.ID(sha256.Sum256(data))
t.ReportAllocs()
t.ResetTimer() t.ResetTimer()
t.SetBytes(int64(size)) t.SetBytes(int64(size))