diff options
Diffstat (limited to 'bitbake/lib/bb/runqueue.py')
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 2022749c81..bfb16b4f6e 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -992,7 +992,7 @@ class RunQueue: | |||
992 | 992 | ||
993 | if self.state is runQueueComplete: | 993 | if self.state is runQueueComplete: |
994 | # All done | 994 | # All done |
995 | logger.info("Tasks Summary: Attempted %d tasks of which %d didn't need to be rerun and %d failed." % (self.rqexe.stats.completed, self.rqexe.stats.skipped, self.rqexe.stats.failed)) | 995 | logger.info("Tasks Summary: Attempted %d tasks of which %d didn't need to be rerun and %d failed.", self.rqexe.stats.completed, self.rqexe.stats.skipped, self.rqexe.stats.failed) |
996 | return False | 996 | return False |
997 | 997 | ||
998 | if self.state is runQueueChildProcess: | 998 | if self.state is runQueueChildProcess: |
@@ -1114,7 +1114,6 @@ class RunQueueExecute: | |||
1114 | 1114 | ||
1115 | sys.stdout.flush() | 1115 | sys.stdout.flush() |
1116 | sys.stderr.flush() | 1116 | sys.stderr.flush() |
1117 | |||
1118 | try: | 1117 | try: |
1119 | pipeinfd, pipeoutfd = os.pipe() | 1118 | pipeinfd, pipeoutfd = os.pipe() |
1120 | pipein = os.fdopen(pipeinfd, 'rb', 4096) | 1119 | pipein = os.fdopen(pipeinfd, 'rb', 4096) |
@@ -1125,6 +1124,7 @@ class RunQueueExecute: | |||
1125 | bb.msg.fatal(bb.msg.domain.RunQueue, "fork failed: %d (%s)" % (e.errno, e.strerror)) | 1124 | bb.msg.fatal(bb.msg.domain.RunQueue, "fork failed: %d (%s)" % (e.errno, e.strerror)) |
1126 | if pid == 0: | 1125 | if pid == 0: |
1127 | pipein.close() | 1126 | pipein.close() |
1127 | |||
1128 | # Save out the PID so that the event can include it the | 1128 | # Save out the PID so that the event can include it the |
1129 | # events | 1129 | # events |
1130 | bb.event.worker_pid = os.getpid() | 1130 | bb.event.worker_pid = os.getpid() |
@@ -1180,9 +1180,10 @@ class RunQueueExecuteDummy(RunQueueExecute): | |||
1180 | def __init__(self, rq): | 1180 | def __init__(self, rq): |
1181 | self.rq = rq | 1181 | self.rq = rq |
1182 | self.stats = RunQueueStats(0) | 1182 | self.stats = RunQueueStats(0) |
1183 | |||
1183 | def finish(self): | 1184 | def finish(self): |
1184 | self.rq.state = runQueueComplete | 1185 | self.rq.state = runQueueComplete |
1185 | return | 1186 | return |
1186 | 1187 | ||
1187 | class RunQueueExecuteTasks(RunQueueExecute): | 1188 | class RunQueueExecuteTasks(RunQueueExecute): |
1188 | def __init__(self, rq): | 1189 | def __init__(self, rq): |
@@ -1211,7 +1212,7 @@ class RunQueueExecuteTasks(RunQueueExecute): | |||
1211 | self.rq.scenequeue_covered.add(task) | 1212 | self.rq.scenequeue_covered.add(task) |
1212 | found = True | 1213 | found = True |
1213 | 1214 | ||
1214 | bb.debug(1, "Full skip list %s" % self.rq.scenequeue_covered) | 1215 | logger.debug(1, 'Full skip list %s', self.rq.scenequeue_covered) |
1215 | 1216 | ||
1216 | for task in self.rq.scenequeue_covered: | 1217 | for task in self.rq.scenequeue_covered: |
1217 | self.task_skip(task) | 1218 | self.task_skip(task) |
@@ -1221,7 +1222,7 @@ class RunQueueExecuteTasks(RunQueueExecute): | |||
1221 | for scheduler in self.rqdata.schedulers: | 1222 | for scheduler in self.rqdata.schedulers: |
1222 | if self.scheduler == scheduler.name: | 1223 | if self.scheduler == scheduler.name: |
1223 | self.sched = scheduler(self, self.rqdata) | 1224 | self.sched = scheduler(self, self.rqdata) |
1224 | logger.debug(1, "Using runqueue scheduler '%s'" % scheduler.name) | 1225 | logger.debug(1, "Using runqueue scheduler '%s'", scheduler.name) |
1225 | break | 1226 | break |
1226 | else: | 1227 | else: |
1227 | bb.fatal("Invalid scheduler '%s'. Available schedulers: %s" % | 1228 | bb.fatal("Invalid scheduler '%s'. Available schedulers: %s" % |
@@ -1247,7 +1248,7 @@ class RunQueueExecuteTasks(RunQueueExecute): | |||
1247 | self.runq_buildable[revdep] = 1 | 1248 | self.runq_buildable[revdep] = 1 |
1248 | fn = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[revdep]] | 1249 | fn = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[revdep]] |
1249 | taskname = self.rqdata.runq_task[revdep] | 1250 | taskname = self.rqdata.runq_task[revdep] |
1250 | logger.debug(1, "Marking task %s (%s, %s) as buildable" % (revdep, fn, taskname)) | 1251 | logger.debug(1, "Marking task %s (%s, %s) as buildable", revdep, fn, taskname) |
1251 | 1252 | ||
1252 | def task_complete(self, task): | 1253 | def task_complete(self, task): |
1253 | self.stats.taskCompleted() | 1254 | self.stats.taskCompleted() |
@@ -1295,7 +1296,8 @@ class RunQueueExecuteTasks(RunQueueExecute): | |||
1295 | 1296 | ||
1296 | taskdep = self.rqdata.dataCache.task_deps[fn] | 1297 | taskdep = self.rqdata.dataCache.task_deps[fn] |
1297 | if 'noexec' in taskdep and taskname in taskdep['noexec']: | 1298 | if 'noexec' in taskdep and taskname in taskdep['noexec']: |
1298 | startevent = runQueueTaskStarted(task, self.stats, self.rq, noexec=True) | 1299 | startevent = runQueueTaskStarted(task, self.stats, self.rq, |
1300 | noexec=True) | ||
1299 | bb.event.fire(startevent, self.cfgData) | 1301 | bb.event.fire(startevent, self.cfgData) |
1300 | self.runq_running[task] = 1 | 1302 | self.runq_running[task] = 1 |
1301 | self.stats.taskActive() | 1303 | self.stats.taskActive() |
@@ -1328,11 +1330,11 @@ class RunQueueExecuteTasks(RunQueueExecute): | |||
1328 | # Sanity Checks | 1330 | # Sanity Checks |
1329 | for task in xrange(self.stats.total): | 1331 | for task in xrange(self.stats.total): |
1330 | if self.runq_buildable[task] == 0: | 1332 | if self.runq_buildable[task] == 0: |
1331 | logger.error("Task %s never buildable!" % task) | 1333 | logger.error("Task %s never buildable!", task) |
1332 | if self.runq_running[task] == 0: | 1334 | if self.runq_running[task] == 0: |
1333 | logger.error("Task %s never ran!" % task) | 1335 | logger.error("Task %s never ran!", task) |
1334 | if self.runq_complete[task] == 0: | 1336 | if self.runq_complete[task] == 0: |
1335 | logger.error("Task %s never completed!" % task) | 1337 | logger.error("Task %s never completed!", task) |
1336 | self.rq.state = runQueueComplete | 1338 | self.rq.state = runQueueComplete |
1337 | return True | 1339 | return True |
1338 | 1340 | ||
@@ -1478,7 +1480,8 @@ class RunQueueExecuteScenequeue(RunQueueExecute): | |||
1478 | """ | 1480 | """ |
1479 | 1481 | ||
1480 | index = self.rqdata.runq_setscene[task] | 1482 | index = self.rqdata.runq_setscene[task] |
1481 | logger.debug(1, "Found task %s could be accelerated" % self.rqdata.get_user_idstring(index)) | 1483 | logger.debug(1, 'Found task %s which could be accelerated', |
1484 | self.rqdata.get_user_idstring(index)) | ||
1482 | 1485 | ||
1483 | self.scenequeue_covered.add(task) | 1486 | self.scenequeue_covered.add(task) |
1484 | self.scenequeue_updatecounters(task) | 1487 | self.scenequeue_updatecounters(task) |