mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: utils: Optimise signal/sigmask performance

Browse Source 
Running "time bitbake -pP idle" with a valid cache shows around 800,000
calls to enum creation from python's signal.py. We don't care about this
overhead and it adversely affects cache load time quite badly.

Try and use _signal directly, falling back to signal, which avoids
this overhead we don't need and makes cache loading much faster.

(Bitbake rev: 982645110a19ebb94d519926a4e14c8a2a205cfd)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit ee5fce67ce35b025c68aa61e2e758903269ee346)
Signed-off-by: Chris Laplante <chris.laplante@agilent.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Richard Purdie
2025-07-29 14:43:09 -04:00
committed by Steve Sakoman
parent bfb799ef2a
commit 511d3e23f5
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
bitbake/lib/bb/utils.py
View File

@@ -1854,6 +1854,15 @@ def path_is_descendant(descendant, ancestor):
return False return False
# Recomputing the sets in signal.py is expensive (bitbake -pP idle)
# so try and use _signal directly to avoid it
valid_signals = signal.valid_signals()
try:
import _signal
sigmask = _signal.pthread_sigmask
except ImportError:
sigmask = signal.pthread_sigmask
# If we don't have a timeout of some kind and a process/thread exits badly (for example # If we don't have a timeout of some kind and a process/thread exits badly (for example
# OOM killed) and held a lock, we'd just hang in the lock futex forever. It is better # OOM killed) and held a lock, we'd just hang in the lock futex forever. It is better
# we exit at some point than hang. 5 minutes with no progress means we're probably deadlocked. # we exit at some point than hang. 5 minutes with no progress means we're probably deadlocked.
@@ -1863,7 +1872,7 @@ def path_is_descendant(descendant, ancestor):
@contextmanager @contextmanager
def lock_timeout(lock): def lock_timeout(lock):
try: try:
s = signal.pthread_sigmask(signal.SIG_BLOCK, signal.valid_signals()) s = sigmask(signal.SIG_BLOCK, valid_signals)
held = lock.acquire(timeout=5*60) held = lock.acquire(timeout=5*60)
if not held: if not held:
bb.server.process.serverlog("Couldn't get the lock for 5 mins, timed out, exiting.\n%s" % traceback.format_stack()) bb.server.process.serverlog("Couldn't get the lock for 5 mins, timed out, exiting.\n%s" % traceback.format_stack())
@@ -1871,16 +1880,16 @@ def lock_timeout(lock):
yield held yield held
finally: finally:
lock.release() lock.release()
signal.pthread_sigmask(signal.SIG_SETMASK, s) sigmask(signal.SIG_SETMASK, s)
# A version of lock_timeout without the check that the lock was locked and a shorter timeout # A version of lock_timeout without the check that the lock was locked and a shorter timeout
@contextmanager @contextmanager
def lock_timeout_nocheck(lock): def lock_timeout_nocheck(lock):
try: try:
s = signal.pthread_sigmask(signal.SIG_BLOCK, signal.valid_signals()) s = sigmask(signal.SIG_BLOCK, valid_signals)
l = lock.acquire(timeout=10) l = lock.acquire(timeout=10)
yield l yield l
finally: finally:
if l: if l:
lock.release() lock.release()
signal.pthread_sigmask(signal.SIG_SETMASK, s) sigmask(signal.SIG_SETMASK, s)