summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-29 16:51:18 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-08 20:18:55 +0000
commitb5dd9158e95c60adc692e12865212862e0432f58 (patch)
tree0c12c9d6cdfb3c81f5fb7429cf3661b6d0b04b92
parent25c7bf985e5e879891151136975ab4d45244a140 (diff)
downloadpoky-b5dd9158e95c60adc692e12865212862e0432f58.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: b829d1b5eb486786cae088f6927530433a7e08e8) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 42d79079a9..7cb08d5c84 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