added directory cleanup
This commit is contained in:
parent
f3e2a9240d
commit
74ab10358a
5 changed files with 87 additions and 22 deletions
|
|
@ -8,6 +8,8 @@ import (
|
|||
"os"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/go-logr/logr"
|
||||
)
|
||||
|
||||
var NoCacheEntry = errors.New("no cache entry")
|
||||
|
|
@ -42,8 +44,9 @@ func (dc *DirCache) Set(name string, dce *DirCacheEntry) {
|
|||
}
|
||||
|
||||
type Dir struct {
|
||||
f *os.File
|
||||
dc *DirCache
|
||||
log logr.Logger
|
||||
f *os.File
|
||||
dc *DirCache
|
||||
}
|
||||
|
||||
func (f *Dir) Read(_ []byte) (int, error) {
|
||||
|
|
@ -54,6 +57,19 @@ func (f *Dir) Seek(_ int64, _ int) (int64, error) {
|
|||
return 0, io.EOF
|
||||
}
|
||||
|
||||
func readDir(f *os.File) (fi []os.FileInfo, err error) {
|
||||
ent, err := f.ReadDir(0)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
fi = make([]os.FileInfo, len(ent))
|
||||
for j, e := range ent {
|
||||
i, _ := e.Info()
|
||||
fi[j] = i
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func (f *Dir) Readdir(_ int) (fi []os.FileInfo, err error) {
|
||||
i, err := f.Stat()
|
||||
if err != nil {
|
||||
|
|
@ -61,13 +77,17 @@ func (f *Dir) Readdir(_ int) (fi []os.FileInfo, err error) {
|
|||
}
|
||||
name := f.f.Name()
|
||||
dce, err := f.dc.Get(name)
|
||||
log := f.log
|
||||
if err == NoCacheEntry || i.ModTime().After(dce.mtime) {
|
||||
fi, err = f.f.Readdir(0)
|
||||
log.V(3).Info("cache miss")
|
||||
fi, err = readDir(f.f)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
dce = &DirCacheEntry{i.ModTime(), fi}
|
||||
f.dc.Set(name, dce)
|
||||
} else {
|
||||
log.V(3).Info("cache hit")
|
||||
}
|
||||
fi = dce.fi
|
||||
return
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue