Adding gather_stats (based on bisect-builds.py) to gather benchmarking

tools/bisect-builds.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Snapshot Build Bisect Tool
 
 This script bisects a snapshot archive using binary search. It starts at
 a bad revision (it will try to guess HEAD) and asks for a last known-good
 revision. It will then binary search across this revision range by downloading,
@@ skipping 282 matching lines @@
 
   download_url = context.GetDownloadURL(rev)
   try:
     urllib.urlretrieve(download_url, filename, ReportHook)
     if progress_event and progress_event.isSet():
       print
   except RuntimeError, e:
     pass
 
 
-def RunRevision(context, revision, zipfile, profile, num_runs, args):
+def RunRevision(context, revision, zipfile, num_runs, testargs, tempdir,
+                outdir=None):

[Ian Vollick, 2012/09/18 17:46:32]

Why is tempdir a parameter? It doesn't look like gather_stats.py makes use of
the ability to specify this.

[hartmanng, 2012/09/19 02:17:55]

Done.

   """Given a zipped revision, unzip it and run the test."""
   print "Trying revision %s..." % str(revision)
 
-  # Create a temp directory and unzip the revision into it.
-  cwd = os.getcwd()
-  tempdir = tempfile.mkdtemp(prefix='bisect_tmp')
   UnzipFilenameToDir(zipfile, tempdir)
-  os.chdir(tempdir)
 
-  # Run the build as many times as specified.
-  testargs = [context.GetLaunchPath(), '--user-data-dir=%s' % profile] + args
   # The sandbox must be run as root on Official Chrome, so bypass it.
   if context.is_official and (context.platform == 'linux' or
       context.platform == 'linux64'):
     testargs.append('--no-sandbox')
 
+  # Run the build as many times as specified.
   for i in range(0, num_runs):
     subproc = subprocess.Popen(testargs,
                                bufsize=-1,
                                stdout=subprocess.PIPE,
                                stderr=subprocess.PIPE)
     (stdout, stderr) = subproc.communicate()
 
-  os.chdir(cwd)
-  try:
-    shutil.rmtree(tempdir, True)
-  except Exception, e:
-    pass
+    if outdir is not None:
+      if not os.path.isdir(outdir):
+        os.mkdir(outdir)
+
+      fout = open(os.path.join(outdir, '%s_%s.out' % (str(revision), str(i))),
+                               'w')
+      fout.write(stdout)
+      fout.close()
+      ferr = open(os.path.join(outdir, '%s_%s.err' % (str(revision), str(i))),
+                               'w')
+      ferr.write(stderr)
+      ferr.close()

[Ian Vollick, 2012/09/18 17:46:32]

It looks like we shutil.rmtree after every call to RunRevision. Why not put that
code there?

[hartmanng, 2012/09/19 02:17:55]

Done.

 
   return (subproc.returncode, stdout, stderr)
 
 
 def AskIsGoodBuild(rev, official_builds, status, stdout, stderr):
   """Ask the user whether build |rev| is good or bad."""
   # Loop until we get a response that we can parse.
   while True:
     response = raw_input('Revision %s is [(g)ood/(b)ad/(u)nknown/(q)uit]: ' %
                          str(rev))
@@ skipping 127 matching lines @@
 
     up_pivot = int((bad - pivot) / 2) + pivot
     up_fetch = None
     if up_pivot != pivot and up_pivot != bad:
       up_rev = revlist[up_pivot]
       up_fetch = DownloadJob(context, 'up_fetch', up_rev,
                              _GetDownloadPath(up_rev))
       up_fetch.Start()
 
     # Run test on the pivot revision.
+    tempdir = tempfile.mkdtemp(prefix='bisect_tmp')
+    testargs = [os.path.join(tempdir, context.GetLaunchPath()),
+                '--user-data-dir=%s' % profile] + try_args
     (status, stdout, stderr) = RunRevision(context,
                                            rev,
                                            zipfile,
-                                           profile,
                                            num_runs,
-                                           try_args)
+                                           testargs,
+                                           tempdir)
+    try:
+      shutil.rmtree(tempdir, True)
+    except Exception, e:
+      pass
+
     os.unlink(zipfile)
     zipfile = None
 
     # Call the evaluate function to see if the current revision is good or bad.
     # On that basis, kill one of the background downloads and complete the
     # other, as described in the comments above.
     try:
       answer = evaluate(rev, official_builds, status, stdout, stderr)
       if answer == 'g':
         good = pivot
@@ skipping 174 matching lines @@
     print '  ' + WEBKIT_CHANGELOG_URL % (first_known_bad_webkit_rev,
                                          last_known_good_webkit_rev)
   print 'CHANGELOG URL:'
   if opts.official_builds:
     print OFFICIAL_CHANGELOG_URL % (last_known_good_rev, first_known_bad_rev)
   else:
     print '  ' + CHANGELOG_URL % (last_known_good_rev, first_known_bad_rev)
 
 if __name__ == '__main__':
   sys.exit(main())