diff options
author | Joshua Watt <JPEWhacker@gmail.com> | 2020-03-09 11:33:50 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-13 11:29:23 +0000 |
commit | 554894287ec8f3bd0612dddabee43213c12c3dc3 (patch) | |
tree | 70d33d8423acbb9d7934b747241497b1d5c83159 /bitbake/lib/bb/runqueue.py | |
parent | 64e7ee43769925492e35854ce4ee307e00c74844 (diff) | |
download | poky-554894287ec8f3bd0612dddabee43213c12c3dc3.tar.gz |
bitbake: runqueue/siggen: Log hash equivalence with a different logger
Switches the hash equivalence logging to use a different logger so that
it can be easily filtered out with python's structured logging.
(Bitbake rev: 20bb29ef973e9c5483eb50a74550ea207637367b)
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/runqueue.py')
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 4106fa4bc4..e84890b8b7 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -27,6 +27,7 @@ import pprint | |||
27 | 27 | ||
28 | bblogger = logging.getLogger("BitBake") | 28 | bblogger = logging.getLogger("BitBake") |
29 | logger = logging.getLogger("BitBake.RunQueue") | 29 | logger = logging.getLogger("BitBake.RunQueue") |
30 | hashequiv_logger = logging.getLogger("BitBake.RunQueue.HashEquiv") | ||
30 | 31 | ||
31 | __find_sha256__ = re.compile( r'(?i)(?<![a-z0-9])[a-f0-9]{64}(?![a-z0-9])' ) | 32 | __find_sha256__ = re.compile( r'(?i)(?<![a-z0-9])[a-f0-9]{64}(?![a-z0-9])' ) |
32 | 33 | ||
@@ -2263,7 +2264,7 @@ class RunQueueExecute: | |||
2263 | self.updated_taskhash_queue.remove((tid, unihash)) | 2264 | self.updated_taskhash_queue.remove((tid, unihash)) |
2264 | 2265 | ||
2265 | if unihash != self.rqdata.runtaskentries[tid].unihash: | 2266 | if unihash != self.rqdata.runtaskentries[tid].unihash: |
2266 | logger.info("Task %s unihash changed to %s" % (tid, unihash)) | 2267 | hashequiv_logger.info("Task %s unihash changed to %s" % (tid, unihash)) |
2267 | self.rqdata.runtaskentries[tid].unihash = unihash | 2268 | self.rqdata.runtaskentries[tid].unihash = unihash |
2268 | bb.parse.siggen.set_unihash(tid, unihash) | 2269 | bb.parse.siggen.set_unihash(tid, unihash) |
2269 | toprocess.add(tid) | 2270 | toprocess.add(tid) |
@@ -2308,7 +2309,7 @@ class RunQueueExecute: | |||
2308 | elif tid in self.scenequeue_covered or tid in self.sq_live: | 2309 | elif tid in self.scenequeue_covered or tid in self.sq_live: |
2309 | # Already ran this setscene task or it running. Report the new taskhash | 2310 | # Already ran this setscene task or it running. Report the new taskhash |
2310 | bb.parse.siggen.report_unihash_equiv(tid, newhash, origuni, newuni, self.rqdata.dataCaches) | 2311 | bb.parse.siggen.report_unihash_equiv(tid, newhash, origuni, newuni, self.rqdata.dataCaches) |
2311 | logger.info("Already covered setscene for %s so ignoring rehash (remap)" % (tid)) | 2312 | hashequiv_logger.info("Already covered setscene for %s so ignoring rehash (remap)" % (tid)) |
2312 | remapped = True | 2313 | remapped = True |
2313 | 2314 | ||
2314 | if not remapped: | 2315 | if not remapped: |
@@ -2327,7 +2328,7 @@ class RunQueueExecute: | |||
2327 | for mc in self.rq.fakeworker: | 2328 | for mc in self.rq.fakeworker: |
2328 | self.rq.fakeworker[mc].process.stdin.write(b"<newtaskhashes>" + pickle.dumps(bb.parse.siggen.get_taskhashes()) + b"</newtaskhashes>") | 2329 | self.rq.fakeworker[mc].process.stdin.write(b"<newtaskhashes>" + pickle.dumps(bb.parse.siggen.get_taskhashes()) + b"</newtaskhashes>") |
2329 | 2330 | ||
2330 | logger.debug(1, pprint.pformat("Tasks changed:\n%s" % (changed))) | 2331 | hashequiv_logger.debug(1, pprint.pformat("Tasks changed:\n%s" % (changed))) |
2331 | 2332 | ||
2332 | for tid in changed: | 2333 | for tid in changed: |
2333 | if tid not in self.rqdata.runq_setscene_tids: | 2334 | if tid not in self.rqdata.runq_setscene_tids: |
@@ -2346,7 +2347,7 @@ class RunQueueExecute: | |||
2346 | # Check no tasks this covers are running | 2347 | # Check no tasks this covers are running |
2347 | for dep in self.sqdata.sq_covered_tasks[tid]: | 2348 | for dep in self.sqdata.sq_covered_tasks[tid]: |
2348 | if dep in self.runq_running and dep not in self.runq_complete: | 2349 | if dep in self.runq_running and dep not in self.runq_complete: |
2349 | logger.debug(2, "Task %s is running which blocks setscene for %s from running" % (dep, tid)) | 2350 | hashequiv_logger.debug(2, "Task %s is running which blocks setscene for %s from running" % (dep, tid)) |
2350 | valid = False | 2351 | valid = False |
2351 | break | 2352 | break |
2352 | if not valid: | 2353 | if not valid: |
@@ -2409,7 +2410,7 @@ class RunQueueExecute: | |||
2409 | 2410 | ||
2410 | for (tid, harddepfail, origvalid) in update_tasks: | 2411 | for (tid, harddepfail, origvalid) in update_tasks: |
2411 | if tid in self.sqdata.valid and not origvalid: | 2412 | if tid in self.sqdata.valid and not origvalid: |
2412 | logger.info("Setscene task %s became valid" % tid) | 2413 | hashequiv_logger.info("Setscene task %s became valid" % tid) |
2413 | if harddepfail: | 2414 | if harddepfail: |
2414 | self.sq_task_failoutright(tid) | 2415 | self.sq_task_failoutright(tid) |
2415 | 2416 | ||