diff options
author | Jason Wessel <jason.wessel@windriver.com> | 2013-11-25 15:21:26 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-02 17:32:40 +0000 |
commit | b1803958de8d7c3c3279841e38604a08dc2316cc (patch) | |
tree | c1db3c1ecfba44ba038dc803ad5e75d62e59d93e /lib/bb | |
parent | d6abc07ff385357d312d8435b89e0a9c1f965433 (diff) | |
download | bitbake-b1803958de8d7c3c3279841e38604a08dc2316cc.tar.gz |
bitbake.lock: Add host:port to bitbake.lock for memres server
The idea is to build on the --status-only option for bitbake and
expose a mechanism where the oe init scripts can easily switch between
memres server and the non-memres server.
In the case of the standard oe init script the following
can shut down the server:
if [ -z "$BBSERVER" ] && [ -f bitbake.lock ] ; then
grep ":" bitbake.lock > /dev/null && BBSERVER=`cat bitbake.lock` bitbake --status-only
if [ $? = 0 ] ; then
echo "Shutting down bitbake memory resident server with bitbake -m"
BBSERVER=`cat bitbake.lock` bitbake -m
fi
fi
A similar function can be used to automatically detect if the server
is already running for the oe memres init script. This new
functionality allows for the memres init script to be started in a new
shell and connect up to an alaready running server without seeing the
error of trying to start the server multiple times.
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb')
-rw-r--r-- | lib/bb/cooker.py | 8 | ||||
-rw-r--r-- | lib/bb/cookerdata.py | 1 | ||||
-rw-r--r-- | lib/bb/server/xmlrpc.py | 7 |
3 files changed, 14 insertions, 2 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index b36ed6fe3..7b10f8068 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -125,6 +125,14 @@ class BBCooker: self.lock = bb.utils.lockfile(lockfile, False, False) if not self.lock: bb.fatal("Only one copy of bitbake should be run against a build directory") + try: + self.lock.seek(0) + self.lock.truncate() + if len(configuration.interface) >= 2: + self.lock.write("%s:%s\n" % (configuration.interface[0], configuration.interface[1])); + self.lock.flush() + except: + pass # TOSTOP must not be set or our children will hang when they output fd = sys.stdout.fileno() diff --git a/lib/bb/cookerdata.py b/lib/bb/cookerdata.py index e640ed0f3..6200b0eba 100644 --- a/lib/bb/cookerdata.py +++ b/lib/bb/cookerdata.py @@ -127,6 +127,7 @@ class CookerConfiguration(object): self.dump_signatures = False self.dry_run = False self.tracking = False + self.interface = [] self.env = {} diff --git a/lib/bb/server/xmlrpc.py b/lib/bb/server/xmlrpc.py index 3a67ab0cf..46d074a73 100644 --- a/lib/bb/server/xmlrpc.py +++ b/lib/bb/server/xmlrpc.py @@ -198,6 +198,11 @@ class XMLRPCServer(SimpleXMLRPCServer, BaseImplServer): Constructor """ BaseImplServer.__init__(self) + if (interface[1] == 0): # anonymous port, not getting reused + self.single_use = True + # Use auto port configuration + if (interface[1] == -1): + interface = (interface[0], 0) SimpleXMLRPCServer.__init__(self, interface, requestHandler=BitBakeXMLRPCRequestHandler, logRequests=False, allow_none=True) @@ -208,8 +213,6 @@ class XMLRPCServer(SimpleXMLRPCServer, BaseImplServer): self.autoregister_all_functions(self.commands, "") self.interface = interface self.single_use = False - if (interface[1] == 0): # anonymous port, not getting reused - self.single_use = True def addcooker(self, cooker): BaseImplServer.addcooker(self, cooker) |