diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-31 11:17:34 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-31 15:52:17 +0000 |
| commit | d93620baea489c9b20f740c0d06dcb39cf364ecb (patch) | |
| tree | 687e2c2eb9dd1b4b12dd870ddee4483d9727a8fd /bitbake/lib/bb/runqueue.py | |
| parent | 5e6db9dc4ddbd055c72b02437bfeae942259ef9a (diff) | |
| download | openembedded-core-contrib-d93620baea489c9b20f740c0d06dcb39cf364ecb.tar.gz | |
bitbake: runqueue: Fix race against tasks sharing stamp files
Shared work directories work by assuming bitbake will not run
more than one task with a specific stamp name. Recent runqueue optimisations
accidentally broke this meaning there could be races. This fixes the code.
(Bitbake rev: b1628b1a260ddf43fc9985535b1ddcfcebbb1e5b)
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 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 0475ee2177..91b1f07351 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -125,7 +125,10 @@ class RunQueueScheduler(object): if not self.buildable: return None if len(self.buildable) == 1: - return self.buildable[0] + taskid = self.buildable[0] + stamp = self.stamps[taskid] + if stamp not in self.rq.build_stamps.itervalues(): + return taskid if not self.rev_prio_map: self.rev_prio_map = range(self.numTasks) |