Skip to content

Commit

Permalink
contentenc: add PReqPool and use it in DecryptBlocks
Browse files Browse the repository at this point in the history
This gets us a massive speed boost in streaming reads.
  • Loading branch information
rfjakob committed Jun 30, 2017
1 parent e4b5005 commit 12c0101
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
5 changes: 4 additions & 1 deletion internal/contentenc/content.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ type ContentEnc struct {
CReqPool bPool
// Plaintext block pool. Always returns plainBS-sized byte slices.
pBlockPool bPool
// Plaintext request data pool. Slice have size fuse.MAX_KERNEL_WRITE.
PReqPool bPool
}

// New returns an initialized ContentEnc instance.
Expand All @@ -80,6 +82,7 @@ func New(cc *cryptocore.CryptoCore, plainBS uint64, forceDecode bool) *ContentEn
cBlockPool: newBPool(int(cipherBS)),
CReqPool: newBPool(cReqSize),
pBlockPool: newBPool(int(plainBS)),
PReqPool: newBPool(fuse.MAX_KERNEL_WRITE),
}
return c
}
Expand All @@ -98,7 +101,7 @@ func (be *ContentEnc) CipherBS() uint64 {
func (be *ContentEnc) DecryptBlocks(ciphertext []byte, firstBlockNo uint64, fileID []byte) ([]byte, error) {
cBuf := bytes.NewBuffer(ciphertext)
var err error
var pBuf bytes.Buffer
pBuf := bytes.NewBuffer(be.PReqPool.Get()[:0])
for cBuf.Len() > 0 {
cBlock := cBuf.Next(int(be.cipherBS))
var pBlock []byte
Expand Down
5 changes: 4 additions & 1 deletion internal/fusefrontend/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,10 @@ func (f *file) doRead(dst []byte, off uint64, length uint64) ([]byte, fuse.Statu
}
// else: out stays empty, file was smaller than the requested offset

return append(dst, out...), fuse.OK
out = append(dst, out...)
f.fs.contentEnc.PReqPool.Put(plaintext)

return out, fuse.OK
}

// Read - FUSE call
Expand Down

0 comments on commit 12c0101

Please sign in to comment.