mirror of
https://github.com/restic/restic.git
synced 2024-12-24 08:44:52 +00:00
662e07d17a
HMAC-SHA256 calls SHA256() twice which is very expensive. Therefore, this commit uses Poly1305-AES instead of HMAC-SHA256. benchcmp: benchmark old ns/op new ns/op delta BenchmarkChunkEncrypt 261033772 195114818 -25.25% BenchmarkChunkEncryptParallel 260973195 195787368 -24.98% BenchmarkArchiveDirectory 1050500651 1002615884 -4.56% BenchmarkPreload 23544286 24994508 +6.16% BenchmarkLoadTree 350065 427665 +22.17% BenchmarkEncryptWriter 87789753 31069126 -64.61% BenchmarkEncrypt 88283197 38259043 -56.66% BenchmarkDecryptReader 90478843 40714818 -55.00% BenchmarkEncryptDecryptReader 179917626 81231730 -54.85% BenchmarkDecrypt 87871591 37784207 -57.00% BenchmarkSaveJSON 52481 56861 +8.35% BenchmarkSaveFrom 75404085 51108596 -32.22% BenchmarkLoadJSONID 90545437 82696805 -8.67% benchmark old MB/s new MB/s speedup BenchmarkChunkEncrypt 40.17 53.74 1.34x BenchmarkChunkEncryptParallel 40.18 53.56 1.33x BenchmarkEncryptWriter 95.55 270.00 2.83x BenchmarkEncrypt 95.02 219.26 2.31x BenchmarkDecryptReader 92.71 206.03 2.22x BenchmarkEncryptDecryptReader 46.62 103.27 2.22x BenchmarkDecrypt 95.46 222.01 2.33x BenchmarkSaveFrom 55.62 82.07 1.48x benchmark old allocs new allocs delta BenchmarkChunkEncrypt 112 110 -1.79% BenchmarkChunkEncryptParallel 103 100 -2.91% BenchmarkArchiveDirectory 383704 392083 +2.18% BenchmarkPreload 21765 21874 +0.50% BenchmarkLoadTree 341 436 +27.86% BenchmarkEncryptWriter 20 17 -15.00% BenchmarkEncrypt 14 13 -7.14% BenchmarkDecryptReader 18 15 -16.67% BenchmarkEncryptDecryptReader 46 39 -15.22% BenchmarkDecrypt 16 12 -25.00% BenchmarkSaveJSON 81 86 +6.17% BenchmarkSaveFrom 117 121 +3.42% BenchmarkLoadJSONID 80525 80264 -0.32% benchmark old bytes new bytes delta BenchmarkChunkEncrypt 118956 64697 -45.61% BenchmarkChunkEncryptParallel 118972 64681 -45.63% BenchmarkArchiveDirectory 160236600 177498232 +10.77% BenchmarkPreload 2772488 3302992 +19.13% BenchmarkLoadTree 49102 46484 -5.33% BenchmarkEncryptWriter 28927 8388146 +28897.64% BenchmarkEncrypt 2473 1950 -21.15% BenchmarkDecryptReader 527827 2774 -99.47% BenchmarkEncryptDecryptReader 4100875 1528036 -62.74% BenchmarkDecrypt 2509 2154 -14.15% BenchmarkSaveJSON 4971 5892 +18.53% BenchmarkSaveFrom 40117 31742 -20.88% BenchmarkLoadJSONID 9444217 9442106 -0.02% This closes #102.
154 lines
3.3 KiB
Go
154 lines
3.3 KiB
Go
package restic
|
|
|
|
import (
|
|
"crypto/sha256"
|
|
"sync"
|
|
|
|
"github.com/restic/restic/chunker"
|
|
"github.com/restic/restic/debug"
|
|
)
|
|
|
|
type poolStats struct {
|
|
m sync.Mutex
|
|
mget map[string]int
|
|
mput map[string]int
|
|
mmax map[string]int
|
|
|
|
new int
|
|
get int
|
|
put int
|
|
max int
|
|
}
|
|
|
|
func (s *poolStats) Get(k string) {
|
|
s.m.Lock()
|
|
defer s.m.Unlock()
|
|
|
|
s.get += 1
|
|
cur := s.get - s.put
|
|
if cur > s.max {
|
|
s.max = cur
|
|
}
|
|
|
|
if k != "" {
|
|
if _, ok := s.mget[k]; !ok {
|
|
s.mget[k] = 0
|
|
s.mput[k] = 0
|
|
s.mmax[k] = 0
|
|
}
|
|
|
|
s.mget[k]++
|
|
|
|
cur = s.mget[k] - s.mput[k]
|
|
if cur > s.mmax[k] {
|
|
s.mmax[k] = cur
|
|
}
|
|
}
|
|
}
|
|
|
|
func (s *poolStats) Put(k string) {
|
|
s.m.Lock()
|
|
defer s.m.Unlock()
|
|
|
|
s.put += 1
|
|
|
|
if k != "" {
|
|
s.mput[k]++
|
|
}
|
|
}
|
|
|
|
func newPoolStats() *poolStats {
|
|
return &poolStats{
|
|
mget: make(map[string]int),
|
|
mput: make(map[string]int),
|
|
mmax: make(map[string]int),
|
|
}
|
|
}
|
|
|
|
var (
|
|
chunkPool = sync.Pool{New: newChunkBuf}
|
|
nodePool = sync.Pool{New: newNode}
|
|
chunkerPool = sync.Pool{New: newChunker}
|
|
|
|
chunkStats = newPoolStats()
|
|
nodeStats = newPoolStats()
|
|
chunkerStats = newPoolStats()
|
|
)
|
|
|
|
func newChunkBuf() interface{} {
|
|
chunkStats.m.Lock()
|
|
defer chunkStats.m.Unlock()
|
|
chunkStats.new++
|
|
|
|
// create buffer for iv, data and mac
|
|
return make([]byte, maxCiphertextSize)
|
|
}
|
|
|
|
func newNode() interface{} {
|
|
nodeStats.m.Lock()
|
|
defer nodeStats.m.Unlock()
|
|
nodeStats.new++
|
|
|
|
// create buffer for iv, data and hmac
|
|
return new(Node)
|
|
}
|
|
|
|
func newChunker() interface{} {
|
|
chunkStats.m.Lock()
|
|
defer chunkStats.m.Unlock()
|
|
chunkStats.new++
|
|
|
|
// create a new chunker with a nil reader
|
|
return chunker.New(nil, chunkerBufSize, sha256.New())
|
|
}
|
|
|
|
func GetChunkBuf(s string) []byte {
|
|
chunkStats.Get(s)
|
|
return chunkPool.Get().([]byte)
|
|
}
|
|
|
|
func FreeChunkBuf(s string, buf []byte) {
|
|
chunkStats.Put(s)
|
|
chunkPool.Put(buf)
|
|
}
|
|
|
|
func GetNode() *Node {
|
|
nodeStats.Get("")
|
|
return nodePool.Get().(*Node)
|
|
}
|
|
|
|
func FreeNode(n *Node) {
|
|
nodeStats.Put("")
|
|
nodePool.Put(n)
|
|
}
|
|
|
|
func GetChunker(s string) *chunker.Chunker {
|
|
chunkerStats.Get(s)
|
|
return chunkerPool.Get().(*chunker.Chunker)
|
|
}
|
|
|
|
func FreeChunker(s string, ch *chunker.Chunker) {
|
|
chunkerStats.Put(s)
|
|
chunkerPool.Put(ch)
|
|
}
|
|
|
|
func PoolAlloc() {
|
|
debug.Log("pools.PoolAlloc", "pool stats for chunk: new %d, get %d, put %d, diff %d, max %d\n",
|
|
chunkStats.new, chunkStats.get, chunkStats.put, chunkStats.get-chunkStats.put, chunkStats.max)
|
|
for k, v := range chunkStats.mget {
|
|
debug.Log("pools.PoolAlloc", "pool stats for chunk[%s]: get %d, put %d, diff %d, max %d\n",
|
|
k, v, chunkStats.mput[k], v-chunkStats.mput[k], chunkStats.mmax[k])
|
|
}
|
|
|
|
debug.Log("pools.PoolAlloc", "pool stats for node: new %d, get %d, put %d, diff %d, max %d\n",
|
|
nodeStats.new, nodeStats.get, nodeStats.put, nodeStats.get-nodeStats.put, nodeStats.max)
|
|
for k, v := range nodeStats.mget {
|
|
debug.Log("pools.PoolAlloc", "pool stats for node[%s]: get %d, put %d, diff %d, max %d\n", k, v, nodeStats.mput[k], v-nodeStats.mput[k], nodeStats.mmax[k])
|
|
}
|
|
|
|
debug.Log("pools.PoolAlloc", "pool stats for chunker: new %d, get %d, put %d, diff %d, max %d\n",
|
|
chunkerStats.new, chunkerStats.get, chunkerStats.put, chunkerStats.get-chunkerStats.put, chunkerStats.max)
|
|
for k, v := range chunkerStats.mget {
|
|
debug.Log("pools.PoolAlloc", "pool stats for chunker[%s]: get %d, put %d, diff %d, max %d\n", k, v, chunkerStats.mput[k], v-chunkerStats.mput[k], chunkerStats.mmax[k])
|
|
}
|
|
}
|