Refactor snapshots pieces to include a section for loading instructions into the heap of a regular …

runtime/vm/clustered_snapshot.h

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef RUNTIME_VM_CLUSTERED_SNAPSHOT_H_
 #define RUNTIME_VM_CLUSTERED_SNAPSHOT_H_
 
 #include "platform/assert.h"
 #include "vm/allocation.h"
 #include "vm/bitfield.h"
@@ skipping 105 matching lines @@
  public:
   Serializer(Thread* thread,
              Snapshot::Kind kind,
              uint8_t** buffer,
              ReAlloc alloc,
              intptr_t initial_size,
              InstructionsWriter* instructions_writer_);
   ~Serializer();
 
   intptr_t WriteVMSnapshot(const Array& symbols, const Array& scripts);
-  void WriteFullSnapshot(intptr_t num_base_objects, ObjectStore* object_store);
+  void WriteIsolateSnapshot(intptr_t num_base_objects,
+                            ObjectStore* object_store);
 
   void AddVMIsolateBaseObjects();
 
   void AddBaseObject(RawObject* base_object) {
     AssignRef(base_object);
     num_base_objects_++;
   }
 
   void AssignRef(RawObject* object) {
     ASSERT(next_ref_index_ != 0);
@@ skipping 62 matching lines @@
 
   void FillHeader(Snapshot::Kind kind) {
     int64_t* data = reinterpret_cast<int64_t*>(stream_.buffer());
     data[Snapshot::kLengthIndex] = stream_.bytes_written();
     data[Snapshot::kSnapshotFlagIndex] = kind;
   }
 
   void WriteVersionAndFeatures();
 
   void Serialize();
+  WriteStream* stream() { return &stream_; }
   intptr_t bytes_written() { return stream_.bytes_written(); }
 
   // Writes raw data to the stream (basic type).
   // sizeof(T) must be in {1,2,4,8}.
   template <typename T>
   void Write(T value) {
     WriteStream::Raw<sizeof(T), T>::Write(&stream_, value);
   }
 
   void WriteBytes(const uint8_t* addr, intptr_t len) {
@@ skipping 68 matching lines @@
 class Deserializer : public StackResource {
  public:
   Deserializer(Thread* thread,
                Snapshot::Kind kind,
                const uint8_t* buffer,
                intptr_t size,
                const uint8_t* instructions_buffer,
                const uint8_t* data_buffer);
   ~Deserializer();
 
-  void ReadFullSnapshot(ObjectStore* object_store);
+  void ReadIsolateSnapshot(ObjectStore* object_store);
   void ReadVMSnapshot();
 
   void AddVMIsolateBaseObjects();
 
   static void InitializeHeader(RawObject* raw,
                                intptr_t cid,
                                intptr_t size,
                                bool is_vm_isolate,
                                bool is_canonical = false);
 
@@ skipping 35 matching lines @@
 
   TokenPosition ReadTokenPosition() {
     return TokenPosition::SnapshotDecode(Read<int32_t>());
   }
 
   intptr_t ReadCid() {
     COMPILE_ASSERT(RawObject::kClassIdTagSize <= 32);
     return Read<int32_t>();
   }
 
-  uword GetInstructionsAt(int32_t offset) {
+  RawInstructions* GetInstructionsAt(int32_t offset) {
     return instructions_reader_->GetInstructionsAt(offset);
   }
 
   RawObject* GetObjectAt(int32_t offset) {
     return instructions_reader_->GetObjectAt(offset);
   }
 
   RawApiError* VerifyVersionAndFeatures();
 
   void Prepare();
@@ skipping 16 matching lines @@
   RawArray* refs_;
   intptr_t next_ref_index_;
   DeserializationCluster** clusters_;
 };
 
 
 class FullSnapshotWriter {
  public:
   static const intptr_t kInitialSize = 64 * KB;
   FullSnapshotWriter(Snapshot::Kind kind,
-                     uint8_t** vm_isolate_snapshot_buffer,
-                     uint8_t** isolate_snapshot_buffer,
+                     uint8_t** vm_snapshot_data_buffer,
+                     uint8_t** isolate_snapshot_data_buffer,
                      ReAlloc alloc,
-                     InstructionsWriter* instructions_writer);
+                     InstructionsWriter* vm_instructions_writer,
+                     InstructionsWriter* iso_instructions_writer);
   ~FullSnapshotWriter();
 
-  uint8_t** vm_isolate_snapshot_buffer() const {
-    return vm_isolate_snapshot_buffer_;
+  uint8_t** vm_snapshot_data_buffer() const { return vm_snapshot_data_buffer_; }
+
+  uint8_t** isolate_snapshot_data_buffer() const {
+    return isolate_snapshot_data_buffer_;
   }
 
-  uint8_t** isolate_snapshot_buffer() const { return isolate_snapshot_buffer_; }
-
   Thread* thread() const { return thread_; }
   Zone* zone() const { return thread_->zone(); }
   Isolate* isolate() const { return thread_->isolate(); }
   Heap* heap() const { return isolate()->heap(); }
 
   // Writes a full snapshot of the Isolate.
   void WriteFullSnapshot();
 
   intptr_t VmIsolateSnapshotSize() const { return vm_isolate_snapshot_size_; }
   intptr_t IsolateSnapshotSize() const { return isolate_snapshot_size_; }
 
  private:
   // Writes a snapshot of the VM Isolate.
-  intptr_t WriteVmIsolateSnapshot();
+  intptr_t WriteVMSnapshot();
 
   // Writes a full snapshot of a regular Dart Isolate.
-  void WriteIsolateFullSnapshot(intptr_t num_base_objects);
+  void WriteIsolateSnapshot(intptr_t num_base_objects);
 
   Thread* thread_;
   Snapshot::Kind kind_;
-  uint8_t** vm_isolate_snapshot_buffer_;
-  uint8_t** isolate_snapshot_buffer_;
+  uint8_t** vm_snapshot_data_buffer_;
+  uint8_t** isolate_snapshot_data_buffer_;
   ReAlloc alloc_;
   intptr_t vm_isolate_snapshot_size_;
   intptr_t isolate_snapshot_size_;
   ForwardList* forward_list_;
-  InstructionsWriter* instructions_writer_;
+  InstructionsWriter* vm_instructions_writer_;
+  InstructionsWriter* isolate_instructions_writer_;
   Array& token_streams_;
   Array& saved_symbol_table_;
   Array& new_vm_symbol_table_;
 
+  // Stats for benchmarking.
+  intptr_t clustered_vm_size_;
+  intptr_t clustered_isolate_size_;
+  intptr_t mapped_data_size_;
+  intptr_t mapped_instructions_size_;
+
   DISALLOW_COPY_AND_ASSIGN(FullSnapshotWriter);
 };
 
 
-class VmIsolateSnapshotReader {
+class FullSnapshotReader {
  public:
-  VmIsolateSnapshotReader(Snapshot::Kind kind,
-                          const uint8_t* buffer,
-                          intptr_t size,
-                          const uint8_t* instructions_buffer,
-                          const uint8_t* data_buffer,
-                          Thread* thread)
-      : kind_(kind),
-        thread_(thread),
-        buffer_(buffer),
-        size_(size),
-        instructions_buffer_(instructions_buffer),
-        data_buffer_(data_buffer) {
-    thread->isolate()->set_compilation_allowed(kind != Snapshot::kAppAOT);
-  }
+  FullSnapshotReader(const Snapshot* snapshot,
+                     const uint8_t* instructions_buffer,
+                     Thread* thread);
+  ~FullSnapshotReader() {}
 
-  ~VmIsolateSnapshotReader() {}
-
-  RawApiError* ReadVmIsolateSnapshot();
+  RawApiError* ReadVMSnapshot();
+  RawApiError* ReadIsolateSnapshot();
 
  private:
   Snapshot::Kind kind_;
-  Thread* thread_;
-  const uint8_t* buffer_;
-  intptr_t size_;
-  const uint8_t* instructions_buffer_;
-  const uint8_t* data_buffer_;
-
-  DISALLOW_COPY_AND_ASSIGN(VmIsolateSnapshotReader);
-};
-
-
-class IsolateSnapshotReader {
- public:
-  IsolateSnapshotReader(Snapshot::Kind kind,
-                        const uint8_t* buffer,
-                        intptr_t size,
-                        const uint8_t* instructions_buffer,
-                        const uint8_t* data_buffer,
-                        Thread* thread)
-      : kind_(kind),
-        thread_(thread),
-        buffer_(buffer),
-        size_(size),
-        instructions_buffer_(instructions_buffer),
-        data_buffer_(data_buffer) {
-    thread->isolate()->set_compilation_allowed(kind != Snapshot::kAppAOT);
-  }
-
-  ~IsolateSnapshotReader() {}
-
-  RawApiError* ReadFullSnapshot();
-
- private:
-  Snapshot::Kind kind_;
   Thread* thread_;
   const uint8_t* buffer_;
   intptr_t size_;
   const uint8_t* instructions_buffer_;
   const uint8_t* data_buffer_;
 
-  DISALLOW_COPY_AND_ASSIGN(IsolateSnapshotReader);
+  DISALLOW_COPY_AND_ASSIGN(FullSnapshotReader);
 };
 
 }  // namespace dart
 
 #endif  // RUNTIME_VM_CLUSTERED_SNAPSHOT_H_