Reference perf_id only if set....

log_parser/process_log.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.
 
 """Defines various log processors used by buildbot steps.
 
 Current approach is to set an instance of log processor in
 the ProcessLogTestStep implementation and it will call process()
 method upon completion with full data from process stdio.
@@ skipping 101 matching lines @@
     if output_dir is None:
       output_dir = os.getcwd()
     elif output_dir.startswith('~'):
       output_dir = os.path.expanduser(output_dir)
     self._output_dir = output_dir
     self._matches = {}
 
     # Performance regression/speedup alerts.
     self._perf_id = perf_id
     self._perf_name = perf_name
-    self._perf_filename = os.path.join(PERF_EXPECTATIONS_PATH,
-                                       self._perf_id + ".json")
+    self._perf_filename = None
     self._actual_performance = {}
     self._expected_performance = {}
     self._perf_regress = []
     self._var_regress = []
     self._perf_improve = []
     self._var_improve = []
 
     # The revision isn't known until the Process() call.
     self._revision = -1
 
@@ skipping 11 matching lines @@
       if not m:
         continue
 
       graph_name = m.group(1)
       result_type = m.group(2)
 
       self._expected_performance.setdefault(graph_name, {})
       self._expected_performance[graph_name][result_type] = perf_data[perf_key]
 
   def LoadPerformanceExpectations(self):
-    self._expected = {}
+    if not self._perf_id:
+      logging.error("not loading perf expectations: perf_id missing")

[Nicolas Sylvain, 2009/09/15 21:47:47]

is this really an error?

+      return
+    self._perf_filename = os.path.join(PERF_EXPECTATIONS_PATH,
+                                       self._perf_id + ".json")
     try:
       perf_file = open(self._perf_filename, 'r')
     except IOError, e:
       raise
 
     perf_data = []
     if perf_file:
       try:
         perf_data = simplejson.load(perf_file)
       except ValueError:
         perf_file.seek(0)
         logging.error("Error parsing %s: '%s'" % (PERF_EXPECTATIONS,
                       perf_file.read().strip()))
       perf_file.close()
 
     # Find this perf/test entry
     if perf_data and perf_data.has_key('load') and perf_data['load']:
       self.LoadPerformanceExpectationsGroup(perf_data)
     else:
-      logging.error("not loading perf expectations, perf_data is disabled")
+      logging.error("not loading perf expectations: perf_data is disabled")
 
   def TrackActualPerformance(self, graph_name=None, result_type=None,
                              value=None, stddev=None):
     """Set actual performance data when we come across useful values.
 
     result_type will be of the form "RESULTTYPE" or "RESULTTYPE_ref".
     A trace with _ref in its name refers to a reference build.
 
     Common result types for page cyclers: t, vm_rss_f_r, IO_b_b, etc.
     A test's result types vary between test types.  Currently, a test
@@ skipping 604 matching lines @@
            FormatFloat(mean),
            FormatFloat(stddev),
            self._JoinWithSpacesAndNewLine(times)))
 
     filename = os.path.join(self._output_dir,
                             '%s_%s.dat' % (self._revision, trace_name))
     file = open(filename, 'w')
     file.write(''.join(file_data))
     file.close()
     os.chmod(filename, READABLE_FILE_PERMISSIONS)