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

Side by Side Diff: src/snapshot-common.cc

Issue 582953002: Revert "Require V8 to be explicitly initialized before an Isolate is created" (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 3 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/snapshot.h ('k') | src/snapshot-external.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2006-2008 the V8 project authors. All rights reserved. 1 // Copyright 2006-2008 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // The common functionality when building with or without snapshots. 5 // The common functionality when building with or without snapshots.
6 6
7 #include "src/v8.h" 7 #include "src/v8.h"
8 8
9 #include "src/api.h" 9 #include "src/api.h"
10 #include "src/base/platform/platform.h" 10 #include "src/base/platform/platform.h"
11 #include "src/serialize.h" 11 #include "src/serialize.h"
12 #include "src/snapshot.h" 12 #include "src/snapshot.h"
13 13
14 namespace v8 { 14 namespace v8 {
15 namespace internal { 15 namespace internal {
16 16
17 void Snapshot::ReserveSpaceForLinkedInSnapshot(Deserializer* deserializer) { 17 void Snapshot::ReserveSpaceForLinkedInSnapshot(Deserializer* deserializer) {
18 deserializer->set_reservation(NEW_SPACE, new_space_used_); 18 deserializer->set_reservation(NEW_SPACE, new_space_used_);
19 deserializer->set_reservation(OLD_POINTER_SPACE, pointer_space_used_); 19 deserializer->set_reservation(OLD_POINTER_SPACE, pointer_space_used_);
20 deserializer->set_reservation(OLD_DATA_SPACE, data_space_used_); 20 deserializer->set_reservation(OLD_DATA_SPACE, data_space_used_);
21 deserializer->set_reservation(CODE_SPACE, code_space_used_); 21 deserializer->set_reservation(CODE_SPACE, code_space_used_);
22 deserializer->set_reservation(MAP_SPACE, map_space_used_); 22 deserializer->set_reservation(MAP_SPACE, map_space_used_);
23 deserializer->set_reservation(CELL_SPACE, cell_space_used_); 23 deserializer->set_reservation(CELL_SPACE, cell_space_used_);
24 deserializer->set_reservation(PROPERTY_CELL_SPACE, 24 deserializer->set_reservation(PROPERTY_CELL_SPACE,
25 property_cell_space_used_); 25 property_cell_space_used_);
26 } 26 }
27 27
28 28
29 bool Snapshot::Initialize(Isolate* isolate) { 29 bool Snapshot::Initialize() {
30 if (size_ > 0) { 30 if (size_ > 0) {
31 base::ElapsedTimer timer; 31 base::ElapsedTimer timer;
32 if (FLAG_profile_deserialization) { 32 if (FLAG_profile_deserialization) {
33 timer.Start(); 33 timer.Start();
34 } 34 }
35 SnapshotByteSource source(raw_data_, raw_size_); 35 SnapshotByteSource source(raw_data_, raw_size_);
36 Deserializer deserializer(&source); 36 Deserializer deserializer(&source);
37 ReserveSpaceForLinkedInSnapshot(&deserializer); 37 ReserveSpaceForLinkedInSnapshot(&deserializer);
38 bool success = isolate->Init(&deserializer); 38 bool success = V8::Initialize(&deserializer);
39 if (FLAG_profile_deserialization) { 39 if (FLAG_profile_deserialization) {
40 double ms = timer.Elapsed().InMillisecondsF(); 40 double ms = timer.Elapsed().InMillisecondsF();
41 PrintF("[Snapshot loading and deserialization took %0.3f ms]\n", ms); 41 PrintF("[Snapshot loading and deserialization took %0.3f ms]\n", ms);
42 } 42 }
43 return success; 43 return success;
44 } 44 }
45 return false; 45 return false;
46 } 46 }
47 47
48 48
(...skipping 28 matching lines...) Expand all
77 // Dummy implementations of Set*FromFile(..) APIs. 77 // Dummy implementations of Set*FromFile(..) APIs.
78 // 78 //
79 // These are meant for use with snapshot-external.cc. Should this file 79 // These are meant for use with snapshot-external.cc. Should this file
80 // be compiled with those options we just supply these dummy implementations 80 // be compiled with those options we just supply these dummy implementations
81 // below. This happens when compiling the mksnapshot utility. 81 // below. This happens when compiling the mksnapshot utility.
82 void SetNativesFromFile(StartupData* data) { CHECK(false); } 82 void SetNativesFromFile(StartupData* data) { CHECK(false); }
83 void SetSnapshotFromFile(StartupData* data) { CHECK(false); } 83 void SetSnapshotFromFile(StartupData* data) { CHECK(false); }
84 #endif // V8_USE_EXTERNAL_STARTUP_DATA 84 #endif // V8_USE_EXTERNAL_STARTUP_DATA
85 85
86 } } // namespace v8::internal 86 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/snapshot.h ('k') | src/snapshot-external.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698