mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: server/process: Make lockfile handling clearer

Browse Source 
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>
This commit is contained in:
Richard Purdie
2018-11-29 16:51:18 +00:00
parent f7060a4399
commit b9439e0255
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/server/process.py
+6 -4
View File
@@ -239,6 +239,12 @@ class ProcessServer(multiprocessing.Process):
while not lock: while not lock:
with bb.utils.timeout(3): with bb.utils.timeout(3):
lock = bb.utils.lockfile(lockfile, shared=False, retry=False, block=True) lock = bb.utils.lockfile(lockfile, shared=False, retry=False, block=True)
if lock:
# We hold the lock so we can remove the file (hide stale pid data)
bb.utils.remove(lockfile)
bb.utils.unlockfile(lock)
return
if not lock: if not lock:
# Some systems may not have lsof available # Some systems may not have lsof available
procs = None procs = None
@@ -259,10 +265,6 @@ class ProcessServer(multiprocessing.Process):
if procs: if procs:
msg += ":\n%s" % str(procs) msg += ":\n%s" % str(procs)
print(msg) print(msg)
return
# We hold the lock so we can remove the file (hide stale pid data)
bb.utils.remove(lockfile)
bb.utils.unlockfile(lock)
def idle_commands(self, delay, fds=None): def idle_commands(self, delay, fds=None):
nextsleep = delay nextsleep = delay