neoris/core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove bytes.Buffer pool for memfs in order to be less a memory hog

Browse Source
This commit is contained in:
Ingo Oppermann 2023-04-06 21:43:18 +02:00
parent d2e5720fa2
commit 2c5f32fb26
No known key found for this signature in database
GPG Key ID: 2AB32426E9DD229E
1 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
io/fs/mem.go
View File

@ -66,7 +66,7 @@ func (f *memFileInfo) IsDir() bool {
type internalMemFile struct {
memFileInfo
data *bytes.Buffer // Contents of the file
data bytes.Buffer // Contents of the file
}
type memFile struct {
@ -126,9 +126,6 @@ type memFilesystem struct {
// Mutex for the files map
filesLock sync.RWMutex
// Pool for the storage of the contents of files
dataPool sync.Pool
// Current size of the filesystem in bytes
currentSize int64
@ -152,12 +149,6 @@ func NewMemFilesystem(config MemConfig) (Filesystem, error) {
fs.files = make(map[string]*internalMemFile)
fs.dataPool = sync.Pool{
New: func() interface{} {
return new(bytes.Buffer)
},
}
fs.logger.Debug().Log("Created")
return fs, nil
@ -281,11 +272,9 @@ func (fs *memFilesystem) Open(path string) File {
}
}
if file.data != nil {
newFile.lastMod = file.lastMod
newFile.data = bytes.NewReader(file.data.Bytes())
newFile.size = int64(newFile.data.Len())
}
newFile.lastMod = file.lastMod
newFile.data = bytes.NewReader(file.data.Bytes())
newFile.size = int64(file.data.Len())
return newFile
}
@ -308,11 +297,7 @@ func (fs *memFilesystem) ReadFile(path string) ([]byte, error) {
}
}
if file.data != nil {
return file.data.Bytes(), nil
}
return nil, nil
return file.data.Bytes(), nil
}
func (fs *memFilesystem) Symlink(oldname, newname string) error {
@ -344,7 +329,6 @@ func (fs *memFilesystem) Symlink(oldname, newname string) error {
lastMod: time.Now(),
linkTo: oldname,
},
data: nil,
}
fs.files[newname] = newFile
@ -370,7 +354,6 @@ func (fs *memFilesystem) WriteFileReader(path string, r io.Reader) (int64, bool,
size: 0,
lastMod: time.Now(),
},
data: fs.dataPool.Get().(*bytes.Buffer),
}
newFile.data.Reset()
@ -382,6 +365,8 @@ func (fs *memFilesystem) WriteFileReader(path string, r io.Reader) (int64, bool,
"error": err,
}).Warn().Log("Incomplete file")
newFile.data = bytes.Buffer{}
return -1, false, fmt.Errorf("incomplete file")
}
@ -396,8 +381,7 @@ func (fs *memFilesystem) WriteFileReader(path string, r io.Reader) (int64, bool,
fs.currentSize -= file.size
fs.dataPool.Put(file.data)
file.data = nil
file.data = bytes.Buffer{}
}
fs.files[path] = newFile
@ -449,8 +433,7 @@ func (fs *memFilesystem) Purge(size int64) int64 {
freed += f.size
fs.currentSize -= f.size
fs.dataPool.Put(f.data)
f.data = nil
f.data = bytes.Buffer{}
fs.logger.WithFields(log.Fields{
"path": f.name,
@ -490,7 +473,6 @@ func (fs *memFilesystem) MkdirAll(path string, perm os.FileMode) error {
dir: true,
lastMod: time.Now(),
},
data: nil,
}
fs.files[path] = f
@ -518,8 +500,7 @@ func (fs *memFilesystem) Rename(src, dst string) error {
if ok {
fs.currentSize -= dstFile.size
fs.dataPool.Put(dstFile.data)
dstFile.data = nil
dstFile.data = bytes.Buffer{}
}
fs.files[dst] = srcFile
@ -563,7 +544,6 @@ func (fs *memFilesystem) Copy(src, dst string) error {
size: srcFile.size,
lastMod: time.Now(),
},
data: fs.dataPool.Get().(*bytes.Buffer),
}
}
@ -664,8 +644,7 @@ func (fs *memFilesystem) remove(path string) int64 {
delete(fs.files, path)
fs.currentSize -= file.size
fs.dataPool.Put(file.data)
file.data = nil
file.data = bytes.Buffer{}
} else {
return -1
}