diff options
author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2016-01-26 15:34:27 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-18 07:41:15 +0000 |
commit | 97617fd6755ffa25c058215ffb060cbb86240b44 (patch) | |
tree | 77d7cc37dcad0a9586e94da9c1851e4b55cca67f /bitbake | |
parent | 5a87d8c477ea829012785f2b284307c56f42787c (diff) | |
download | poky-97617fd6755ffa25c058215ffb060cbb86240b44.tar.gz |
bitbake: bb/cache: drop some unused arguments
Drop unused 'd' argument from the cache save methods, simplifying the
API.
(Bitbake rev: 81bc1f20662c39ee8db1da45b1e8c7eb64abacf3)
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/cache.py | 4 | ||||
-rw-r--r-- | bitbake/lib/bb/codeparser.py | 8 | ||||
-rw-r--r-- | bitbake/lib/bb/cooker.py | 8 | ||||
-rw-r--r-- | bitbake/lib/bb/fetch2/__init__.py | 10 |
4 files changed, 15 insertions, 15 deletions
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index 8485eb467a..55283b03d6 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py | |||
@@ -785,7 +785,7 @@ class MultiProcessCache(object): | |||
785 | data = [{}] | 785 | data = [{}] |
786 | return data | 786 | return data |
787 | 787 | ||
788 | def save_extras(self, d): | 788 | def save_extras(self): |
789 | if not self.cachefile: | 789 | if not self.cachefile: |
790 | return | 790 | return |
791 | 791 | ||
@@ -815,7 +815,7 @@ class MultiProcessCache(object): | |||
815 | if h not in dest[j]: | 815 | if h not in dest[j]: |
816 | dest[j][h] = source[j][h] | 816 | dest[j][h] = source[j][h] |
817 | 817 | ||
818 | def save_merge(self, d): | 818 | def save_merge(self): |
819 | if not self.cachefile: | 819 | if not self.cachefile: |
820 | return | 820 | return |
821 | 821 | ||
diff --git a/bitbake/lib/bb/codeparser.py b/bitbake/lib/bb/codeparser.py index 2094f1337c..3ee4d5622b 100644 --- a/bitbake/lib/bb/codeparser.py +++ b/bitbake/lib/bb/codeparser.py | |||
@@ -167,11 +167,11 @@ codeparsercache = CodeParserCache() | |||
167 | def parser_cache_init(d): | 167 | def parser_cache_init(d): |
168 | codeparsercache.init_cache(d) | 168 | codeparsercache.init_cache(d) |
169 | 169 | ||
170 | def parser_cache_save(d): | 170 | def parser_cache_save(): |
171 | codeparsercache.save_extras(d) | 171 | codeparsercache.save_extras() |
172 | 172 | ||
173 | def parser_cache_savemerge(d): | 173 | def parser_cache_savemerge(): |
174 | codeparsercache.save_merge(d) | 174 | codeparsercache.save_merge() |
175 | 175 | ||
176 | Logger = logging.getLoggerClass() | 176 | Logger = logging.getLoggerClass() |
177 | class BufferedLogger(Logger): | 177 | class BufferedLogger(Logger): |
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index b4486f3078..96cefc73fd 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -2030,8 +2030,8 @@ class CookerParser(object): | |||
2030 | def init(): | 2030 | def init(): |
2031 | Parser.cfg = self.cfgdata | 2031 | Parser.cfg = self.cfgdata |
2032 | bb.utils.set_process_name(multiprocessing.current_process().name) | 2032 | bb.utils.set_process_name(multiprocessing.current_process().name) |
2033 | multiprocessing.util.Finalize(None, bb.codeparser.parser_cache_save, args=(self.cfgdata,), exitpriority=1) | 2033 | multiprocessing.util.Finalize(None, bb.codeparser.parser_cache_save, exitpriority=1) |
2034 | multiprocessing.util.Finalize(None, bb.fetch.fetcher_parse_save, args=(self.cfgdata,), exitpriority=1) | 2034 | multiprocessing.util.Finalize(None, bb.fetch.fetcher_parse_save, exitpriority=1) |
2035 | 2035 | ||
2036 | self.feeder_quit = multiprocessing.Queue(maxsize=1) | 2036 | self.feeder_quit = multiprocessing.Queue(maxsize=1) |
2037 | self.parser_quit = multiprocessing.Queue(maxsize=self.num_processes) | 2037 | self.parser_quit = multiprocessing.Queue(maxsize=self.num_processes) |
@@ -2085,8 +2085,8 @@ class CookerParser(object): | |||
2085 | sync = threading.Thread(target=self.bb_cache.sync) | 2085 | sync = threading.Thread(target=self.bb_cache.sync) |
2086 | sync.start() | 2086 | sync.start() |
2087 | multiprocessing.util.Finalize(None, sync.join, exitpriority=-100) | 2087 | multiprocessing.util.Finalize(None, sync.join, exitpriority=-100) |
2088 | bb.codeparser.parser_cache_savemerge(self.cooker.data) | 2088 | bb.codeparser.parser_cache_savemerge() |
2089 | bb.fetch.fetcher_parse_done(self.cooker.data) | 2089 | bb.fetch.fetcher_parse_done() |
2090 | if self.cooker.configuration.profile: | 2090 | if self.cooker.configuration.profile: |
2091 | profiles = [] | 2091 | profiles = [] |
2092 | for i in self.process_names: | 2092 | for i in self.process_names: |
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index c3dcfd2ccb..83122e856c 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py | |||
@@ -515,13 +515,13 @@ def fetcher_init(d): | |||
515 | if hasattr(m, "init"): | 515 | if hasattr(m, "init"): |
516 | m.init(d) | 516 | m.init(d) |
517 | 517 | ||
518 | def fetcher_parse_save(d): | 518 | def fetcher_parse_save(): |
519 | _checksum_cache.save_extras(d) | 519 | _checksum_cache.save_extras() |
520 | 520 | ||
521 | def fetcher_parse_done(d): | 521 | def fetcher_parse_done(): |
522 | _checksum_cache.save_merge(d) | 522 | _checksum_cache.save_merge() |
523 | 523 | ||
524 | def fetcher_compare_revisions(d): | 524 | def fetcher_compare_revisions(): |
525 | """ | 525 | """ |
526 | Compare the revisions in the persistant cache with current values and | 526 | Compare the revisions in the persistant cache with current values and |
527 | return true/false on whether they've changed. | 527 | return true/false on whether they've changed. |