From eee9fba7b4d5d7a268a495688039027390894e6d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 16 Apr 2022 09:17:10 -1000 Subject: bitbake: server/process: Disable gc around critical section The python gc can trigger whilst we're holding the event stream lock and when cleaning up objects, they can trigger warnings. This translates into a new event which would then need the lock and we can deadlock. Disable gc whilst we hold that lock to avoid this unfortunate and problematic situation. (Bitbake rev: d01d8326331cfe59208674cfc53aa26c0028b313) Signed-off-by: Richard Purdie (cherry picked from commit 96a6303949cefd469bcf5ed250ff512271354357) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- bitbake/lib/bb/server/process.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bitbake/lib/bb/server/process.py b/bitbake/lib/bb/server/process.py index fcdce19717..b11c903e08 100644 --- a/bitbake/lib/bb/server/process.py +++ b/bitbake/lib/bb/server/process.py @@ -26,6 +26,7 @@ import errno import re import datetime import pickle +import gc import bb.server.xmlrpcserver from bb import daemonize from multiprocessing import queues @@ -737,8 +738,10 @@ class ConnectionWriter(object): def send(self, obj): obj = multiprocessing.reduction.ForkingPickler.dumps(obj) + gc.disable() with self.wlock: self.writer.send_bytes(obj) + gc.enable() def fileno(self): return self.writer.fileno() -- cgit v1.2.3-54-g00ecf