Skip to content

Support cancellation via context in DiskUsage. #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AkihiroSuda merged 1 commit into from
Jun 12, 2018
Merged

Support cancellation via context in DiskUsage. #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions fs/du.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ type Usage struct {

// DiskUsage counts the number of inodes and disk usage for the resources under
// path.
func DiskUsage(roots ...string) (Usage, error) {
return diskUsage(roots...)
func DiskUsage(ctx context.Context, roots ...string) (Usage, error) {
return diskUsage(ctx, roots...)
}

// DiffUsage counts the numbers of inodes and disk usage in the
Expand Down
8 changes: 7 additions & 1 deletion fs/du_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func newInode(stat *syscall.Stat_t) inode {
}
}

func diskUsage(roots ...string) (Usage, error) {
func diskUsage(ctx context.Context, roots ...string) (Usage, error) {

var (
size int64
Expand All @@ -37,6 +37,12 @@ func diskUsage(roots ...string) (Usage, error) {
return err
}

select {
case <-ctx.Done():
return ctx.Err()
default:
}

inoKey := newInode(fi.Sys().(*syscall.Stat_t))
if _, ok := inodes[inoKey]; !ok {
inodes[inoKey] = struct{}{}
Expand Down
8 changes: 7 additions & 1 deletion fs/du_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"path/filepath"
)

func diskUsage(roots ...string) (Usage, error) {
func diskUsage(ctx context.Context, roots ...string) (Usage, error) {
var (
size int64
)
Expand All @@ -21,6 +21,12 @@ func diskUsage(roots ...string) (Usage, error) {
return err
}

select {
case <-ctx.Done():
return ctx.Err()
default:
}

size += fi.Size()
return nil
}); err != nil {
Expand Down