[oe-commits] [bitbake] branch master-next updated: runqueue: Fix

[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.

The following commit(s) were added to refs/heads/master-next by this push:
     new 28d035b  runqueue: Fix
28d035b is described below

commit 28d035b70feb1cd38bf1e0c463d846d0ed963344
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Tue Jul 9 20:58:36 2019 +0100

    runqueue: Fix
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/runqueue.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py
index f84d1e2..3eaaf51 100644
--- a/lib/bb/runqueue.py
+++ b/lib/bb/runqueue.py
@@ -139,8 +139,9 @@ class RunQueueScheduler(object):
         """
         Return the id of the first task we find that is buildable
         """
-        self.buildable = [x for x in self.buildable if x not in self.rq.runq_running and (x in self.rq.tasks_covered or x in self.rq.tasks_notcovered)]
-        if not self.buildable:
+        self.buildable = [x for x in self.buildable if x not in self.rq.runq_running]
+        buildable = [x for x in self.buildable if (x in self.rq.tasks_covered or x in self.rq.tasks_notcovered)]
+        if not buildable:
             return None
 
         # Filter out tasks that have a max number of threads that have been exceeded
@@ -156,8 +157,8 @@ class RunQueueScheduler(object):
             else:
                 skip_buildable[rtaskname] = 1
 
-        if len(self.buildable) == 1:
-            tid = self.buildable[0]
+        if len(buildable) == 1:
+            tid = buildable[0]
             taskname = taskname_from_tid(tid)
             if taskname in skip_buildable and skip_buildable[taskname] >= int(self.skip_maxthread[taskname]):
                 return None
@@ -172,7 +173,7 @@ class RunQueueScheduler(object):
 
         best = None
         bestprio = None
-        for tid in self.buildable:
+        for tid in buildable:
             taskname = taskname_from_tid(tid)
             if taskname in skip_buildable and skip_buildable[taskname] >= int(self.skip_maxthread[taskname]):
                 continue
@@ -1980,10 +1981,13 @@ class RunQueueExecute:
             for x in self.rqdata.runtaskentries:
                 if x not in self.tasks_covered and x not in self.tasks_notcovered:
                     logger.error("Task %s was never moved from the setscene queue" % x)
-                    err=True
+                    err = True
                 if x not in self.tasks_scenequeue_done:
                     logger.error("Task %s was never processed by the setscene code" % x)
-                    err=True
+                    err = True
+                if len(self.rqdata.runtaskentries[x].depends) == 0 and x not in self.runq_buildable:
+                    logger.error("Task %s was never marked as buildable by the setscene code" % x)
+                    err = True
             if err:
                 self.rq.state = runQueueFailed
                 return True

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