languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-11-02 12:24:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Remove loading of observatory assets from dart_bootstrap.

Browse source 
BUG=
R=rmacnak@google.com

Review URL: https://codereview.chromium.org/1766833002 .
This commit is contained in:
Ivan Posva 2016-03-04 16:05:54 -08:00
parent 5c38712ce9
commit 9535aa6426
3 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
runtime/bin/bin.gypi
View file

@ -744,7 +744,6 @@
'libdart_builtin',
'libdart_io',
'generate_resources_cc_file#host',
'bin/zlib.gyp:zlib_dart',
],
'include_dirs': [
'..',

24
runtime/bin/main.cc
View file

@ -45,7 +45,7 @@ extern const uint8_t* isolate_snapshot_buffer;
* A full application snapshot can be generated and run using the following
* commands
* - Generating a full application snapshot :
* dart_no_snapshot --full-snapshot-after-run=<filename> --package-root=<dirs>
* dart_bootstrap --full-snapshot-after-run=<filename> --package-root=<dirs>
* <script_uri> [<script_options>]
* - Running the full application snapshot generated above :
* dart --run-full-snapshot=<filename> <script_uri> [<script_options>]
@ -327,12 +327,11 @@ static bool ProcessCompileAllOption(const char* arg,
static bool ProcessGenPrecompiledSnapshotOption(
const char* arg,
CommandLineOptions* vm_options) {
// Ensure that we are not already running using a full snapshot.
if (isolate_snapshot_buffer != NULL) {
Log::PrintErr("Precompiled snapshots must be generated with"
" dart_no_snapshot.\n");
return false;
}
#if !defined(DART_PRECOMPILER)
Log::PrintErr("Precompiled snapshots must be generated with "
"dart_bootstrap.\n");
return false;
#else // defined(DART_PRECOMPILER)
ASSERT(arg != NULL);
if ((arg[0] == '=') || (arg[0] == ':')) {
precompiled_snapshot_directory = &arg[1];
@ -342,6 +341,7 @@ static bool ProcessGenPrecompiledSnapshotOption(
gen_precompiled_snapshot = true;
vm_options->AddArgument("--precompilation");
return true;
#endif // defined(DART_PRECOMPILER)
}
@ -395,10 +395,10 @@ static bool ProcessFullSnapshotAfterRunOption(
if ((filename == NULL) || (strlen(filename) == 0)) {
return false;
}
// Ensure that we are running 'dart_no_snapshot'.
// Ensure that we are running 'dart_bootstrap'.
if (isolate_snapshot_buffer != NULL) {
Log::PrintErr("Full Application snapshots must be generated with"
" dart_no_snapshot\n");
" dart_bootstrap\n");
return false;
}
return ProcessSnapshotOptionHelper(filename,
@ -1421,6 +1421,9 @@ bool RunMainIsolate(const char* script_name,
#undef CHECK_RESULT
// Observatory assets are only needed in the regular dart binary.
#if !defined(DART_PRECOMPILER)
extern unsigned int observatory_assets_archive_len;
extern const uint8_t* observatory_assets_archive;
@ -1502,6 +1505,9 @@ Dart_Handle GetVMServiceAssetsArchiveCallback() {
free(decompressed);
return tar_file;
}
#else // !defined(DART_PRECOMPILER)
static Dart_GetVMServiceAssetsArchive GetVMServiceAssetsArchiveCallback = NULL;
#endif // !defined(DART_PRECOMPILER)
void main(int argc, char** argv) {

2
runtime/vm/dart_api_impl.cc
View file

@ -6096,7 +6096,7 @@ DART_EXPORT Dart_Handle Dart_TimelineAsyncEnd(const char* label,
}
// The precompiler is included in dart_no_snapshot and dart_noopt, and
// The precompiler is included in dart_bootstrap and dart_noopt, and
// excluded from dart and dart_precompiled_runtime.
#if !defined(DART_PRECOMPILER)