summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/runqueue.py
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb/runqueue.py')
-rw-r--r--bitbake/lib/bb/runqueue.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index de1160eb87..6025142e08 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -109,8 +109,7 @@ class RunQueueSchedulerSpeed(RunQueueScheduler):
109 109
110 self.rq = runqueue 110 self.rq = runqueue
111 111
112 sortweight = deepcopy(self.rq.runq_weight) 112 sortweight = sorted(deepcopy(self.rq.runq_weight))
113 sortweight.sort()
114 copyweight = deepcopy(self.rq.runq_weight) 113 copyweight = deepcopy(self.rq.runq_weight)
115 self.prio_map = [] 114 self.prio_map = []
116 115
@@ -307,7 +306,7 @@ class RunQueue:
307 weight[listid] = 1 306 weight[listid] = 1
308 task_done[listid] = True 307 task_done[listid] = True
309 308
310 while 1: 309 while True:
311 next_points = [] 310 next_points = []
312 for listid in endpoints: 311 for listid in endpoints:
313 for revdep in self.runq_depends[listid]: 312 for revdep in self.runq_depends[listid]:
@@ -631,7 +630,7 @@ class RunQueue:
631 for dep in revdeps: 630 for dep in revdeps:
632 if dep in self.runq_depends[listid]: 631 if dep in self.runq_depends[listid]:
633 #self.dump_data(taskData) 632 #self.dump_data(taskData)
634 bb.msg.fatal(bb.msg.domain.RunQueue, "Task %s (%s) has circular dependency on %s (%s)" % (taskData.fn_index[self.runq_fnid[dep]], self.runq_task[dep] , taskData.fn_index[self.runq_fnid[listid]], self.runq_task[listid])) 633 bb.msg.fatal(bb.msg.domain.RunQueue, "Task %s (%s) has circular dependency on %s (%s)" % (taskData.fn_index[self.runq_fnid[dep]], self.runq_task[dep], taskData.fn_index[self.runq_fnid[listid]], self.runq_task[listid]))
635 634
636 bb.msg.note(2, bb.msg.domain.RunQueue, "Compute totals (have %s endpoint(s))" % len(endpoints)) 635 bb.msg.note(2, bb.msg.domain.RunQueue, "Compute totals (have %s endpoint(s))" % len(endpoints))
637 636
@@ -814,7 +813,7 @@ class RunQueue:
814 bb.msg.debug(2, bb.msg.domain.RunQueue, "Stampfile %s < %s" % (stampfile, stampfile2)) 813 bb.msg.debug(2, bb.msg.domain.RunQueue, "Stampfile %s < %s" % (stampfile, stampfile2))
815 iscurrent = False 814 iscurrent = False
816 except: 815 except:
817 bb.msg.debug(2, bb.msg.domain.RunQueue, "Exception reading %s for %s" % (stampfile2 , stampfile)) 816 bb.msg.debug(2, bb.msg.domain.RunQueue, "Exception reading %s for %s" % (stampfile2, stampfile))
818 iscurrent = False 817 iscurrent = False
819 818
820 return iscurrent 819 return iscurrent
@@ -948,7 +947,7 @@ class RunQueue:
948 try: 947 try:
949 pipein, pipeout = os.pipe() 948 pipein, pipeout = os.pipe()
950 pid = os.fork() 949 pid = os.fork()
951 except OSError, e: 950 except OSError as e:
952 bb.msg.fatal(bb.msg.domain.RunQueue, "fork failed: %d (%s)" % (e.errno, e.strerror)) 951 bb.msg.fatal(bb.msg.domain.RunQueue, "fork failed: %d (%s)" % (e.errno, e.strerror))
953 if pid == 0: 952 if pid == 0:
954 os.close(pipein) 953 os.close(pipein)