[oe-commits] [bitbake] 02/02: further fixes

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit 0d2f4c451851232f3d94a690b9f597534748e15e
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Tue Dec 3 18:35:24 2019 +0000

    further fixes
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/runqueue.py | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py
index f505488..246a9cd 100644
--- a/lib/bb/runqueue.py
+++ b/lib/bb/runqueue.py
@@ -1718,7 +1718,6 @@ class RunQueueExecute:
         self.sq_deferred = {}
 
         self.stampcache = {}
-        self.rehashes = {}
 
         self.holdoff_tasks = set()
         self.holdoff_need_update = True
@@ -2289,7 +2288,10 @@ class RunQueueExecute:
                         newuni = bb.parse.siggen.get_unihash(tid)
                         # FIXME, need to check it can come from sstate at all for determinism?
                         remapped = False
-                        if (tid in self.scenequeue_covered or tid in self.sq_live) and newuni != origuni:
+                        if newuni == origuni:
+                            # Nothing to do, we match, skip code below
+                            remapped = True
+                        elif tid in self.scenequeue_covered or tid in self.sq_live:
                             # Already ran this setscene task or it running. Report the new taskhash
                             remapped = bb.parse.siggen.report_unihash_equiv(tid, newhash, origuni, newuni, self.rqdata.dataCaches)
                             logger.info("Already covered setscene for %s so ignoring rehash (remap)" % (tid))
@@ -2298,14 +2300,8 @@ class RunQueueExecute:
                             logger.debug(1, "Task %s hash changes: %s->%s %s->%s" % (tid, orighash, newhash, origuni, newuni))
                             self.rqdata.runtaskentries[tid].hash = newhash
                             self.rqdata.runtaskentries[tid].unihash = newuni
-                            self.rehashes[tid] = origuni
                             changed.add(tid)
 
-                        #if orighash == self.rqdata.runtaskentries[tid].hash and origuni == self.rqdata.runtaskentries[tid].unihash:
-                            #logger.info("Task hash didn't change for: %s" % (tid))
-                        #    continue
-                        #else:
-
                         next |= self.rqdata.runtaskentries[tid].revdeps
                         total.remove(tid)
                         next.intersection_update(total)
@@ -2325,19 +2321,11 @@ class RunQueueExecute:
                 self.pending_migrations.add(tid)
 
         for tid in self.pending_migrations.copy():
-            if tid in self.runq_running:
+            if tid in self.runq_running or tid in self.sq_live:
                 # Too late, task already running, not much we can do now
                 self.pending_migrations.remove(tid)
                 continue
 
-            if tid in self.scenequeue_covered or tid in self.sq_live:
-                # Already ran this setscene task or it running
-                # "Force" the new taskhash to be equivalent to the old unihash
-                bb.parse.siggen.report_unihash_equiv(tid, self.rqdata.runtaskentries[tid].hash, self.rehashes[tid], self.rqdata.runtaskentries[tid].unihash, self.rqdata.dataCaches)
-                logger.info("Already covered setscene for %s so ignoring rehash (pending migration)" % (tid))
-                self.pending_migrations.remove(tid)
-                continue
-
             valid = True
             # Check no tasks this covers are running
             for dep in self.sqdata.sq_covered_tasks[tid]:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.