AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Make d8 default to standard location for external snapshots.

Browse Source 
This makes tests runnable with the external snapshot, and should be the
last step before enabling external snapshot on >=1 bots.

R=yangguo
BUG=

Review URL: https://codereview.chromium.org/780333004

Cr-Commit-Position: refs/heads/master@{#25753}
This commit is contained in:
vogelheim 2014-12-10 08:36:29 -08:00 committed by Commit bot
parent 65006b85b7
commit a0a49f523a
1 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/d8.cc
View File

@ -1554,10 +1554,19 @@ class MockArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
#ifdef V8_USE_EXTERNAL_STARTUP_DATA
class StartupDataHandler {
public:
StartupDataHandler(const char* natives_blob,
StartupDataHandler(const char* exec_path, const char* natives_blob,
const char* snapshot_blob) {
Load(natives_blob, &natives_, v8::V8::SetNativesDataBlob);
Load(snapshot_blob, &snapshot_, v8::V8::SetSnapshotDataBlob);
// If we have (at least one) explicitly given blob, use those.
// If not, use the default blob locations next to the d8 binary.
if (natives_blob || snapshot_blob) {
LoadFromFiles(natives_blob, snapshot_blob);
} else {
char natives[100], snapshot[100];
LoadFromFiles(
RelativePath(natives, exec_path, "natives_blob.bin", sizeof(natives)),
RelativePath(snapshot, exec_path, "snapshot_blob.bin",
sizeof(snapshot)));
}
}
~StartupDataHandler() {
@ -1566,6 +1575,26 @@ class StartupDataHandler {
}
private:
static char* RelativePath(char* buffer, const char* exec_path,
const char* name, int buffer_length) {
DCHECK(exec_path);
const char* last_slash = strrchr(exec_path, '/');
if (last_slash) {
int after_slash = last_slash - exec_path + 1;
DCHECK(buffer_length > after_slash);
strncpy(buffer, exec_path, after_slash);
buffer[after_slash] = '\0';
return strncat(buffer, name, buffer_length);
} else {
return strncpy(buffer, name, buffer_length);
}
}
void LoadFromFiles(const char* natives_blob, const char* snapshot_blob) {
Load(natives_blob, &natives_, v8::V8::SetNativesDataBlob);
Load(snapshot_blob, &snapshot_, v8::V8::SetSnapshotDataBlob);
}
void Load(const char* blob_file,
v8::StartupData* startup_data,
void (*setter_fn)(v8::StartupData*)) {
@ -1624,7 +1653,8 @@ int Shell::Main(int argc, char* argv[]) {
v8::V8::InitializePlatform(platform);
v8::V8::Initialize();
#ifdef V8_USE_EXTERNAL_STARTUP_DATA
StartupDataHandler startup_data(options.natives_blob, options.snapshot_blob);
StartupDataHandler startup_data(argv[0], options.natives_blob,
options.snapshot_blob);
#endif
SetFlagsFromString("--trace-hydrogen-file=hydrogen.cfg");
SetFlagsFromString("--trace-turbo-cfg-file=turbo.cfg");