diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-03-02 11:07:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-02 11:07:50 +0100 |
| commit | 3bddce7e3d79946b16216fe42661c229563219ca (patch) | |
| tree | 55eaad998ec6a4ffec945bf2d58503a6bf8b170e /SConstruct | |
| parent | c8d2bb24faaaa3443276c38bd7815626fa6e12aa (diff) | |
| parent | 29e6ec659405521c3ae0e2fe86098c45933fd2dc (diff) | |
Merge pull request #17168 from rraallvv/scons_master
Prune cache at the beginning and end of build (master)
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/SConstruct b/SConstruct index 45a590cb07..4ef302cac4 100644 --- a/SConstruct +++ b/SConstruct @@ -497,7 +497,6 @@ screen = sys.stdout node_count = 0 node_count_max = 0 node_count_interval = 1 -node_pruning = 8 # Number of nodes to process before prunning the cache if ('env' in locals()): node_count_fname = str(env.Dir('#')) + '/.scons_node_count' # Progress reporting is not available in non-TTY environments since it @@ -512,17 +511,15 @@ import time, math class cache_progress: # The default is 1 GB cache and 12 hours half life def __init__(self, path = None, limit = 1073741824, half_life = 43200): - global node_pruning self.path = path self.limit = limit self.exponent_scale = math.log(2) / half_life if env['verbose'] and path != None: screen.write('Current cache limit is ' + self.convert_size(limit) + ' (used: ' + self.convert_size(self.get_size(path)) + ')\n') - self.pruning = node_pruning self.delete(self.file_list()) def __call__(self, node, *args, **kw): - global node_count, node_count_max, node_count_interval, node_count_fname, node_pruning, show_progress + global node_count, node_count_max, node_count_interval, node_count_fname, show_progress if show_progress: # Print the progress percentage node_count += node_count_interval @@ -535,11 +532,6 @@ class cache_progress: else: screen.write('\r[Initial build] ') screen.flush() - # Prune if the number of nodes processed is 'node_pruning' or bigger - self.pruning -= node_count_interval - if self.pruning <= 0: - self.pruning = node_pruning - self.delete(self.file_list()) def delete(self, files): if len(files) == 0: @@ -547,7 +539,7 @@ class cache_progress: if env['verbose']: # Utter something screen.write('\rPurging %d %s from cache...\n' % (len(files), len(files) > 1 and 'files' or 'file')) - map(os.remove, files) + [os.remove(f) for f in files] def file_list(self): if self.path == None: |