Fix rare logdir races by adding "_logdirfilecount" to the 'PID' when generating a unique logdir path

tools/valgrind/valgrind_test.py

 # Copyright (c) 2011 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.
 
 """Runs an exe through Valgrind and puts the intermediate files in a
 directory.
 """
 
 import datetime
 import glob
@@ skipping 903 matching lines @@
     analyzer = drmemory_analyze.DrMemoryAnalyzer()
 
     ret = 0
     if not self._options.indirect:
       filenames = glob.glob(self.log_dir + "/*/results.txt")
 
       ret = analyzer.Report(filenames, None, check_sanity)
     else:
       testcases = glob.glob(self.log_dir + "/testcase.*.logs")
       # If we have browser wrapper, the per-test logdirs are named as
-      # "testcase.wrapper_PID".
-      # Let's extract the list of wrapper_PIDs and name it ppids
-      ppids = set([int(f.split(".")[-2]) for f in testcases])
+      # "testcase.wrapper_PID.name".
+      # Let's extract the list of wrapper_PIDs and name it ppids.
+      # NOTE: ppids may contain '_', i.e. they are not ints!
+      ppids = set([f.split(".")[-2] for f in testcases])
 
       for ppid in ppids:
         testcase_name = None
         try:
-          f = open(self.log_dir + ("/testcase.%d.name" % ppid))
+          f = open("%s/testcase.%s.name" % (self.log_dir, ppid))
           testcase_name = f.read().strip()
           f.close()
         except IOError:
           pass
         print "====================================================="
-        print " Below is the report for drmemory wrapper PID=%d." % ppid
+        print " Below is the report for drmemory wrapper PID=%s." % ppid
         if testcase_name:
           print " It was used while running the `%s` test." % testcase_name
         else:
           # TODO(timurrrr): hm, the PID line is suppressed on Windows...
           print " You can find the corresponding test"
-          print " by searching the above log for 'PID=%d'" % ppid
+          print " by searching the above log for 'PID=%s'" % ppid
         sys.stdout.flush()
-        ppid_filenames = glob.glob("%s/testcase.%d.logs/*/results.txt" %
+        ppid_filenames = glob.glob("%s/testcase.%s.logs/*/results.txt" %
                                    (self.log_dir, ppid))
         ret |= analyzer.Report(ppid_filenames, testcase_name, False)
         print "====================================================="
         sys.stdout.flush()
 
     logging.info("Please see http://dev.chromium.org/developers/how-tos/"
                  "using-drmemory for the info on Dr. Memory")
     return ret
 
 
@@ skipping 241 matching lines @@
       return Asan()
     try:
       platform_name = common.PlatformNames()[0]
     except common.NotImplementedError:
       platform_name = sys.platform + "(Unknown)"
     raise RuntimeError, "Unknown tool (tool=%s, platform=%s)" % (tool_name,
                                                                  platform_name)
 
 def CreateTool(tool):
   return ToolFactory().Create(tool)