mirror of
https://git.yoctoproject.org/git/poky
synced 2026-01-01 13:58:04 +00:00
bitbake: Use a "fork" multiprocessing context
Python 3.14 changes the default multiprocessing context from "fork" to "forkserver"; however bitbake heavily relies on "fork" to efficiently pass data to the child processes. As such, make "fork" context in the bb namespace and use it in place of the normal multiprocessing module. Note that multiprocessing contexts were added in Python 3.4, so this should be safe to use even before Python 3.14 [YOCTO #15858] (Bitbake rev: 62be9113d98fccb347c6aa0a10d5c4ee2857f8b6) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
92b07bd4ab
commit
d363bc475a
|
|
@ -37,6 +37,34 @@ class BBHandledException(Exception):
|
|||
import os
|
||||
import logging
|
||||
from collections import namedtuple
|
||||
import multiprocessing as mp
|
||||
|
||||
# Python 3.14 changes the default multiprocessing context from "fork" to
|
||||
# "forkserver". However, bitbake heavily relies on "fork" behavior to
|
||||
# efficiently pass data to the child processes. Places that need this should do:
|
||||
# from bb import multiprocessing
|
||||
# in place of
|
||||
# import multiprocessing
|
||||
|
||||
class MultiprocessingContext(object):
|
||||
"""
|
||||
Multiprocessing proxy object that uses the "fork" context for a property if
|
||||
available, otherwise goes to the main multiprocessing module. This allows
|
||||
it to be a drop-in replacement for the multiprocessing module, but use the
|
||||
fork context
|
||||
"""
|
||||
def __init__(self):
|
||||
super().__setattr__("_ctx", mp.get_context("fork"))
|
||||
|
||||
def __getattr__(self, name):
|
||||
if hasattr(self._ctx, name):
|
||||
return getattr(self._ctx, name)
|
||||
return getattr(mp, name)
|
||||
|
||||
def __setattr__(self, name, value):
|
||||
raise AttributeError(f"Unable to set attribute {name}")
|
||||
|
||||
multiprocessing = MultiprocessingContext()
|
||||
|
||||
|
||||
class NullHandler(logging.Handler):
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ import os
|
|||
import signal
|
||||
import socket
|
||||
import sys
|
||||
import multiprocessing
|
||||
from bb import multiprocessing
|
||||
import logging
|
||||
from .connection import StreamConnection, WebsocketConnection
|
||||
from .exceptions import ClientError, ServerError, ConnectionClosedError, InvokeError
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ import enum
|
|||
import sys, os, glob, os.path, re, time
|
||||
import itertools
|
||||
import logging
|
||||
import multiprocessing
|
||||
from bb import multiprocessing
|
||||
import threading
|
||||
from io import StringIO, UnsupportedOperation
|
||||
from contextlib import closing
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
import bb
|
||||
import bb.event
|
||||
import logging
|
||||
import multiprocessing
|
||||
from bb import multiprocessing
|
||||
import threading
|
||||
import array
|
||||
import os
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
|
||||
import http.server
|
||||
import multiprocessing
|
||||
from bb import multiprocessing
|
||||
import os
|
||||
import traceback
|
||||
import signal
|
||||
|
|
@ -43,7 +43,7 @@ class HTTPService(object):
|
|||
self.process = multiprocessing.Process(target=self.server.server_start, args=[self.root_dir, self.logger])
|
||||
|
||||
# The signal handler from testimage.bbclass can cause deadlocks here
|
||||
# if the HTTPServer is terminated before it can restore the standard
|
||||
# if the HTTPServer is terminated before it can restore the standard
|
||||
#signal behaviour
|
||||
orig = signal.getsignal(signal.SIGTERM)
|
||||
signal.signal(signal.SIGTERM, signal.SIG_DFL)
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ import sys
|
|||
import errno
|
||||
import logging
|
||||
import locale
|
||||
import multiprocessing
|
||||
from bb import multiprocessing
|
||||
import importlib
|
||||
import importlib.machinery
|
||||
import importlib.util
|
||||
|
|
@ -1484,8 +1484,6 @@ def process_profilelog(fn, fn_out = None):
|
|||
#
|
||||
def multiprocessingpool(*args, **kwargs):
|
||||
|
||||
import multiprocessing.pool
|
||||
#import multiprocessing.util
|
||||
#multiprocessing.util.log_to_stderr(10)
|
||||
# Deal with a multiprocessing bug where signals to the processes would be delayed until the work
|
||||
# completes. Putting in a timeout means the signals (like SIGINT/SIGTERM) get processed.
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ from .server import DEFAULT_ANON_PERMS, ALL_PERMISSIONS
|
|||
from bb.asyncrpc import InvokeError
|
||||
import hashlib
|
||||
import logging
|
||||
import multiprocessing
|
||||
from bb import multiprocessing
|
||||
import os
|
||||
import sys
|
||||
import tempfile
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user