Don't wait for dead valgrinds to end their logs

tools/valgrind/memcheck_analyze.py

 #!/usr/bin/python
 # Copyright (c) 2006-2008 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.
 
 # memcheck_analyze.py
 
 ''' Given a valgrind XML file, parses errors and uniques them.'''
 
 import gdb_helper
 
 import logging
 import optparse
 import os
+import re
 import subprocess
 import sys
 import time
 from xml.dom.minidom import parse
 from xml.parsers.expat import ExpatError
 
 # Global symbol table (yuck)
 TheAddressTable = None
 
 
@@ skipping 336 matching lines @@
       TheAddressTable = gdb_helper.AddressTable()
     self._errors = set()
     self._suppcounts = {}
     badfiles = set()
     start = time.time()
     self._parse_failed = False
     for file in files:
       # Wait up to three minutes for valgrind to finish writing all files,
       # but after that, just skip incomplete files and warn.
       f = open(file, "r+")
+      pid = re.match(".*\.([0-9]+)$", file)
+      if pid:
+        pid = pid.groups()[0]
       found = False
+      running = True
       firstrun = True
       origsize = os.path.getsize(file)
-      while (not found and (firstrun or ((time.time() - start) < 180.0))):
+      while (running and not found and
+             (firstrun or ((time.time() - start) < 180.0))):
         firstrun = False
         f.seek(0)
+        if pid:
+          # Make sure the process is still running so we don't wait for
+          # 3 minutes if it was killed. See http://crbug.com/17453
+          ps_out = subprocess.Popen("ps p %s" % pid, shell=True,
+                                    stdout=subprocess.PIPE).stdout
+          if ps_out.readlines() < 2:
+            running = False
         found = find_and_truncate(f)
-        if not found:
+        if not running and not found:
+          logging.warn("Valgrind process PID = %s is not running but "
+                       "its XML log has not been finished correctly" % pid)
+        if running and not found:
           time.sleep(1)
       f.close()
       if not found:
         badfiles.add(file)
       else:
         newsize = os.path.getsize(file)
         if origsize > newsize+1:
           logging.warn(str(origsize - newsize) + " bytes of junk were after </valgrindoutput> in %s!" % file)
         try:
           parsed_file = parse(file);
@@ skipping 115 matching lines @@
     parser.error("no filename specified")
   filenames = args
 
   analyzer = MemcheckAnalyze(options.source_dir, filenames, use_gdb=True)
   retcode = analyzer.Report()
 
   sys.exit(retcode)
 
 if __name__ == "__main__":
   _main()