tsan_analyze.py now assumes that all ThreadSanitizer reports contain VIM fold...

tools/valgrind/tsan_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.
 
 # tsan_analyze.py
 
 ''' Given a ThreadSanitizer output file, parses errors and uniques them.'''
 
 import gdb_helper
@@ skipping 65 matching lines @@
       binary, ip = match.groups()
       TheAddressTable.AddBinaryAt(binary, ip)
       return
     match = TsanAnalyzer.TSAN_LINE_RE.match(self.line_)
     if match:
       address, binary_name = match.groups()
       stack_trace_line = _StackTraceLine(self.line_, address, binary_name)
       TheAddressTable.Add(stack_trace_line.binary, stack_trace_line.address)
       self.stack_trace_line_ = stack_trace_line
 
-  # TODO(glider): merge Read*Section once TSan is fixed to print {{{ and }}}
-  # around all reports.
-  def ReadRaceSection(self):
+  def ReadSection(self):
     result = [self.line_]
     if re.search("{{{", self.line_):
       while not re.search('}}}', self.line_):
         self.ReadLine()
         if self.stack_trace_line_ is None:
           result.append(self.line_)
         else:
           result.append(self.stack_trace_line_)
     return result
 
-  def ReadWarningSection(self):
-    result = [self.line_]
-    self.ReadLine()
-    while TsanAnalyzer.TSAN_WARNING_LINE_RE.match(self.line_):
-      self.ReadLine()
-      if self.stack_trace_line_ is None:
-        result.append(self.line_)
-      else:
-        result.append(self.stack_trace_line_)
-    return result
-
-
   def ParseReportFile(self, filename):
     self.cur_fd_ = open(filename, 'r')
 
     while True:
       # Read ThreadSanitizer reports.
       self.ReadLine()
       if (self.line_ == ''):
         break
 
       tmp = []
       while re.search(TsanAnalyzer.THREAD_CREATION_STR, self.line_):
-        # TODO(glider): that's not really a race section but rather an {{{...}}}
-        # but use this wrong name to quick-fix the script.
-        tmp.extend(self.ReadRaceSection())
+        tmp.extend(self.ReadSection())
         self.ReadLine()
       if re.search(TsanAnalyzer.TSAN_RACE_DESCRIPTION, self.line_):
-        tmp.extend(self.ReadRaceSection())
+        tmp.extend(self.ReadSection())
         self.reports.append(tmp)
       if (re.search(TsanAnalyzer.TSAN_WARNING_DESCRIPTION, self.line_) and
           not common.IsWindows()): # workaround for http://crbug.com/53198
-        tmp.extend(self.ReadWarningSection())
+        tmp.extend(self.ReadSection())
         self.reports.append(tmp)
 
       match = re.search(" used_suppression:\s+([0-9]+)\s(.*)", self.line_)
       if match:
         count, supp_name = match.groups()
         count = int(count)
         if supp_name in self.used_suppressions:
           self.used_suppressions[supp_name] += count
         else:
           self.used_suppressions[supp_name] = count
@@ skipping 60 matching lines @@
 
   (options, args) = parser.parse_args()
   if len(args) == 0:
     parser.error("no filename specified")
   filenames = args
 
   analyzer = TsanAnalyzer(options.source_dir, use_gdb=True)
   retcode = analyzer.Report(filenames)
 
   sys.exit(retcode)