admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

cleanup: don't do stale check when passing --prune.

Browse Source 
This speeds up `--prune` fairly considerably.

Before:
```
$ hyperfine --warmup 3 'brew cleanup --prune=365'
Benchmark #1: brew cleanup --prune=365
  Time (mean ± σ):     33.352 s ±  0.654 s    [User: 21.684 s, System: 6.458 s]
  Range (min … max):   31.901 s … 34.096 s    10 runs
```

After:
```
$ hyperfine --warmup 3 'brew cleanup --prune=365'
Benchmark #1: brew cleanup --prune=365
  Time (mean ± σ):      6.821 s ±  0.186 s    [User: 2.225 s, System: 3.926 s]
  Range (min … max):    6.578 s …  7.178 s    10 runs
```

Closes https://github.com/Homebrew/brew/pull/10177/
Fixes https://github.com/Homebrew/brew/issues/10172
This commit is contained in:
Mike McQuaid 2020-12-31 13:40:49 +00:00
parent d8c6624bb7
commit 0d76400a80
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/cleanup.rb
View File

@ -141,7 +141,7 @@ module Homebrew
PERIODIC_CLEAN_FILE = (HOMEBREW_CACHE/".cleaned").freeze PERIODIC_CLEAN_FILE = (HOMEBREW_CACHE/".cleaned").freeze
attr_predicate :dry_run?, :scrub? attr_predicate :dry_run?, :scrub?, :prune?
attr_reader :args, :days, :cache, :disk_cleanup_size attr_reader :args, :days, :cache, :disk_cleanup_size
def initialize(*args, dry_run: false, scrub: false, days: nil, cache: HOMEBREW_CACHE) def initialize(*args, dry_run: false, scrub: false, days: nil, cache: HOMEBREW_CACHE)
@ -149,6 +149,7 @@ module Homebrew
@args = args @args = args
@dry_run = dry_run @dry_run = dry_run
@scrub = scrub @scrub = scrub
@prune = days.present?
@days = days || Homebrew::EnvConfig.cleanup_max_age_days.to_i @days = days || Homebrew::EnvConfig.cleanup_max_age_days.to_i
@cache = cache @cache = cache
@cleaned_up_paths = Set.new @cleaned_up_paths = Set.new
@ -316,7 +317,8 @@ module Homebrew
next next
end end
next cleanup_path(path) { path.unlink } if path.stale?(scrub: scrub?) # If we've specifed --prune don't do the (expensive) .stale? check.
cleanup_path(path) { path.unlink } if !prune? && path.stale?(scrub: scrub?)
end end
cleanup_unreferenced_downloads cleanup_unreferenced_downloads