Move symbol table from per isolate snapshot to vm isolate snapshot, this reduces the per isolate in…

runtime/vm/snapshot.h

 // Copyright (c) 2012, 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 VM_SNAPSHOT_H_
 #define VM_SNAPSHOT_H_
 
 #include "platform/assert.h"
 #include "vm/allocation.h"
 #include "vm/bitfield.h"
@@ skipping 221 matching lines @@
     intptr_t value = -header_val;  // Header is negative for VM isolate objects.
     ASSERT(SerializedHeaderTag::decode(value) == kObjectId);
     return SerializedHeaderData::decode(value);
   }
 
  private:
   ReadStream stream_;  // input stream.
 };
 
 
+class BackRefNode : public ValueObject {
+ public:
+  BackRefNode(Object* reference, DeserializeState state)
+      : reference_(reference), state_(state) {}
+  Object* reference() const { return reference_; }
+  bool is_deserialized() const { return state_ == kIsDeserialized; }
+  void set_state(DeserializeState state) { state_ = state; }
+
+  BackRefNode& operator=(const BackRefNode& other) {
+    reference_ = other.reference_;
+    state_ = other.state_;
+    return *this;
+  }
+
+ private:
+  Object* reference_;
+  DeserializeState state_;
+};
+
+
 // Reads a snapshot into objects.
 class SnapshotReader : public BaseReader {
  public:
-  SnapshotReader(const uint8_t* buffer,
-                 intptr_t size,
-                 Snapshot::Kind kind,
-                 Isolate* isolate,
-                 Zone* zone);
-  ~SnapshotReader() { }
-
   Zone* zone() const { return zone_; }
   Isolate* isolate() const { return isolate_; }
   Heap* heap() const { return heap_; }
   ObjectStore* object_store() const { return isolate_->object_store(); }
   ClassTable* class_table() const { return isolate_->class_table(); }
   PassiveObject* PassiveObjectHandle() { return &pobj_; }
   Array* ArrayHandle() { return &array_; }
   String* StringHandle() { return &str_; }
   AbstractType* TypeHandle() { return &type_; }
   TypeArguments* TypeArgumentsHandle() { return &type_arguments_; }
   Array* TokensHandle() { return &tokens_; }
   TokenStream* StreamHandle() { return &stream_; }
   ExternalTypedData* DataHandle() { return &data_; }
+  Snapshot::Kind kind() const { return kind_; }
 
   // Reads an object.
   RawObject* ReadObject();
 
   // Add object to backward references.
   void AddBackRef(intptr_t id, Object* obj, DeserializeState state);
 
   // Get an object from the backward references list.
   Object* GetBackRef(intptr_t id);
 
@@ skipping 41 matching lines @@
   RawGrowableObjectArray* NewGrowableObjectArray();
   RawFloat32x4* NewFloat32x4(float v0, float v1, float v2, float v3);
   RawInt32x4* NewInt32x4(uint32_t v0, uint32_t v1, uint32_t v2, uint32_t v3);
   RawFloat64x2* NewFloat64x2(double v0, double v1);
   RawApiError* NewApiError();
   RawLanguageError* NewLanguageError();
   RawUnhandledException* NewUnhandledException();
   RawObject* NewInteger(int64_t value);
   RawStacktrace* NewStacktrace();
 
- private:
-  class BackRefNode : public ValueObject {
-   public:
-    BackRefNode(Object* reference, DeserializeState state)
-        : reference_(reference), state_(state) {}
-    Object* reference() const { return reference_; }
-    bool is_deserialized() const { return state_ == kIsDeserialized; }
-    void set_state(DeserializeState state) { state_ = state; }
+ protected:
+  SnapshotReader(const uint8_t* buffer,
+                 intptr_t size,
+                 Snapshot::Kind kind,
+                 ZoneGrowableArray<BackRefNode>* backward_references,
+                 Isolate* isolate,
+                 Zone* zone);
+  ~SnapshotReader() { }
 
-    BackRefNode& operator=(const BackRefNode& other) {
-      reference_ = other.reference_;
-      state_ = other.state_;
-      return *this;
-    }
-
-   private:
-    Object* reference_;
-    DeserializeState state_;
-  };
-
+  ZoneGrowableArray<BackRefNode>* GetBackwardReferenceTable() const {
+    return backward_references_;
+  }
+  void ResetBackwardReferenceTable() { backward_references_ = NULL; }
   PageSpace* old_space() const { return old_space_; }
 
+ private:
   // Allocate uninitialized objects, this is used when reading a full snapshot.
   RawObject* AllocateUninitialized(intptr_t class_id, intptr_t size);
 
   RawClass* ReadClassId(intptr_t object_id);
   RawObject* ReadStaticImplicitClosure(intptr_t object_id, intptr_t cls_header);
   RawObject* ReadObjectImpl();
   RawObject* ReadObjectImpl(intptr_t header);
   RawObject* ReadObjectRef();
 
   // Read a VM isolate object that was serialized as an Id.
   RawObject* ReadVMIsolateObject(intptr_t object_id);
 
   // Read an object that was serialized as an Id (singleton in object store,
   // or an object that was already serialized before).
   RawObject* ReadIndexedObject(intptr_t object_id);
 
   // Read an inlined object from the stream.
   RawObject* ReadInlinedObject(intptr_t object_id);
 
   // Decode class id from the header field.
   intptr_t LookupInternalClass(intptr_t class_header);
 
   void ArrayReadFrom(const Array& result, intptr_t len, intptr_t tags);
 
   intptr_t NextAvailableObjectId() const;
 
   void SetReadException(const char* msg);
 
+  RawObject* VmIsolateSnapshotObject(intptr_t index) const;
+
   Snapshot::Kind kind_;  // Indicates type of snapshot(full, script, message).
   Isolate* isolate_;  // Current isolate.
   Zone* zone_;  // Zone for allocations while reading snapshot.
   Heap* heap_;  // Heap of the current isolate.
   PageSpace* old_space_;  // Old space of the current isolate.
   Class& cls_;  // Temporary Class handle.
   Object& obj_;  // Temporary Object handle.
   PassiveObject& pobj_;  // Temporary PassiveObject handle.
   Array& array_;  // Temporary Array handle.
   Field& field_;  // Temporary Field handle.
   String& str_;  // Temporary String handle.
   Library& library_;  // Temporary library handle.
   AbstractType& type_;  // Temporary type handle.
   TypeArguments& type_arguments_;  // Temporary type argument handle.
   Array& tokens_;  // Temporary tokens handle.
   TokenStream& stream_;  // Temporary token stream handle.
   ExternalTypedData& data_;  // Temporary stream data handle.
   UnhandledException& error_;  // Error handle.
-  GrowableArray<BackRefNode> backward_references_;
+  intptr_t max_vm_isolate_object_id_;
+  ZoneGrowableArray<BackRefNode>* backward_references_;
 
   friend class ApiError;
   friend class Array;
   friend class BoundedType;
   friend class MixinAppType;
   friend class Class;
   friend class Context;
   friend class ContextScope;
   friend class Field;
   friend class ClosureData;
@@ skipping 18 matching lines @@
   friend class TypeParameter;
   friend class TypeRef;
   friend class UnresolvedClass;
   friend class UnhandledException;
   friend class WeakProperty;
   friend class MirrorReference;
   DISALLOW_COPY_AND_ASSIGN(SnapshotReader);
 };
 
 
