Changed StackZone and ApiZone to be containers for Zone.

runtime/vm/zone.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_ZONE_H_
 #define VM_ZONE_H_
 
 #include "platform/utils.h"
 #include "vm/allocation.h"
 #include "vm/handles.h"
 #include "vm/memory_region.h"
 
 namespace dart {
 
 // Zones support very fast allocation of small chunks of memory. The
 // chunks cannot be deallocated individually, but instead zones
 // support deallocating all chunks in one fast operation.
 
 class Zone {
- private:
-  Zone();
-  ~Zone();  // Delete all memory associated with the zone.
-
+ public:
   // Allocate an array sized to hold 'len' elements of type
   // 'ElementType'.  Checks for integer overflow when performing the
   // size computation.
   template <class ElementType>
   inline ElementType* Alloc(intptr_t len);
 
   // Allocates an array sized to hold 'len' elements of type
   // 'ElementType'.  The new array is initialized from the memory of
   // 'old_array' up to 'old_len'.
   template <class ElementType>
   inline ElementType* Realloc(ElementType* old_array,
                               intptr_t old_len,
                               intptr_t new_len);
 
   // Allocates 'size' bytes of memory in the zone; expands the zone by
   // allocating new segments of memory on demand using 'new'.
   //
   // It is preferred to use Alloc<T>() instead, as that function can
   // check for integer overflow.  If you use AllocUnsafe, you are
   // responsible for avoiding integer overflow yourself.
   inline uword AllocUnsafe(intptr_t size);
 
+
+  // Make a copy of the string in the zone allocated area.
+  char* MakeCopyOfString(const char* str);
+
+  // Make a zone-allocated string based on printf format and args.
+  char* PrintToString(const char* format, ...) PRINTF_ATTRIBUTE(2, 3);
+
   // Compute the total size of this zone. This includes wasted space that is
   // due to internal fragmentation in the segments.
   intptr_t SizeInBytes() const;
 
-  // Make a copy of the string in the zone allocated area.
-  char* MakeCopyOfString(const char* str);
+  // Structure for managing handles allocation.
+  VMHandles* handles() { return &handles_; }
+
+  void VisitObjectPointers(ObjectPointerVisitor* visitor);
+
+ private:
+  Zone();
+  ~Zone();  // Delete all memory associated with the zone.
 
   // All pointers returned from AllocateUnsafe() and New() have this alignment.
   static const intptr_t kAlignment = kWordSize;
 
   // Default initial chunk size.
   static const intptr_t kInitialChunkSize = 1 * KB;
 
   // Default segment size.
   static const intptr_t kSegmentSize = 64 * KB;
 
   // Zap value used to indicate deleted zone area (debug purposes).
   static const unsigned char kZapDeletedByte = 0x42;
 
   // Zap value used to indicate uninitialized zone area (debug purposes).
   static const unsigned char kZapUninitializedByte = 0xab;
 
   // Expand the zone to accommodate an allocation of 'size' bytes.
   uword AllocateExpand(intptr_t size);
 
   // Allocate a large segment.
   uword AllocateLargeSegment(intptr_t size);
 
+  // Insert zone into zone chain, after current_zone.
+  void Link(Zone* current_zone) {
+    previous_ = current_zone;
+    if (current_zone != NULL) {
+      ASSERT(current_zone->next_ == NULL);
+      current_zone->next_ = this;
+    }
+  }
+
+  // Remove zone from zone chain.
+  void Unlink() {
+    Zone* next = next_;
+    Zone* previous = previous_;
+    if (next != NULL) {
+      next->previous_ = previous;
+    }
+    if (previous != NULL) {
+      previous->next_ = next;
+    }
+  }
+
   // Delete all objects and free all memory allocated in the zone.
   void DeleteAll();
 
 #if defined(DEBUG)
   // Dump the current allocated sizes in the zone object.
   void DumpZoneSizes();
 #endif
 
   // This buffer is used for allocation before any segments.
   // This would act as the initial stack allocated chunk so that we don't
@@ skipping 14 matching lines @@
   class Segment;
 
   // The current head segment; may be NULL.
   Segment* head_;
 
   // List of large segments allocated in this zone; may be NULL.
   Segment* large_segments_;
 
   // Structure for managing handles allocation.
   VMHandles handles_;
-  VMHandles* handles() { return &handles_; }
+
+  // Used for chaining zones in order to allow unwinding of stacks.
+  Zone* previous_;
+  Zone* next_;

[siva, 2012/10/12 20:40:21]

As discussed offline, I wanted to understand the test failure that caused the
need for this to be a doubly linked list.

[Tom Ball, 2012/10/12 22:56:51]

The double-linked list is no longer necessary, now that the exception routines
were updated to survive ApiZone unwinding.

 
   friend class StackZone;
   friend class ApiZone;
   template<typename T, typename B> friend class BaseGrowableArray;
   DISALLOW_COPY_AND_ASSIGN(Zone);
 };
 
 
 class StackZone : public StackResource {
  public:
   // Create an empty zone and set is at the current zone for the Isolate.
   explicit StackZone(BaseIsolate* isolate);
 
   // Delete all memory associated with the zone.
   ~StackZone();
 
-  // Allocates an array sized to hold 'len' elements of type
-  // 'ElementType'.  Checks for integer overflow when performing the
-  // size computation.
-  template <class ElementType>
-  ElementType* Alloc(intptr_t len) { return zone_.Alloc<ElementType>(len); }
-
-  // Allocates an array sized to hold 'len' elements of type
-  // 'ElementType'.  The new array is initialized from the memory of
-  // 'old_array' up to 'old_len'.
-  template <class ElementType>
-  ElementType* Realloc(ElementType* old_array,
-                       intptr_t old_len,
-                       intptr_t new_len) {
-    return zone_.Realloc<ElementType>(old_array, old_len, new_len);
-  }
-
-  // Allocates 'size' bytes of memory in the zone; expands the zone by
-  // allocating new segments of memory on demand using 'new'.
-  //
-  // It is preferred to use Alloc<T>() instead, as that function can
-  // check for integer overflow.  If you use AllocUnsafe, you are
-  // responsible for avoiding integer overflow yourself.
-  uword AllocUnsafe(intptr_t size) { return zone_.AllocUnsafe(size); }
-
   // Compute the total size of this zone. This includes wasted space that is
   // due to internal fragmentation in the segments.
   intptr_t SizeInBytes() const { return zone_.SizeInBytes(); }
 
-  // Make a copy of the string in the zone allocated area.
-  char* MakeCopyOfString(const char* str) {
-    return zone_.MakeCopyOfString(str);
-  }
-
-  // Make a zone-allocated string based on printf format and args.
-  char* PrintToString(const char* format, ...) PRINTF_ATTRIBUTE(2, 3);
-
-  // TODO(tball): remove once zone refactoring is finished.
-  VMHandles* handles() { return zone_.handles(); }
-
-  void VisitObjectPointers(ObjectPointerVisitor* visitor);
+  Zone* GetZone() { return &zone_; }
 
  private:
-  Zone* GetBaseZone() { return &zone_; }
-
   Zone zone_;
 
-  // Used for chaining zones in order to allow unwinding of stacks.
-  StackZone* previous_;
-
   template<typename T> friend class GrowableArray;
   template<typename T> friend class ZoneGrowableArray;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(StackZone);
 };
 
 inline uword Zone::AllocUnsafe(intptr_t size) {
   ASSERT(size >= 0);
 
   // Round up the requested size to fit the alignment.
@@ skipping 37 matching lines @@
             reinterpret_cast<void*>(old_data),
             Utils::Minimum(old_len * sizeof(ElementType),
                            new_len * sizeof(ElementType)));
   }
   return new_data;
 }
 
 }  // namespace dart
 
 #endif  // VM_ZONE_H_