summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/server
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-29 16:51:18 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-05 13:11:27 +0000
commitb9439e0255e4cf9b7fc8d8b034395bceb4f285f8 (patch)
tree07e999db5e67c6d9b373bbfa58216be9006f3f26 /bitbake/lib/bb/server
parentf7060a43995279723036c37d173f846a3613180e (diff)
downloadpoky-b9439e0255e4cf9b7fc8d8b034395bceb4f285f8.tar.gz
bitbake: server/process: Make lockfile handling clearer
This simplifies the code and makes it easier to read but has the same functionality. (Bitbake rev: a0b9cfaf2d03fd047a79d32e668001718d02c4bf) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/server')
-rw-r--r--bitbake/lib/bb/server/process.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/bitbake/lib/bb/server/process.py b/bitbake/lib/bb/server/process.py
index 81617acd96..d56681c5a9 100644
--- a/bitbake/lib/bb/server/process.py
+++ b/bitbake/lib/bb/server/process.py
@@ -239,6 +239,12 @@ class ProcessServer(multiprocessing.Process):
239 while not lock: 239 while not lock:
240 with bb.utils.timeout(3): 240 with bb.utils.timeout(3):
241 lock = bb.utils.lockfile(lockfile, shared=False, retry=False, block=True) 241 lock = bb.utils.lockfile(lockfile, shared=False, retry=False, block=True)
242 if lock:
243 # We hold the lock so we can remove the file (hide stale pid data)
244 bb.utils.remove(lockfile)
245 bb.utils.unlockfile(lock)
246 return
247
242 if not lock: 248 if not lock:
243 # Some systems may not have lsof available 249 # Some systems may not have lsof available
244 procs = None 250 procs = None
@@ -259,10 +265,6 @@ class ProcessServer(multiprocessing.Process):
259 if procs: 265 if procs:
260 msg += ":\n%s" % str(procs) 266 msg += ":\n%s" % str(procs)
261 print(msg) 267 print(msg)
262 return
263 # We hold the lock so we can remove the file (hide stale pid data)
264 bb.utils.remove(lockfile)
265 bb.utils.unlockfile(lock)
266 268
267 def idle_commands(self, delay, fds=None): 269 def idle_commands(self, delay, fds=None):
268 nextsleep = delay 270 nextsleep = delay