Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(113)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gin/isolate_holder.cc

Issue 1011133006: Move V8 snapshot loading code from isolate_holder to gin/v8_startup_data.{h,cc}. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Incorporate review comments. Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gin/gin.gyp ('k') | gin/public/isolate_holder.h » ('j') | gin/test/file_runner.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gin/isolate_holder.cc
diff --git a/gin/isolate_holder.cc b/gin/isolate_holder.cc
index 317b5822bd8f47f773a0927d1a2b18ef6c2ebcb8..a708145ca753037eebb6f05d6ac522a77c24e839 100644
--- a/gin/isolate_holder.cc
+++ b/gin/isolate_holder.cc
@@ -7,214 +7,24 @@
#include <stdlib.h>
#include <string.h>
-#include "base/files/memory_mapped_file.h"
#include "base/logging.h"
#include "base/message_loop/message_loop.h"
-#include "base/rand_util.h"
-#include "base/strings/sys_string_conversions.h"
#include "base/sys_info.h"
-#include "crypto/sha2.h"
-#include "gin/array_buffer.h"
#include "gin/debug_impl.h"
#include "gin/function_template.h"
#include "gin/per_isolate_data.h"
-#include "gin/public/v8_platform.h"
#include "gin/run_microtasks_observer.h"
-
-#if defined(V8_USE_EXTERNAL_STARTUP_DATA)
-#if defined(OS_MACOSX)
-#include "base/mac/foundation_util.h"
-#endif // OS_MACOSX
-#include "base/path_service.h"
-#endif // V8_USE_EXTERNAL_STARTUP_DATA
+#include "gin/v8_initializer.h"
namespace gin {
namespace {
-
-v8::ArrayBuffer::Allocator* g_array_buffer_allocator = NULL;
-
-bool GenerateEntropy(unsigned char* buffer, size_t amount) {
- base::RandBytes(buffer, amount);
- return true;
-}
-
-base::MemoryMappedFile* g_mapped_natives = NULL;
-base::MemoryMappedFile* g_mapped_snapshot = NULL;
-
-#if defined(V8_USE_EXTERNAL_STARTUP_DATA)
-bool MapV8Files(base::FilePath* natives_path,
- base::FilePath* snapshot_path,
- int natives_fd = -1,
- int snapshot_fd = -1,
- base::MemoryMappedFile::Region natives_region =
- base::MemoryMappedFile::Region::kWholeFile,
- base::MemoryMappedFile::Region snapshot_region =
- base::MemoryMappedFile::Region::kWholeFile) {
- int flags = base::File::FLAG_OPEN | base::File::FLAG_READ;
-
- g_mapped_natives = new base::MemoryMappedFile;
- if (!g_mapped_natives->IsValid()) {
-#if !defined(OS_WIN)
- if (natives_fd == -1
- ? !g_mapped_natives->Initialize(base::File(*natives_path, flags),
- natives_region)
- : !g_mapped_natives->Initialize(base::File(natives_fd),
- natives_region)) {
-#else
- if (!g_mapped_natives->Initialize(base::File(*natives_path, flags),
- natives_region)) {
-#endif // !OS_WIN
- delete g_mapped_natives;
- g_mapped_natives = NULL;
- LOG(FATAL) << "Couldn't mmap v8 natives data file";
- return false;
- }
- }
-
- g_mapped_snapshot = new base::MemoryMappedFile;
- if (!g_mapped_snapshot->IsValid()) {
-#if !defined(OS_WIN)
- if (snapshot_fd == -1
- ? !g_mapped_snapshot->Initialize(base::File(*snapshot_path, flags),
- snapshot_region)
- : !g_mapped_snapshot->Initialize(base::File(snapshot_fd),
- snapshot_region)) {
-#else
- if (!g_mapped_snapshot->Initialize(base::File(*snapshot_path, flags),
- snapshot_region)) {
-#endif // !OS_WIN
- delete g_mapped_snapshot;
- g_mapped_snapshot = NULL;
- LOG(ERROR) << "Couldn't mmap v8 snapshot data file";
- return false;
- }
- }
-
- return true;
-}
-
-#if defined(V8_VERIFY_EXTERNAL_STARTUP_DATA)
-bool VerifyV8SnapshotFile(base::MemoryMappedFile* snapshot_file,
- const unsigned char* fingerprint) {
- unsigned char output[crypto::kSHA256Length];
- crypto::SHA256HashString(
- base::StringPiece(reinterpret_cast<const char*>(snapshot_file->data()),
- snapshot_file->length()),
- output, sizeof(output));
- return !memcmp(fingerprint, output, sizeof(output));
-}
-#endif // V8_VERIFY_EXTERNAL_STARTUP_DATA
-#endif // V8_USE_EXTERNAL_STARTUP_DATA
-
+v8::ArrayBuffer::Allocator* g_array_buffer_allocator = nullptr;
} // namespace
-#if defined(V8_USE_EXTERNAL_STARTUP_DATA)
-
-#if defined(V8_VERIFY_EXTERNAL_STARTUP_DATA)
-// Defined in gen/gin/v8_snapshot_fingerprint.cc
-extern const unsigned char g_natives_fingerprint[];
-extern const unsigned char g_snapshot_fingerprint[];
-#endif // V8_VERIFY_EXTERNAL_STARTUP_DATA
-
-#if !defined(OS_MACOSX)
-const int IsolateHolder::kV8SnapshotBasePathKey =
-#if defined(OS_ANDROID)
- base::DIR_ANDROID_APP_DATA;
-#elif defined(OS_POSIX)
- base::DIR_EXE;
-#elif defined(OS_WIN)
- base::DIR_MODULE;
-#endif // OS_ANDROID
-#endif // !OS_MACOSX
-
-const char IsolateHolder::kNativesFileName[] = "natives_blob.bin";
-const char IsolateHolder::kSnapshotFileName[] = "snapshot_blob.bin";
-
-// static
-bool IsolateHolder::LoadV8Snapshot() {
- if (g_mapped_natives && g_mapped_snapshot)
- return true;
-
-#if !defined(OS_MACOSX)
- base::FilePath data_path;
- PathService::Get(kV8SnapshotBasePathKey, &data_path);
- DCHECK(!data_path.empty());
-
- base::FilePath natives_path = data_path.AppendASCII(kNativesFileName);
- base::FilePath snapshot_path = data_path.AppendASCII(kSnapshotFileName);
-#else // !defined(OS_MACOSX)
- base::ScopedCFTypeRef<CFStringRef> natives_file_name(
- base::SysUTF8ToCFStringRef(kNativesFileName));
- base::FilePath natives_path = base::mac::PathForFrameworkBundleResource(
- natives_file_name);
- base::ScopedCFTypeRef<CFStringRef> snapshot_file_name(
- base::SysUTF8ToCFStringRef(kSnapshotFileName));
- base::FilePath snapshot_path = base::mac::PathForFrameworkBundleResource(
- snapshot_file_name);
- DCHECK(!natives_path.empty());
- DCHECK(!snapshot_path.empty());
-#endif // !defined(OS_MACOSX)
-
- if (!MapV8Files(&natives_path, &snapshot_path))
- return false;
-
-#if defined(V8_VERIFY_EXTERNAL_STARTUP_DATA)
- return VerifyV8SnapshotFile(g_mapped_natives, g_natives_fingerprint) &&
- VerifyV8SnapshotFile(g_mapped_snapshot, g_snapshot_fingerprint);
-#else
- return true;
-#endif // V8_VERIFY_EXTERNAL_STARTUP_DATA
-}
-
-//static
-bool IsolateHolder::LoadV8SnapshotFd(int natives_fd,
- int64 natives_offset,
- int64 natives_size,
- int snapshot_fd,
- int64 snapshot_offset,
- int64 snapshot_size) {
- if (g_mapped_natives && g_mapped_snapshot)
- return true;
-
- base::MemoryMappedFile::Region natives_region =
- base::MemoryMappedFile::Region::kWholeFile;
- if (natives_size != 0 || natives_offset != 0) {
- natives_region =
- base::MemoryMappedFile::Region(natives_offset, natives_size);
- }
-
- base::MemoryMappedFile::Region snapshot_region =
- base::MemoryMappedFile::Region::kWholeFile;
- if (natives_size != 0 || natives_offset != 0) {
- snapshot_region =
- base::MemoryMappedFile::Region(snapshot_offset, snapshot_size);
- }
-
- return MapV8Files(
- NULL, NULL, natives_fd, snapshot_fd, natives_region, snapshot_region);
-}
-#endif // V8_USE_EXTERNAL_STARTUP_DATA
-
-//static
-void IsolateHolder::GetV8ExternalSnapshotData(const char** natives_data_out,
- int* natives_size_out,
- const char** snapshot_data_out,
- int* snapshot_size_out) {
- if (!g_mapped_natives || !g_mapped_snapshot) {
- *natives_data_out = *snapshot_data_out = NULL;
- *natives_size_out = *snapshot_size_out = 0;
- return;
- }
- *natives_data_out = reinterpret_cast<const char*>(g_mapped_natives->data());
- *snapshot_data_out = reinterpret_cast<const char*>(g_mapped_snapshot->data());
- *natives_size_out = static_cast<int>(g_mapped_natives->length());
- *snapshot_size_out = static_cast<int>(g_mapped_snapshot->length());
-}
-
IsolateHolder::IsolateHolder() {
- CHECK(g_array_buffer_allocator)
- << "You need to invoke gin::IsolateHolder::Initialize first";
+ v8::ArrayBuffer::Allocator* allocator = g_array_buffer_allocator;
+ CHECK(allocator) << "You need to invoke gin::V8Initializer::Initialize first";
v8::Isolate::CreateParams params;
params.entry_hook = DebugImpl::GetFunctionEntryHook();
params.code_event_handler = DebugImpl::GetJitCodeEventHandler();
@@ -222,7 +32,7 @@ IsolateHolder::IsolateHolder() {
base::SysInfo::AmountOfVirtualMemory(),
base::SysInfo::NumberOfProcessors());
isolate_ = v8::Isolate::New(params);
- isolate_data_.reset(new PerIsolateData(isolate_, g_array_buffer_allocator));
+ isolate_data_.reset(new PerIsolateData(isolate_, allocator));
#if defined(OS_WIN)
{
void* code_range;
@@ -258,31 +68,8 @@ IsolateHolder::~IsolateHolder() {
// static
void IsolateHolder::Initialize(ScriptMode mode,
v8::ArrayBuffer::Allocator* allocator) {
- CHECK(allocator);
- static bool v8_is_initialized = false;
- if (v8_is_initialized)
- return;
- v8::V8::InitializePlatform(V8Platform::Get());
- v8::V8::SetArrayBufferAllocator(allocator);
+ gin::V8Initializer::Initialize(mode, allocator);
g_array_buffer_allocator = allocator;
rmcilroy 2015/03/30 17:44:18 nit - add a CHECK(allocator) here (I know it's don
oth 2015/03/31 09:34:47 Done.
- if (mode == gin::IsolateHolder::kStrictMode) {
- static const char use_strict[] = "--use_strict";
- v8::V8::SetFlagsFromString(use_strict, sizeof(use_strict) - 1);
- }
- v8::V8::SetEntropySource(&GenerateEntropy);
-#if defined(V8_USE_EXTERNAL_STARTUP_DATA)
- v8::StartupData natives;
- natives.data = reinterpret_cast<const char*>(g_mapped_natives->data());
- natives.raw_size = static_cast<int>(g_mapped_natives->length());
- v8::V8::SetNativesDataBlob(&natives);
-
- v8::StartupData snapshot;
- snapshot.data = reinterpret_cast<const char*>(g_mapped_snapshot->data());
- snapshot.raw_size = static_cast<int>(g_mapped_snapshot->length());
- v8::V8::SetSnapshotDataBlob(&snapshot);
-#endif // V8_USE_EXTERNAL_STARTUP_DATA
- v8::V8::Initialize();
- v8_is_initialized = true;
}
void IsolateHolder::AddRunMicrotasksObserver() {
« no previous file with comments | « gin/gin.gyp ('k') | gin/public/isolate_holder.h » ('j') | gin/test/file_runner.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698