+class VmIsolateSnapshotReader : public SnapshotReader {
+ public:
+  VmIsolateSnapshotReader(const uint8_t* buffer, intptr_t size, Zone* zone);
+  ~VmIsolateSnapshotReader();
+
+  RawApiError* ReadVmIsolateSnapshot();
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(VmIsolateSnapshotReader);
+};
+
+
+class IsolateSnapshotReader : public SnapshotReader {
+ public:
+  IsolateSnapshotReader(const uint8_t* buffer,
+                        intptr_t size,
+                        Isolate* isolate,
+                        Zone* zone);
+  ~IsolateSnapshotReader();
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(IsolateSnapshotReader);
+};
+
+
+class ScriptSnapshotReader : public SnapshotReader {
+ public:
+  ScriptSnapshotReader(const uint8_t* buffer,
+                       intptr_t size,
+                       Isolate* isolate,
+                       Zone* zone);
+  ~ScriptSnapshotReader();
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ScriptSnapshotReader);
+};
+
+
+class MessageSnapshotReader : public SnapshotReader {
+ public:
+  MessageSnapshotReader(const uint8_t* buffer,
+                        intptr_t size,
+                        Isolate* isolate,
+                        Zone* zone);
+  ~MessageSnapshotReader();
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(MessageSnapshotReader);
+};
+
+
 class BaseWriter : public StackResource {
  public:
   // Size of the snapshot.
   intptr_t BytesWritten() const { 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);
@@ skipping 115 matching lines @@
   void UnmarkAll() const;
 
  private:
   intptr_t first_object_id() const { return first_object_id_; }
   intptr_t next_object_id() const { return nodes_.length() + first_object_id_; }
 
   const intptr_t first_object_id_;
   GrowableArray<Node*> nodes_;
   intptr_t first_unprocessed_object_id_;
 
+  friend class FullSnapshotWriter;
   DISALLOW_COPY_AND_ASSIGN(ForwardList);
 };
 
 
 class SnapshotWriter : public BaseWriter {
  protected:
   SnapshotWriter(Snapshot::Kind kind,
                  uint8_t** buffer,
                  ReAlloc alloc,
                  intptr_t initial_size,
+                 ForwardList* forward_list,
                  bool can_send_any_object);
 
  public:
   // Snapshot kind.
   Snapshot::Kind kind() const { return kind_; }
 
   // Serialize an object into the buffer.
   void WriteObject(RawObject* raw);
 
   uword GetObjectTags(RawObject* raw);
 
   Exceptions::ExceptionType exception_type() const {
     return exception_type_;
   }
   void set_exception_type(Exceptions::ExceptionType type) {
     exception_type_ = type;
   }
   const char* exception_msg() const { return exception_msg_; }
   void set_exception_msg(const char* msg) {
     exception_msg_ = msg;
   }
   bool can_send_any_object() const { return can_send_any_object_; }
   void ThrowException(Exceptions::ExceptionType type, const char* msg);
 
   // Write a version string for the snapshot.
   void WriteVersion();
 
+  static intptr_t FirstObjectId();
+
  protected:
   void UnmarkAll() {
-    if (!unmarked_objects_) {
-      forward_list_.UnmarkAll();
+    if (!unmarked_objects_ && forward_list_ != NULL) {
+      forward_list_->UnmarkAll();
       unmarked_objects_ = true;
     }
   }
 
   bool CheckAndWritePredefinedObject(RawObject* raw);
   void HandleVMIsolateObject(RawObject* raw);
 
   void WriteObjectRef(RawObject* raw);
   void WriteClassId(RawClass* cls);
   void WriteStaticImplicitClosure(intptr_t object_id,
@@ skipping 11 matching lines @@
   RawFunction* IsSerializableClosure(RawClass* cls, RawObject* obj);
   RawClass* GetFunctionOwner(RawFunction* func);
   void CheckForNativeFields(RawClass* cls);
   void SetWriteException(Exceptions::ExceptionType type, const char* msg);
   void WriteInstance(intptr_t object_id,
                      RawObject* raw,
                      RawClass* cls,
                      intptr_t tags);
   void WriteInstanceRef(RawObject* raw, RawClass* cls);
   bool AllowObjectsInDartLibrary(RawLibrary* library);
+  intptr_t FindVmSnapshotObject(RawObject* rawobj);
+
+  void InitializeForwardList(ForwardList* forward_list) {
+    ASSERT(forward_list_ == NULL);
+    forward_list_ = forward_list;
+  }
+  void ResetForwardList() {
+    ASSERT(forward_list_ != NULL);
+    forward_list_ = NULL;
+  }
 
   Isolate* isolate() const { return isolate_; }
   ObjectStore* object_store() const { return object_store_; }
 
  private:
   Snapshot::Kind kind_;
   Isolate* isolate_;
   ObjectStore* object_store_;  // Object store for common classes.
   ClassTable* class_table_;  // Class table for the class index to class lookup.
-  ForwardList forward_list_;
+  ForwardList* forward_list_;
   Exceptions::ExceptionType exception_type_;  // Exception type.
   const char* exception_msg_;  // Message associated with exception.
   bool unmarked_objects_;  // True if marked objects have been unmarked.
   bool can_send_any_object_;  // True if any Dart instance can be sent.
 
+  friend class FullSnapshotWriter;
   friend class RawArray;
   friend class RawClass;
   friend class RawClosureData;
   friend class RawGrowableObjectArray;
   friend class RawLinkedHashMap;
   friend class RawImmutableArray;
   friend class RawJSRegExp;
   friend class RawLibrary;
   friend class RawLiteralToken;
   friend class RawMirrorReference;
   friend class RawReceivePort;
   friend class RawScript;
   friend class RawStacktrace;
   friend class RawTokenStream;
   friend class RawTypeArguments;
   friend class RawUserTag;
   friend class SnapshotWriterVisitor;
   friend class WriteInlinedObjectVisitor;
   DISALLOW_COPY_AND_ASSIGN(SnapshotWriter);
 };
 
 
-class FullSnapshotWriter : public SnapshotWriter {
+class FullSnapshotWriter {
  public:
   static const intptr_t kInitialSize = 64 * KB;
   FullSnapshotWriter(uint8_t** vm_isolate_snapshot_buffer,
                      uint8_t** isolate_snapshot_buffer,
-                     ReAlloc alloc)
-      : SnapshotWriter(Snapshot::kFull,
-                       isolate_snapshot_buffer,
-                       alloc,
-                       kInitialSize,
-                       true) {
-    ASSERT(vm_isolate_snapshot_buffer != NULL);
-    ASSERT(isolate_snapshot_buffer != NULL);
-    ASSERT(alloc != NULL);
+                     ReAlloc alloc);
+  ~FullSnapshotWriter() { }
+
+  uint8_t** vm_isolate_snapshot_buffer() {
+    return vm_isolate_snapshot_buffer_;
   }
-  ~FullSnapshotWriter() { }
+
+  uint8_t** isolate_snapshot_buffer() {
+    return isolate_snapshot_buffer_;
+  }
 
   // Writes a full snapshot of the Isolate.
   void WriteFullSnapshot();
 
-  intptr_t VmIsolateSnapshotSize() const { return 0; }
-  intptr_t IsolateSnapshotSize() const { return BytesWritten(); }
+  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.
+  void WriteVmIsolateSnapshot();
+
+  // Writes a full snapshot of a regular Dart Isolate.
+  void WriteIsolateFullSnapshot();
+
+  uint8_t** vm_isolate_snapshot_buffer_;
+  uint8_t** isolate_snapshot_buffer_;
+  ReAlloc alloc_;
+  intptr_t vm_isolate_snapshot_size_;
+  intptr_t isolate_snapshot_size_;
+  ForwardList forward_list_;
+
   DISALLOW_COPY_AND_ASSIGN(FullSnapshotWriter);
 };
 
 
 class ScriptSnapshotWriter : public SnapshotWriter {
  public:
   static const intptr_t kInitialSize = 64 * KB;
-  ScriptSnapshotWriter(uint8_t** buffer, ReAlloc alloc)
-      : SnapshotWriter(Snapshot::kScript, buffer, alloc, kInitialSize, true) {
-    ASSERT(buffer != NULL);
-    ASSERT(alloc != NULL);
-  }
+  ScriptSnapshotWriter(uint8_t** buffer, ReAlloc alloc);
   ~ScriptSnapshotWriter() { }
 
   // Writes a partial snapshot of the script.
   void WriteScriptSnapshot(const Library& lib);
 
  private:
+  ForwardList forward_list_;
+
   DISALLOW_COPY_AND_ASSIGN(ScriptSnapshotWriter);
 };
 
 
 class MessageWriter : public SnapshotWriter {
  public:
   static const intptr_t kInitialSize = 512;
-  MessageWriter(uint8_t** buffer, ReAlloc alloc, bool can_send_any_object)
-      : SnapshotWriter(Snapshot::kMessage,
-                       buffer,
-                       alloc,
-                       kInitialSize,
-                       can_send_any_object) {
-    ASSERT(buffer != NULL);
-    ASSERT(alloc != NULL);
-  }
+  MessageWriter(uint8_t** buffer, ReAlloc alloc, bool can_send_any_object);
   ~MessageWriter() { }
 
   void WriteMessage(const Object& obj);
 
  private:
+  ForwardList forward_list_;
+
   DISALLOW_COPY_AND_ASSIGN(MessageWriter);
 };
 
 
 // An object pointer visitor implementation which writes out
 // objects to a snap shot.
 class SnapshotWriterVisitor : public ObjectPointerVisitor {
  public:
   explicit SnapshotWriterVisitor(SnapshotWriter* writer)
       : ObjectPointerVisitor(Isolate::Current()),
@@ skipping 10 matching lines @@
  private:
   SnapshotWriter* writer_;
   bool as_references_;
 
   DISALLOW_COPY_AND_ASSIGN(SnapshotWriterVisitor);
 };
 
 }  // namespace dart
 
 #endif  // VM_SNAPSHOT_H_