cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

use stat.Blocks and not info.Size

Browse Source
This commit is contained in:
Anton Evangelatov 2021-01-19 17:52:24 +01:00
parent 16d07d3f18
commit 834a6148b0
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extern/sector-storage/fsutil/filesize_unix.go vendored
View File

@ -3,6 +3,7 @@ package fsutil
import ( import (
"os" "os"
"path/filepath" "path/filepath"
"syscall"
"golang.org/x/xerrors" "golang.org/x/xerrors"
) )
@ -12,6 +13,7 @@ type SizeInfo struct {
} }
// FileSize returns bytes used by a file or directory on disk // FileSize returns bytes used by a file or directory on disk
// NOTE: We care about the allocated bytes, not file or directory size
func FileSize(path string) (SizeInfo, error) { func FileSize(path string) (SizeInfo, error) {
var size int64 var size int64
err := filepath.Walk(path, func(_ string, info os.FileInfo, err error) error { err := filepath.Walk(path, func(_ string, info os.FileInfo, err error) error {
@ -19,7 +21,11 @@ func FileSize(path string) (SizeInfo, error) {
return err return err
} }
if !info.IsDir() { if !info.IsDir() {
size += info.Size() stat := info.Sys().(*syscall.Stat_t)
// NOTE: stat.Blocks is in 512B blocks, NOT in stat.Blksize return SizeInfo{size}, nil
// See https://www.gnu.org/software/libc/manual/html_node/Attribute-Meanings.html
size += int64(stat.Blocks) * 512 // nolint NOTE: int64 cast is needed on osx
} }
return err return err
}) })