MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-11 23:13:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

use direntPool, direntNamePool for reusable buffers (#12314)

Browse Source 
- in readDirFn re-use buffers from direntPool()
- in readDirN use separate dirent name buffer direntNamePool()
This commit is contained in:
Harshavardhana 2021-05-18 10:29:50 -07:00 committed by GitHub
parent c6b7dc012a
commit a70e0da19e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
cmd/os-readdir_unix.go
View File

@ -42,12 +42,21 @@ func access(name string) error {
const blockSize = 8 << 10 // 8192 const blockSize = 8 << 10 // 8192
// By default atleast 128 entries in single getdents call (1MiB buffer) // By default atleast 128 entries in single getdents call (1MiB buffer)
var direntPool = sync.Pool{ var (
New: func() interface{} { direntPool = sync.Pool{
buf := make([]byte, blockSize*128) New: func() interface{} {
return &buf buf := make([]byte, blockSize*128)
}, return &buf
} },
}
direntNamePool = sync.Pool{
New: func() interface{} {
buf := make([]byte, blockSize)
return &buf
},
}
)
// unexpectedFileMode is a sentinel (and bogus) os.FileMode // unexpectedFileMode is a sentinel (and bogus) os.FileMode
// value used to represent a syscall.DT_UNKNOWN Dirent.Type. // value used to represent a syscall.DT_UNKNOWN Dirent.Type.
@ -107,7 +116,10 @@ func readDirFn(dirPath string, fn func(name string, typ os.FileMode) error) erro
} }
defer f.Close() defer f.Close()
buf := make([]byte, blockSize) bufp := direntPool.Get().(*[]byte)
defer direntPool.Put(bufp)
buf := *bufp
boff := 0 // starting read position in buf boff := 0 // starting read position in buf
nbuf := 0 // end valid data in buf nbuf := 0 // end valid data in buf
@ -181,9 +193,10 @@ func readDirN(dirPath string, count int) (entries []string, err error) {
bufp := direntPool.Get().(*[]byte) bufp := direntPool.Get().(*[]byte)
defer direntPool.Put(bufp) defer direntPool.Put(bufp)
buf := *bufp
nameTmp := direntPool.Get().(*[]byte) nameTmp := direntNamePool.Get().(*[]byte)
defer direntPool.Put(nameTmp) defer direntNamePool.Put(nameTmp)
tmp := *nameTmp tmp := *nameTmp
boff := 0 // starting read position in buf boff := 0 // starting read position in buf
@ -192,7 +205,7 @@ func readDirN(dirPath string, count int) (entries []string, err error) {
for count != 0 { for count != 0 {
if boff >= nbuf { if boff >= nbuf {
boff = 0 boff = 0
nbuf, err = syscall.ReadDirent(int(f.Fd()), *bufp) nbuf, err = syscall.ReadDirent(int(f.Fd()), buf)
if err != nil { if err != nil {
if isSysErrNotDir(err) { if isSysErrNotDir(err) {
return nil, errFileNotFound return nil, errFileNotFound
@ -203,7 +216,7 @@ func readDirN(dirPath string, count int) (entries []string, err error) {
break break
} }
} }
consumed, name, typ, err := parseDirEnt((*bufp)[boff:nbuf]) consumed, name, typ, err := parseDirEnt(buf[boff:nbuf])
if err != nil { if err != nil {
return nil, err return nil, err
} }