languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-03 20:32:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

gen_snapshot:

Browse source 
- Don't try to mmap an empty file.
  - Use correct filename for mapping errors.
  - Don't set the root library for core-jit snapshots.
  - Accept hyphen variants of options for entry points and compilation traces.

R=zra@google.com

Review-Url: https://codereview.chromium.org/2928663002 .
This commit is contained in:
Ryan Macnak 2017-06-06 14:31:44 -07:00
parent 6894364917
commit 22b72a845c
4 changed files with 32 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
runtime/bin/file_android.cc
View file

@ -81,6 +81,7 @@ bool File::IsClosed() {
MappedMemory* File::Map(MapType type, int64_t position, int64_t length) {
ASSERT(handle_->fd() >= 0);
ASSERT(length > 0);
int prot = PROT_NONE;
switch (type) {
case kReadOnly:

1
runtime/bin/file_linux.cc
View file

@ -81,6 +81,7 @@ bool File::IsClosed() {
MappedMemory* File::Map(MapType type, int64_t position, int64_t length) {
ASSERT(handle_->fd() >= 0);
ASSERT(length > 0);
int prot = PROT_NONE;
switch (type) {
case kReadOnly:

1
runtime/bin/file_macos.cc
View file

@ -83,6 +83,7 @@ bool File::IsClosed() {
MappedMemory* File::Map(MapType type, int64_t position, int64_t length) {
ASSERT(handle_->fd() >= 0);
ASSERT(length > 0);
int prot = PROT_NONE;
switch (type) {
case kReadOnly:

45
runtime/bin/gen_snapshot.cc
View file

@ -355,6 +355,9 @@ static bool ProcessPrintDependenciesOption(const char* option) {
static bool ProcessEmbedderEntryPointsManifestOption(const char* option) {
const char* name = ProcessOption(option, "--embedder_entry_points_manifest=");
if (name == NULL) {
name = ProcessOption(option, "--embedder-entry-points-manifest=");
}
if (name != NULL) {
entry_points_files->AddArgument(name);
return true;
@ -365,6 +368,9 @@ static bool ProcessEmbedderEntryPointsManifestOption(const char* option) {
static bool ProcessLoadCompilationTraceOption(const char* option) {
const char* name = ProcessOption(option, "--load_compilation_trace=");
if (name == NULL) {
name = ProcessOption(option, "--load-compilation-trace=");
}
if (name != NULL) {
load_compilation_trace_filename = name;
return true;
@ -691,7 +697,7 @@ static Dart_Handle LoadSnapshotCreationScript(const char* script_name) {
if (Dart_IsError(source)) {
return source;
}
if (snapshot_kind == kCore) {
if ((snapshot_kind == kCore) || (snapshot_kind == kCoreJIT)) {
return Dart_LoadLibrary(resolved_uri, Dart_Null(), source, 0, 0);
} else {
return Dart_LoadScript(resolved_uri, Dart_Null(), source, 0, 0);
@ -1536,18 +1542,27 @@ static Dart_Isolate CreateServiceIsolate(const char* script_uri,
}
static MappedMemory* MapFile(const char* filename, File::MapType type) {
static MappedMemory* MapFile(const char* filename,
File::MapType type,
const uint8_t** buffer) {
File* file = File::Open(filename, File::kRead);
if (file == NULL) {
Log::PrintErr("Failed to open: %s\n", filename);
exit(kErrorExitCode);
}
MappedMemory* mapping = file->Map(type, 0, file->Length());
intptr_t length = file->Length();
if (length == 0) {
// Can't map an empty file.
*buffer = NULL;
return NULL;
}
MappedMemory* mapping = file->Map(type, 0, length);
if (mapping == NULL) {
Log::PrintErr("Failed to read: %s\n", vm_snapshot_data_filename);
Log::PrintErr("Failed to read: %s\n", filename);
exit(kErrorExitCode);
}
file->Release();
*buffer = reinterpret_cast<const uint8_t*>(mapping->address());
return mapping;
}
@ -1619,27 +1634,23 @@ int main(int argc, char** argv) {
MappedMemory* mapped_isolate_snapshot_instructions = NULL;
if (snapshot_kind == kScript) {
mapped_vm_snapshot_data =
MapFile(vm_snapshot_data_filename, File::kReadOnly);
init_params.vm_snapshot_data =
reinterpret_cast<const uint8_t*>(mapped_vm_snapshot_data->address());
MapFile(vm_snapshot_data_filename, File::kReadOnly,
&init_params.vm_snapshot_data);
if (vm_snapshot_instructions_filename != NULL) {
mapped_vm_snapshot_instructions =
MapFile(vm_snapshot_instructions_filename, File::kReadExecute);
init_params.vm_snapshot_instructions = reinterpret_cast<const uint8_t*>(
mapped_vm_snapshot_instructions->address());
MapFile(vm_snapshot_instructions_filename, File::kReadExecute,
&init_params.vm_snapshot_instructions);
}
mapped_isolate_snapshot_data =
MapFile(isolate_snapshot_data_filename, File::kReadOnly);
isolate_snapshot_data = reinterpret_cast<const uint8_t*>(
mapped_isolate_snapshot_data->address());
MapFile(isolate_snapshot_data_filename, File::kReadOnly,
&isolate_snapshot_data);
if (isolate_snapshot_instructions_filename != NULL) {
mapped_isolate_snapshot_instructions =
MapFile(isolate_snapshot_instructions_filename, File::kReadExecute);
isolate_snapshot_instructions = reinterpret_cast<const uint8_t*>(
mapped_isolate_snapshot_instructions->address());
MapFile(isolate_snapshot_instructions_filename, File::kReadExecute,
&isolate_snapshot_instructions);
}
}
@ -1825,7 +1836,9 @@ int main(int argc, char** argv) {
}
EventHandler::Stop();
delete mapped_vm_snapshot_data;
delete mapped_vm_snapshot_instructions;
delete mapped_isolate_snapshot_data;
delete mapped_isolate_snapshot_instructions;
return 0;
}