Commit12c0101

committed

contentenc: add PReqPool and use it in DecryptBlocks

This gets us a massive speed boost in streaming reads.

1 parente4b5005 commit12c0101Copy full SHA for 12c0101

File tree

-2

lines changed

-2

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,8 @@ type ContentEnc struct {`
`60`	`60`	`CReqPoolbPool`
`61`	`61`	`// Plaintext block pool. Always returns plainBS-sized byte slices.`
`62`	`62`	`pBlockPoolbPool`
	`63`	`+// Plaintext request data pool. Slice have size fuse.MAX_KERNEL_WRITE.`
	`64`	`+PReqPoolbPool`
`63`	`65`	`}`
`64`	`66`
`65`	`67`	`// New returns an initialized ContentEnc instance.`
`@@ -80,6 +82,7 @@ func New(cc cryptocore.CryptoCore, plainBS uint64, forceDecode bool) ContentEn`
`80`	`82`	`cBlockPool:newBPool(int(cipherBS)),`
`81`	`83`	`CReqPool:newBPool(cReqSize),`
`82`	`84`	`pBlockPool:newBPool(int(plainBS)),`
	`85`	`+PReqPool:newBPool(fuse.MAX_KERNEL_WRITE),`
`83`	`86`	`}`
`84`	`87`	`returnc`
`85`	`88`	`}`
`@@ -98,7 +101,7 @@ func (be *ContentEnc) CipherBS() uint64 {`
`98`	`101`	`func (be*ContentEnc)DecryptBlocks(ciphertext []byte,firstBlockNouint64,fileID []byte) ([]byte,error) {`
`99`	`102`	`cBuf:=bytes.NewBuffer(ciphertext)`
`100`	`103`	`varerrerror`
`101`		`-varpBuf bytes.Buffer`
	`104`	`+pBuf:=bytes.NewBuffer(be.PReqPool.Get()[:0])`
`102`	`105`	`forcBuf.Len()>0 {`
`103`	`106`	`cBlock:=cBuf.Next(int(be.cipherBS))`
`104`	`107`	`varpBlock []byte`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,10 @@ func (f *file) doRead(dst []byte, off uint64, length uint64) ([]byte, fuse.Statu`
`214`	`214`	`}`
`215`	`215`	`// else: out stays empty, file was smaller than the requested offset`
`216`	`216`
`217`		`-returnappend(dst,out...),fuse.OK`
	`217`	`+out=append(dst,out...)`
	`218`	`+f.fs.contentEnc.PReqPool.Put(plaintext)`
	`219`	`+`
	`220`	`+returnout,fuse.OK`
`218`	`221`	`}`
`219`	`222`
`220`	`223`	`// Read - FUSE call`

Comments

(0)