Support external startup data in V8.

tools/gyp/v8.gyp

 # Copyright 2012 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 24 matching lines @@
   'targets': [
     {
       'target_name': 'v8',
       'dependencies_traverse': 1,
       'conditions': [
         ['want_separate_host_toolset==1', {
           'toolsets': ['host', 'target'],
         }, {
           'toolsets': ['target'],
         }],
-        ['v8_use_snapshot=="true"', {
+
+        ['v8_use_snapshot=="true" and v8_use_external_startup_data==0', {
           # The dependency on v8_base should come from a transitive
           # dependency however the Android toolchain requires libv8_base.a
           # to appear before libv8_snapshot.a so it's listed explicitly.
           'dependencies': ['v8_base.<(v8_target_arch)', 'v8_snapshot'],
-        },
-        {
+        }],
+        ['v8_use_snapshot!="true" and v8_use_external_startup_data==0', {
           # The dependency on v8_base should come from a transitive
           # dependency however the Android toolchain requires libv8_base.a
           # to appear before libv8_snapshot.a so it's listed explicitly.
           'dependencies': [
             'v8_base.<(v8_target_arch)',
             'v8_nosnapshot.<(v8_target_arch)',
           ],
         }],
+        ['v8_use_external_startup_data==1', {
+          'dependencies': [
+            'v8_base.<(v8_target_arch)',
+            'v8_external_snapshot',
+          ],
+        }],
         ['component=="shared_library"', {
           'type': '<(component)',
           'sources': [
             # Note: on non-Windows we still build this file so that gyp
             # has some sources to link into the component.
             '../../src/v8dll-main.cc',
           ],
           'defines': [
             'V8_SHARED',
             'BUILDING_V8_SHARED',
@@ skipping 71 matching lines @@
         'v8_base.<(v8_target_arch)',
       ],
       'include_dirs+': [
         '../../src',
       ],
       'sources': [
         '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
         '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
         '<(SHARED_INTERMEDIATE_DIR)/trig-table.cc',
         '<(INTERMEDIATE_DIR)/snapshot.cc',
+        '../../src/snapshot-common.cc',
       ],
       'actions': [
         {
           'action_name': 'run_mksnapshot',
           'inputs': [
             '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot.<(v8_target_arch)<(EXECUTABLE_SUFFIX)',
           ],
           'outputs': [
             '<(INTERMEDIATE_DIR)/snapshot.cc',
           ],
           'variables': {
             'mksnapshot_flags': [
               '--log-snapshot-positions',
               '--logfile', '<(INTERMEDIATE_DIR)/snapshot.log',
             ],
             'conditions': [
               ['v8_random_seed!=0', {
                 'mksnapshot_flags': ['--random-seed', '<(v8_random_seed)'],
               }],
             ],
           },
           'action': [
             '<@(_inputs)',
             '<@(mksnapshot_flags)',
-            '<@(_outputs)'
+            '<@(INTERMEDIATE_DIR)/snapshot.cc'
           ],
         },
       ],
     },
     {
       'target_name': 'v8_nosnapshot.<(v8_target_arch)',
       'type': 'static_library',
       'dependencies': [
         'v8_base.<(v8_target_arch)',
       ],
       'include_dirs+': [
         '../../src',
       ],
       'sources': [
         '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
         '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
         '<(SHARED_INTERMEDIATE_DIR)/trig-table.cc',
+        '../../src/snapshot-common.cc',
         '../../src/snapshot-empty.cc',
       ],
       'conditions': [
         ['want_separate_host_toolset==1', {
           'toolsets': ['host', 'target'],
           'dependencies': ['js2c#host', 'generate_trig_table#host'],
         }, {
           'toolsets': ['target'],
           'dependencies': ['js2c', 'generate_trig_table'],
         }],
         ['component=="shared_library"', {
           'defines': [
             'BUILDING_V8_SHARED',
             'V8_SHARED',
           ],
         }],
       ]
     },
+    {
+      'target_name': 'v8_external_snapshot',
+      'type': 'static_library',
+      'dependencies': [
+        'v8_base.<(v8_target_arch)',
+        'mksnapshot.<(v8_target_arch)',
+        'natives_blob',
+      ],
+      'include_dirs+': [
+        '../../src',
+      ],
+      'sources': [
+        '<(SHARED_INTERMEDIATE_DIR)/trig-table.cc',
+        '../../src/natives-external.cc',
+        '../../src/snapshot-external.cc',
+      ],
+      'conditions': [
+        ['want_separate_host_toolset==1', {
+          'toolsets': ['host', 'target'],
+          'dependencies': [
+            'js2c#host',
+            'generate_trig_table#host',
+            'mksnapshot.<(v8_target_arch)#host'
+        ]}, {
+          'toolsets': ['target'],
+          'dependencies': [
+            'js2c',
+            'generate_trig_table',
+            'mksnapshot.<(v8_target_arch)'
+        ]}],
+        ['component=="shared_library"', {
+          'defines': [
+            'BUILDING_V8_SHARED',
+            'V8_SHARED',
+          ],
+        }],
+      ],
+      'actions': [
+        {
+          'action_name': 'run_mksnapshot (external)',
+          'inputs': [
+            '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot.<(v8_target_arch)<(EXECUTABLE_SUFFIX)',
+          ],
+          'outputs': [
+            '<(INTERMEDIATE_DIR)/snapshot.cc',
+            '<(INTERMEDIATE_DIR)/snapshot_blob.bin',
+          ],
+          'variables': {
+            'mksnapshot_flags': [
+              '--log-snapshot-positions',
+              '--logfile', '<(INTERMEDIATE_DIR)/snapshot.log',
+            ],
+            'conditions': [
+              ['v8_random_seed!=0', {
+                'mksnapshot_flags': ['--random-seed', '<(v8_random_seed)'],
+              }],
+            ],
+          },
+          'action': [
+            '<@(_inputs)',
+            '<@(mksnapshot_flags)',
+            '<@(INTERMEDIATE_DIR)/snapshot.cc',
+            '--startup_blob', '<(INTERMEDIATE_DIR)/snapshot_blob.bin',
+          ],
+        },
+      ],
+    },
     { 'target_name': 'generate_trig_table',
       'type': 'none',
       'conditions': [
         ['want_separate_host_toolset==1', {
           'toolsets': ['host'],
         }, {
           'toolsets': ['target'],
         }],
       ],
       'actions': [
@@ skipping 316 matching lines @@
         '../../src/scanner.cc',
         '../../src/scanner.h',
         '../../src/scopeinfo.cc',
         '../../src/scopeinfo.h',
         '../../src/scopes.cc',
         '../../src/scopes.h',
         '../../src/serialize.cc',
         '../../src/serialize.h',
         '../../src/small-pointer-list.h',
         '../../src/smart-pointers.h',
-        '../../src/snapshot-common.cc',
         '../../src/snapshot.h',
+        '../../src/snapshot-source-sink.cc',

[jochen (gone - plz use gerrit), 2014/05/23 11:44:44]

can you do those changes (adding/removing files) in BUILD.gn as well? It doesn't
have the snapshot generation logic or anything beyond that yet, so just adding
the files to the list will be enough.

[vogelheim, 2014/05/26 12:36:03]

Done.

+        '../../src/snapshot-source-sink.h',
         '../../src/spaces-inl.h',
         '../../src/spaces.cc',
         '../../src/spaces.h',
         '../../src/store-buffer-inl.h',
         '../../src/store-buffer.cc',
         '../../src/store-buffer.h',
         '../../src/string-search.cc',
         '../../src/string-search.h',
         '../../src/string-stream.cc',
         '../../src/string-stream.h',
@@ skipping 485 matching lines @@
         }],
         ['component=="shared_library"', {
           'defines': [
             'BUILDING_V8_SHARED',
             'V8_SHARED',
           ],
         }],
       ],
     },
     {
+      'target_name': 'natives_blob',
+      'type': 'none',
+      'actions': [{
+        'action_name': 'concatenate_natives_blob',
+        'inputs': [
+          '<(SHARED_INTERMEDIATE_DIR)/libraries.bin',

[jochen (gone - plz use gerrit), 2014/05/23 11:44:44]

I think we want those in <(PRODUCT_DIR)

[vogelheim, 2014/05/26 12:36:03]

Done, but only for those two files that are meant to be used outside the v8
build process, snapshot_blob.bin and natives_blob.bin. libraries.bin (which is
an input to natives_blob.bin) remains in SHARED_INTERMEDIATE_DIR.

+          '<(SHARED_INTERMEDIATE_DIR)/libraries-experimental.bin',
+        ],
+        'outputs': [
+          '<(SHARED_INTERMEDIATE_DIR)/natives_blob.bin',
+        ],
+        'action': [
+          'bash',

[jochen (gone - plz use gerrit), 2014/05/23 11:44:44]

there's no bash on windows. gyp has some magic to replace cat with type on
windows, however, i'm not sure whether that can cope with binary files, so you
may want to write a small python script for that.

[vogelheim, 2014/05/26 12:36:03]

Hmm... I got the idea from code search:
https://code.google.com/p/chromium/codesearch#search/&q=bash%20file:%5C.gyp$&...

Are you sure a separate script is needed?

+          '-c',
+          'cat <@(_inputs) > <@(_outputs)',
+        ],
+      }],
+    },
+    {
       'target_name': 'js2c',
       'type': 'none',
       'conditions': [
         ['want_separate_host_toolset==1', {
           'toolsets': ['host'],
         }, {
           'toolsets': ['target'],
         }],
         ['v8_enable_i18n_support==1', {
           'variables': {
@@ skipping 34 matching lines @@
           '../../src/macros.py',
           '../../src/symbol.js',
           '../../src/proxy.js',
           '../../src/collection.js',
           '../../src/generator.js',
           '../../src/array-iterator.js',
           '../../src/harmony-string.js',
           '../../src/harmony-array.js',
           '../../src/harmony-math.js'
         ],
+        'libraries_bin_file': '<(SHARED_INTERMEDIATE_DIR)/libraries.bin',
+        'libraries_experimental_bin_file': '<(SHARED_INTERMEDIATE_DIR)/libraries-experimental.bin',
       },
       'actions': [
         {
           'action_name': 'js2c',
           'inputs': [
             '../../tools/js2c.py',
             '<@(library_files)',
             '<@(i18n_library_files)',
           ],
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
           ],
           'action': [
             'python',
             '../../tools/js2c.py',
-            '<@(_outputs)',
+            '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
             'CORE',
             '<(v8_compress_startup_data)',
             '<@(library_files)',
             '<@(i18n_library_files)',
           ],
+          'conditions': [
+            [ 'v8_use_external_startup_data==1', {
+              'outputs': ['<@(libraries_bin_file)'],
+              'action': [
+                '--startup_blob', '<@(libraries_bin_file)',
+              ],
+            }],
+          ],
         },
         {
           'action_name': 'js2c_experimental',
           'inputs': [
             '../../tools/js2c.py',
             '<@(experimental_library_files)',
           ],
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
           ],
           'action': [
             'python',
             '../../tools/js2c.py',
-            '<@(_outputs)',
+            '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
             'EXPERIMENTAL',
             '<(v8_compress_startup_data)',
             '<@(experimental_library_files)'
           ],
+          'conditions': [
+            [ 'v8_use_external_startup_data==1', {
+              'outputs': ['<@(libraries_experimental_bin_file)'],
+              'action': [
+                '--startup_blob', '<@(libraries_experimental_bin_file)'
+              ],
+            }],
+          ],
         },
       ],
     },
     {
       'target_name': 'postmortem-metadata',
       'type': 'none',
       'variables': {
         'heapobject_files': [
             '../../src/objects.h',
             '../../src/objects-inl.h',
@@ skipping 39 matching lines @@
         }],
         ['v8_compress_startup_data=="bz2"', {
           'libraries': [
             '-lbz2',
           ]
         }],
       ],
     },
   ],
 }