Speed up fremontcut/dartdomgenerator

lib/html/scripts/dartdomgenerator.py

 #!/usr/bin/python
 # Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 """This is the entry point to create Dart APIs from the IDL database."""
 
 import dartgenerator
 import database
+import fremontcutbuilder
 import logging.config
 import multiemitter
 import optparse
 import os
 import shutil
 import subprocess
 import sys
 from generator import TypeRegistry
 from htmlrenamer import HtmlRenamer
 from systembase import GeneratorOptions
@@ skipping 11 matching lines @@
     # TODO(vsm): Maybe Store these renames in the IDLs.
     'ApplicationCache': 'DOMApplicationCache',
     'BarProp': 'BarInfo',
     'DedicatedWorkerGlobalScope': 'DedicatedWorkerContext',
     'FormData': 'DOMFormData',
     'Selection': 'DOMSelection',
     'SharedWorkerGlobalScope': 'SharedWorkerContext',
     'Window': 'DOMWindow',
     'WorkerGlobalScope': 'WorkerContext'}
 
+# TODO(vsm): Remove once we fix Dartium to pass in the database directly.
 def Generate(database_dir, use_database_cache, dart2js_output_dir=None,
              dartium_output_dir=None):
+  database = LoadDatabase(database_dir, use_database_cache)
+  GenerateFromDatabase(database, dart2js_output_dir, dartium_output_dir)
+
+def LoadDatabase(database_dir, use_database_cache):
+  common_database = database.Database(database_dir)
+  if use_database_cache:
+    common_database.LoadFromCache()
+  else:
+    common_database.Load()
+  return common_database
+
+def GenerateFromDatabase(common_database, dart2js_output_dir,
+                         dartium_output_dir):
   current_dir = os.path.dirname(__file__)
   auxiliary_dir = os.path.join(current_dir, '..', 'src')
   template_dir = os.path.join(current_dir, '..', 'templates')
 
   generator = dartgenerator.DartGenerator()
   generator.LoadAuxiliary(auxiliary_dir)
 
-  common_database = database.Database(database_dir)
-  if use_database_cache:
-    common_database.LoadFromCache()
-  else:
-    common_database.Load()
-
   generator.FilterMembersWithUnidentifiedTypes(common_database)
   webkit_database = common_database.Clone()
 
   # Generate Dart interfaces for the WebKit DOM.
   generator.FilterInterfaces(database = webkit_database,
                              or_annotations = ['WebKit', 'Dart'],
                              exclude_displaced = ['WebKit'],
                              exclude_suppressed = ['WebKit', 'Dart'])
   generator.RenameTypes(webkit_database, _webkit_renames, True)
   generator.FixEventTargets(webkit_database)
@@ skipping 60 matching lines @@
   library_dir = os.path.dirname(library_path)
   library_filename = os.path.basename(library_path)
   copy_dart_script = os.path.relpath('../../../tools/copy_dart.py', library_dir)
   output_dir = os.path.relpath(output_dir, library_dir)
   command = ' '.join(['cd', library_dir, ';',
                       copy_dart_script, output_dir, library_filename])
   subprocess.call([command], shell=True)
 
 def main():
   parser = optparse.OptionParser()
+  parser.add_option('--rebuild', dest='rebuild',
+                    action='store_true', default=False,
+                    help='Rebuild the database from IDL using fremontcut.')
   parser.add_option('--systems', dest='systems',
                     action='store', type='string',
                     default='htmldart2js,htmldartium',
                     help='Systems to generate (htmldart2js, htmldartium)')
   parser.add_option('--output-dir', dest='output_dir',
                     action='store', type='string',
                     default=None,
                     help='Directory to put the generated files')
   parser.add_option('--use-database-cache', dest='use_database_cache',
                     action='store_true',
                     default=False,
                     help='''Use the cached database from the previous run to
                     improve startup performance''')
   (options, args) = parser.parse_args()
 
   current_dir = os.path.dirname(__file__)
   database_dir = os.path.join(current_dir, '..', 'database')
   logging.config.fileConfig(os.path.join(current_dir, 'logging.conf'))
   systems = options.systems.split(',')
 
   output_dir = options.output_dir or os.path.join(current_dir, '../generated')
   dart2js_output_dir = None
   if 'htmldart2js' in systems:
     dart2js_output_dir = os.path.join(output_dir, 'dart2js')
   dartium_output_dir = None
   if 'htmldartium' in systems:
     dartium_output_dir = os.path.join(output_dir, 'dartium')
 
-  Generate(database_dir, options.use_database_cache, dart2js_output_dir,
-           dartium_output_dir)
+  if options.rebuild:
+    # Parse the IDL and create the database.
+    database = fremontcutbuilder.main()
+  else:
+    # Load the previously generated database.
+    database = LoadDatabase(database_dir, options.use_database_cache)
+  GenerateFromDatabase(database, dart2js_output_dir,

[Anton Muhin, 2012/09/26 17:53:09]

nit: fits single line?

[vsm, 2012/09/28 16:17:25]

Done.

+                       dartium_output_dir)
 
   if 'htmldart2js' in systems:
     _logger.info('Copy html_dart2js to dart2js/')
     GenerateSingleFile(os.path.join(dart2js_output_dir, 'html_dart2js.dart'),
                        '../dart2js')
   if 'htmldartium' in systems:
     _logger.info('Copy html_dartium to dartium/')
     GenerateSingleFile(os.path.join(dartium_output_dir, 'html_dartium.dart'),
                        '../dartium')
 
 if __name__ == '__main__':
   sys.exit(main())