summaryrefslogtreecommitdiff
path: root/bitbake/lib
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-11-13 21:23:54 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-11-13 21:23:54 +0800
commit05ba6fc7cb5a389737a238f312f4148e6b837d71 (patch)
tree7b0d8688095f94fd2010c63f0b0aadff301eccbf /bitbake/lib
parent89929e1f283c8508c505c9731ad933880abf22a1 (diff)
downloadopenembedded-core-05ba6fc7cb5a389737a238f312f4148e6b837d71.tar.gz
openembedded-core-05ba6fc7cb5a389737a238f312f4148e6b837d71.tar.bz2
openembedded-core-05ba6fc7cb5a389737a238f312f4148e6b837d71.tar.xz
openembedded-core-05ba6fc7cb5a389737a238f312f4148e6b837d71.zip
bitbake: Rewrite profiling code so its functional for both none and xmlrpc backends
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/cooker.py73
-rw-r--r--bitbake/lib/bb/server/none.py16
-rw-r--r--bitbake/lib/bb/server/xmlrpc.py19
3 files changed, 71 insertions, 37 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 44b9b2c31..33eb65e2f 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# ex:ts=4:sw=4:sts=4:et
# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
#
@@ -71,7 +70,7 @@ class BBCooker:
self.bb_cache = None
if server:
- self.server = server.BitBakeServer(self)
+ self.server = server.BitBakeServer(self, self.pre_serve, self.post_serve)
self.configuration = configuration
@@ -916,41 +915,53 @@ class BBCooker:
return self.appendlist[f]
return []
- def serve(self):
-
+ def pre_serve(self):
# Empty the environment. The environment will be populated as
# necessary from the data store.
bb.utils.empty_environment()
- if self.configuration.profile:
- try:
- import cProfile as profile
- except:
- import profile
-
- profile.runctx("self.server.serve_forever()", globals(), locals(), "profile.log")
-
- # Redirect stdout to capture profile information
- pout = open('profile.log.processed', 'w')
- so = sys.stdout.fileno()
- os.dup2(pout.fileno(), so)
-
- import pstats
- p = pstats.Stats('profile.log')
- p.sort_stats('time')
- p.print_stats()
- p.print_callers()
- p.sort_stats('cumulative')
- p.print_stats()
-
- os.dup2(so, pout.fileno())
- pout.flush()
- pout.close()
- else:
- self.server.serve_forever()
-
+ def post_serve(self):
bb.event.fire(CookerExit(), self.configuration.event_data)
+
+def server_main(cooker, func, *args):
+ if cooker.configuration.profile:
+ try:
+ import cProfile as profile
+ except:
+ import profile
+ prof = profile.Profile()
+
+ ret = profile.Profile.runcall(prof, func, *args)
+
+ prof.dump_stats("profile.log")
+
+ # Redirect stdout to capture profile information
+ pout = open('profile.log.processed', 'w')
+ so = sys.stdout.fileno()
+ orig_so = os.dup(sys.stdout.fileno())
+ os.dup2(pout.fileno(), so)
+
+ import pstats
+ p = pstats.Stats('profile.log')
+ p.sort_stats('time')
+ p.print_stats()
+ p.print_callers()
+ p.sort_stats('cumulative')
+ p.print_stats()
+
+ os.dup2(orig_so, so)
+ pout.flush()
+ pout.close()
+
+ print("Raw profiling information saved to profile.log and processed statistics to profile.log.processed")
+
+ return ret
+ else:
+ return func(*args)
+
+
+
class CookerExit(bb.event.Event):
"""
Notify clients of the Cooker shutdown
diff --git a/bitbake/lib/bb/server/none.py b/bitbake/lib/bb/server/none.py
index 14915d973..38f713c51 100644
--- a/bitbake/lib/bb/server/none.py
+++ b/bitbake/lib/bb/server/none.py
@@ -109,9 +109,11 @@ class BitBakeServer():
# remove this when you're done with debugging
# allow_reuse_address = True
- def __init__(self, cooker):
+ def __init__(self, cooker, pre_serve, post_serve):
self._idlefuns = {}
self.commands = BitBakeServerCommands(self, cooker)
+ self.pre_serve = pre_serve
+ self.post_serve = post_serve
def register_idle_function(self, function, data):
"""Register a function to be called while the server is idle"""
@@ -160,9 +162,17 @@ class BitbakeServerInfo():
self.commands = server.commands
class BitBakeServerFork():
- def __init__(self, serverinfo, command, logfile):
- serverinfo.forkCommand = command
+ def __init__(self, cooker, server, serverinfo, logfile):
serverinfo.logfile = logfile
+ serverinfo.cooker = cooker
+ serverinfo.server = server
+
+class BitbakeUILauch():
+ def launch(self, serverinfo, uifunc, *args):
+ serverinfo.server.pre_serve()
+ ret = bb.cooker.server_main(serverinfo.cooker, uifunc, *args)
+ serverinfo.server.post_serve()
+ return ret
class BitBakeServerConnection():
def __init__(self, serverinfo):
diff --git a/bitbake/lib/bb/server/xmlrpc.py b/bitbake/lib/bb/server/xmlrpc.py
index cb2949fb9..30b83d2b1 100644
--- a/bitbake/lib/bb/server/xmlrpc.py
+++ b/bitbake/lib/bb/server/xmlrpc.py
@@ -87,7 +87,7 @@ class BitBakeServer(SimpleXMLRPCServer):
# remove this when you're done with debugging
# allow_reuse_address = True
- def __init__(self, cooker, interface = ("localhost", 0)):
+ def __init__(self, cooker, pre_serve, post_serve, interface = ("localhost", 0)):
"""
Constructor
"""
@@ -99,6 +99,9 @@ class BitBakeServer(SimpleXMLRPCServer):
#self.register_introspection_functions()
commands = BitBakeServerCommands(self, cooker)
self.autoregister_all_functions(commands, "")
+ self.cooker = cooker
+ self.pre_serve = pre_serve
+ self.post_serve = post_serve
def autoregister_all_functions(self, context, prefix):
"""
@@ -116,9 +119,14 @@ class BitBakeServer(SimpleXMLRPCServer):
self._idlefuns[function] = data
def serve_forever(self):
+ bb.cooker.server_main(self.cooker, self._serve_forever)
+
+ def _serve_forever(self):
"""
Serve Requests. Overloaded to honor a quit command
"""
+ self.pre_serve()
+
self.quit = False
self.timeout = 0 # Run Idle calls for our first callback
while not self.quit:
@@ -155,6 +163,7 @@ class BitBakeServer(SimpleXMLRPCServer):
except:
pass
+ self.post_serve()
self.server_close()
return
@@ -164,8 +173,12 @@ class BitbakeServerInfo():
self.port = server.port
class BitBakeServerFork():
- def __init__(self, serverinfo, command, logfile):
- daemonize.createDaemon(command, logfile)
+ def __init__(self, cooker, server, serverinfo, logfile):
+ daemonize.createDaemon(server.serve_forever, logfile)
+
+class BitbakeUILauch():
+ def launch(self, serverinfo, uifunc, *args):
+ return uifunc(*args)
class BitBakeServerConnection():
def __init__(self, serverinfo):