--- a/sbsv2/raptor/bin/recipestats.py	Tue Apr 20 13:41:38 2010 +0100
+++ b/sbsv2/raptor/bin/recipestats.py	Fri Apr 23 17:44:43 2010 +0100
@@ -20,6 +20,9 @@
 import time
 import __future__
 
+
+
+
 class RecipeStats(object):
 	def __init__(self, name, count, time):
 		self.name=name
@@ -39,8 +42,9 @@
 		self.failtime = 0.0
 		self.failtypes = {}
 		self.retryfails = 0
+		self.hosts = {}
 		
-	def add(self, starttime, duration, name, status):
+	def add(self, starttime, duration, name, status, host, phase):
 		if status != BuildStats.STAT_OK:
 			self.failcount += 1
 			if name in self.failtypes:
@@ -58,6 +62,12 @@
 		else:
 			self.stats[name] = RecipeStats(name,1,duration)
 
+		hp=host
+		if hp in self.hosts:
+			self.hosts[hp] += 1
+		else:
+			self.hosts[hp] = 1
+
 	def recipe_csv(self):
 		s = '"name", "time", "count"\n'
 		l = sorted(self.stats.values(), key= lambda r: r.time, reverse=True)
@@ -65,32 +75,66 @@
 			s += '"%s",%s,%d\n' % (r.name, str(r.time), r.count)
 		return s
 
+	def hosts_csv(self):
+		s='"host","recipecount"\n'
+		hs = self.hosts
+		for h in sorted(hs.keys()):
+			s += '"%s",%d\n' % (h,hs[h])
+		return s
 
 
 import sys
 import re
+import os
+from optparse import OptionParser # for parsing command line parameters
 
 def main():
+	recipe_re = re.compile(".*<recipe name='([^']+)'.*host='([^']+)'.*")
+	time_re = re.compile(".*<time start='([0-9]+\.[0-9]+)' *elapsed='([0-9]+\.[0-9]+)'.*")
+	status_re = re.compile(".*<status exit='(?P<exit>(ok|failed))'( *code='(?P<code>[0-9]+)')?.*")
+	phase_re = re.compile(".*<info>Making.*?([^\.]+\.[^\.]+)</info>")
 
-	f = sys.stdin
+	parser = OptionParser(prog = "recipestats",
+                                          usage = """%prog --help [-b] [-f <logfilename>]""")
+
+	parser.add_option("-b","--buildhosts",action="store_true",dest="buildhosts_flag",
+                                help="Lists which build hosts were active in each invocation of the build engine and how many recipes ran on each.", default = False)
+	parser.add_option("-f","--logfile",action="store",dest="logfilename", help="Read from the file, not stdin", default = None)
+
+
+	(options, stuff) = parser.parse_args(sys.argv[1:])
+
+	if options.logfilename is None:
+		f = sys.stdin
+	else:
+		f = open(options.logfilename,"r")
+
 	st = BuildStats()
 
-	recipe_re = re.compile(".*<recipe name='([^']+)'.*")
-	time_re = re.compile(".*<time start='([0-9]+\.[0-9]+)' *elapsed='([0-9]+\.[0-9]+)'.*")
-	status_re = re.compile(".*<status exit='(?P<exit>(ok|failed))'( *code='(?P<code>[0-9]+)')?.*")
 
 	alternating = 0
 	start_time = 0.0
 
-	
-	for l in f.xreadlines():
+	phase=None
+	for l in f:
 		l2 = l.rstrip("\n\r")
+
 		rm = recipe_re.match(l2)
 
 		if rm is not None:
-			rname = rm.groups()[0]
+			(rname,host) = rm.groups()
 			continue
 
+		pm = phase_re.match(l2)
+
+		if pm is not None:
+			if phase is not None:
+				if options.buildhosts_flag:
+					print('"%s"\n' % phase)
+					print(st.hosts_csv())
+			st.hosts = {}	
+			phase = pm.groups()[0]
+			continue
 
 		tm = time_re.match(l2)
 		if tm is not None:
@@ -120,9 +164,13 @@
 		else:
 			status = int(sm.groupdict()['code'])
 
-		st.add(s, elapsed, rname, status)
+		st.add(s, elapsed, rname, status, host, phase)
 
-	print(st.recipe_csv())
+	if options.buildhosts_flag:
+		print('"%s"\n' % phase)
+		print(st.hosts_csv())
+	else:
+		print(st.recipe_csv())
 
 
 if __name__ == '__main__': main()