mirror of
https://git.yoctoproject.org/git/poky
synced 2026-01-04 16:10:04 +00:00
fa87963b35
If the PR server or indeed any other child process takes some time to exit (which it sometimes does when saving its database), it can end up holding bitbake.lock after the UI exits, which led to errors if you ran bitbake commands successively - we saw this when running the PR server oe-selftest tests in OE-Core. The recent attempt to fix this wasn't quite right and ended up breaking memory resident bitbake. This time we close the lock file when cooker shuts down (inside the UI process) instead of unlocking it, and this is done in the cooker code rather than the actual UI code so it doesn't matter which UI is in use. Additionally we report that we're waiting for the lock to be released, using lsof or fuser if available to list the processes with the lock open. The 'magic' in the locking is due to all spawned subprocesses of bitbake holding an open file descriptor to the bitbake.lock. It is automatically unlocked when all those fds close the file (as all the processes terminate). We close the UI copy of the lock explicitly, then close the server process copy, any remaining open copy is therefore some proess exiting. (The reproducer for the problem is to set PRSERV_HOST = "localhost:0" and add a call to time.sleep(20) after self.server_close() in lib/prserv/serv.py, then run "bitbake -p; bitbake -p" ). Cleanup work done by Paul Eggleton <paul.eggleton@linux.intel.com>. This reverts bitbake commit 69ecd15aece54753154950c55d7af42f85ad8606 and e97a9f1528d77503b5c93e48e3de9933fbb9f3cd. (Bitbake rev: a29780bd43f74b7326fe788dbd65177b86806fcf) (Bitbake rev: ed30f4ee1cef8db9ea422c5e54b2375c4f3b1d6f) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Conflicts: bitbake/lib/bb/tinfoil.py
105 lines
3.5 KiB
Python
105 lines
3.5 KiB
Python
# tinfoil: a simple wrapper around cooker for bitbake-based command-line utilities
|
|
#
|
|
# Copyright (C) 2012 Intel Corporation
|
|
# Copyright (C) 2011 Mentor Graphics Corporation
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License version 2 as
|
|
# published by the Free Software Foundation.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License along
|
|
# with this program; if not, write to the Free Software Foundation, Inc.,
|
|
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
import logging
|
|
import warnings
|
|
import os
|
|
import sys
|
|
|
|
import bb.cache
|
|
import bb.cooker
|
|
import bb.providers
|
|
import bb.utils
|
|
from bb.cooker import state, BBCooker, CookerFeatures
|
|
from bb.cookerdata import CookerConfiguration, ConfigParameters
|
|
import bb.fetch2
|
|
|
|
class Tinfoil:
|
|
def __init__(self, output=sys.stdout, tracking=False):
|
|
# Needed to avoid deprecation warnings with python 2.6
|
|
warnings.filterwarnings("ignore", category=DeprecationWarning)
|
|
|
|
# Set up logging
|
|
self.logger = logging.getLogger('BitBake')
|
|
console = logging.StreamHandler(output)
|
|
bb.msg.addDefaultlogFilter(console)
|
|
format = bb.msg.BBLogFormatter("%(levelname)s: %(message)s")
|
|
if output.isatty():
|
|
format.enable_color()
|
|
console.setFormatter(format)
|
|
self.logger.addHandler(console)
|
|
|
|
self.config = CookerConfiguration()
|
|
configparams = TinfoilConfigParameters(parse_only=True)
|
|
self.config.setConfigParameters(configparams)
|
|
self.config.setServerRegIdleCallback(self.register_idle_function)
|
|
features = []
|
|
if tracking:
|
|
features.append(CookerFeatures.BASEDATASTORE_TRACKING)
|
|
self.cooker = BBCooker(self.config, features)
|
|
self.config_data = self.cooker.data
|
|
bb.providers.logger.setLevel(logging.ERROR)
|
|
self.cooker_data = None
|
|
|
|
def register_idle_function(self, function, data):
|
|
pass
|
|
|
|
def parseRecipes(self):
|
|
sys.stderr.write("Parsing recipes..")
|
|
self.logger.setLevel(logging.WARNING)
|
|
|
|
try:
|
|
while self.cooker.state in (state.initial, state.parsing):
|
|
self.cooker.updateCache()
|
|
except KeyboardInterrupt:
|
|
self.cooker.shutdown()
|
|
self.cooker.updateCache()
|
|
sys.exit(2)
|
|
|
|
self.logger.setLevel(logging.INFO)
|
|
sys.stderr.write("done.\n")
|
|
|
|
self.cooker_data = self.cooker.recipecache
|
|
|
|
def prepare(self, config_only = False):
|
|
if not self.cooker_data:
|
|
if config_only:
|
|
self.cooker.parseConfiguration()
|
|
self.cooker_data = self.cooker.recipecache
|
|
else:
|
|
self.parseRecipes()
|
|
|
|
def shutdown(self):
|
|
self.cooker.shutdown(force=True)
|
|
self.cooker.post_serve()
|
|
self.cooker.unlockBitbake()
|
|
|
|
class TinfoilConfigParameters(ConfigParameters):
|
|
|
|
def __init__(self, **options):
|
|
self.initial_options = options
|
|
super(TinfoilConfigParameters, self).__init__()
|
|
|
|
def parseCommandLine(self, argv=sys.argv):
|
|
class DummyOptions:
|
|
def __init__(self, initial_options):
|
|
for key, val in initial_options.items():
|
|
setattr(self, key, val)
|
|
|
|
return DummyOptions(self.initial_options), None
|