Simplify drmemory_analyze and remove some unneeded stuff

tools/valgrind/drmemory_analyze.py

 #!/usr/bin/python
 # 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.
 
 # drmemory_analyze.py
 
 ''' Given a Dr. Memory output file, parses errors and uniques them.'''
 
 import logging
@@ skipping 24 matching lines @@
       files: A list of filenames.
     '''
 
     self.reports = []
     self.used_suppressions = []
     for file in files:
       self.ParseReportFile(file)
 
   def ReadLine(self):
     self.line_ = self.cur_fd_.readline()
-    self.stack_trace_line_ = None

[Timur Iskhodzhanov, 2011/11/22 13:08:28]

not needed, too much copy-paste from the TSan/Mac file.

 
   def ReadSection(self):
     result = [self.line_]
     self.ReadLine()
     while len(self.line_.strip()) > 0:
       result.append(self.line_)
       self.ReadLine()
     return result
 
   def ParseReportFile(self, filename):
     self.cur_fd_ = open(filename, 'r')
 
     while True:
       self.ReadLine()
       if (self.line_ == ''): break
-      if re.search("FINAL SUMMARY:", self.line_):
-        # No more reports since this point.
-        break
-      tmp = []
+
       match = re.search("^Error #[0-9]+: (.*)", self.line_)
       if match:
         self.line_ = match.groups()[0].strip() + "\n"
-        tmp.extend(self.ReadSection())
+        tmp = self.ReadSection()
         self.reports.append(tmp)
-      elif self.line_.startswith("ASSERT FAILURE"):
-        self.reports.append(self.line_.strip())
-
-    while True:
-      self.ReadLine();
-      if (self.line_ == ''): break
 
       if re.search("SUPPRESSIONS USED:", self.line_):
         self.ReadLine()
         while self.line_.strip() != "":
           line = self.line_.strip()
           (count, name) = re.match(" *([0-9]+)x(?: \(leaked .*\))?: (.*)",
                                    line).groups()
           self.used_suppressions.append("%7s %s" % (count, name))
           self.ReadLine()
-        break
-
-    while True:
-      self.ReadLine();
-      if (self.line_ == ''): break
 
       if self.line_.startswith("ASSERT FAILURE"):
         self.reports.append(self.line_.strip())
 
     self.cur_fd_.close()
 
   def Report(self, check_sanity):
     sys.stdout.flush()
     #TODO(timurrrr): support positive tests / check_sanity==True
 
@@ skipping 28 matching lines @@
 
   (options, args) = parser.parse_args()
   if len(args) == 0:
     parser.error("no filename specified")
   filenames = args
 
   analyzer = DrMemoryAnalyze(options.source_dir, filenames)
   retcode = analyzer.Report(False)
 
   sys.exit(retcode)