Improve tracing/logging system used in lib/naclports

build_tools/partition.py

 #!/usr/bin/env python
 # Copyright (c) 2013 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Manage partitioning of port builds.
 
 Download historical data from the naclports builders, and use it to
 partition all of the projects onto the builder shards so each shard builds in
 about the same amount of time.
@@ skipping 47 matching lines @@
 import urllib2
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 ROOT_DIR = os.path.dirname(SCRIPT_DIR)
 TOOLCHAINS = ('bionic', 'newlib', 'glibc', 'pnacl')
 
 sys.path.append(os.path.join(ROOT_DIR, 'lib'))
 
 import naclports
 import naclports.source_package
-from naclports import Trace
+from naclports.util import LogVerbose
 
 
 class Error(naclports.Error):
   pass
 
 
 def GetBuildOrder(projects):
   rtn = []
   packages = [naclports.source_package.CreatePackage(p) for p in projects]
   for package in packages:
@@ skipping 10 matching lines @@
   deps = GetBuildOrder(projects)
   return set(deps) - set(projects)
 
 
 def DownloadDataFromBuilder(builder, build):
   max_tries = 10
 
   for _ in xrange(max_tries):
     url = 'http://build.chromium.org/p/client.nacl.ports/json'
     url += '/builders/%s/builds/%d' % (builder, build)
-    Trace('Downloading %s' % url)
+    LogVerbose('Downloading %s' % url)
     f = urllib2.urlopen(url)
     try:
       data = json.loads(f.read())
       text = data['text']
       if text == ['build', 'successful']:
-        Trace('  Success!')
+        LogVerbose('  Success!')
         return data
-      Trace('  Not successful, trying previous build.')
+      LogVerbose('  Not successful, trying previous build.')
     finally:
       f.close()
     build -= 1
 
   raise Error('Unable to find a successful build:\nBuilder: %s\nRange: [%d, %d]'
       % (builder, build - max_tries, build))
 
 
 class Project(object):
   def __init__(self, name):
@@ skipping 105 matching lines @@
   return parts
 
 
 def LoadCanned(parts):
   # Return an empty partition for the no-sharding case.
   if parts == 1:
     return [[]]
   partitions = []
   partition = []
   input_file = os.path.join(SCRIPT_DIR, 'partition%d.txt' % parts)
-  Trace("LoadCanned: %s" % input_file)
+  LogVerbose("LoadCanned: %s" % input_file)
   with open(input_file) as fh:
     for line in fh:
       if line.strip()[0] == '#':
         continue
       if line.startswith('  '):
         partition.append(line[2:].strip())
       else:
         if partition:
           partitions.append(partition)
           partition = []
@@ skipping 51 matching lines @@
 
 def PrintCanned(index, parts):
   canned = GetCanned(index, parts)
   print(' '.join(canned))
 
 
 def GetCanned(index, parts):
   assert index >= 0 and index < parts, [index, parts]
   partitions = LoadCanned(parts)
   partitions = FixupCanned(partitions)
-  Trace("Found %d packages for shard %d" % (len(partitions[index]), index))
+  LogVerbose("Found %d packages for shard %d" % (len(partitions[index]), index))
   return partitions[index]
 
 
 def main(args):
   parser = argparse.ArgumentParser()
   parser.add_argument('--check', action='store_true',
                       help='check canned partition information is up-to-date.')
   parser.add_argument('-v', '--verbose', action='store_true',
                       help='Output extra information.')
   parser.add_argument('-t', '--print-canned', type=int,
@@ skipping 22 matching lines @@
       GetCanned(0, num_bots)
     return
 
   if options.print_canned is not None:
     PrintCanned(options.print_canned, options.num_bots)
     return
 
   projects = Projects()
   for bot in range(options.num_bots):
     bot_name = '%s%d' % (options.bot_prefix, bot)
-    Trace('Attempting to add data from "%s"' % bot_name)
+    LogVerbose('Attempting to add data from "%s"' % bot_name)
     projects.AddDataFromBuilder(bot_name, options.build_number)
   projects.PostProcessDeps()
 
   parts = Partition(projects, options.num_parts)
   for i, project_times in enumerate(parts):
     print('builder %d (total: %d)' % (i, project_times.total_time))
     project_names = project_times.TopologicallySortedProjectNames(projects)
     print('  %s' % '\n  '.join(project_names))
 
   times = list(sorted(part.total_time for part in parts))
   difference = 0
   for i in range(1, len(times)):
     difference += times[i] - times[i - 1]
   print('Difference between total time of builders: %d' % difference)
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv[1:]))
   except Error as e:
     sys.stderr.write("%s\n" % e)
     sys.exit(1)