Fixed bad calculations for determining total allocated size of a zone.

runtime/vm/zone.cc

 // 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.
 
 #include "vm/zone.h"
 
 #include "platform/assert.h"
 #include "platform/utils.h"
 #include "vm/flags.h"
 #include "vm/handles_impl.h"
@@ skipping 118 matching lines @@
     return size + (position_ - initial_buffer_.start());
   }
   size += initial_buffer_.size();
   for (Segment* s = head_->next(); s != NULL; s = s->next()) {
     size += s->size();
   }
   return size + (position_ - head_->start());
 }
 
 
+intptr_t Zone::CapacityInBytes() const {
+  intptr_t size = 0;
+  for (Segment* s = large_segments_; s != NULL; s = s->next()) {
+    size += s->size();
+  }
+  if (head_ == NULL) {
+    return size + initial_buffer_.size();
+  }
+  size += initial_buffer_.size();
+  for (Segment* s = head_; s != NULL; s = s->next()) {
+    size += s->size();
+  }
+  return size;
+}
+
+
 uword Zone::AllocateExpand(intptr_t size) {
   ASSERT(size >= 0);
   if (FLAG_trace_zones) {
     OS::PrintErr("*** Expanding zone 0x%" Px "\n",
                  reinterpret_cast<intptr_t>(this));
     DumpZoneSizes();
   }
   // Make sure the requested size is already properly aligned and that
   // there isn't enough room in the Zone to satisfy the request.
   ASSERT(Utils::IsAligned(size, kAlignment));
@@ skipping 107 matching lines @@
 
 
 char* Zone::VPrint(const char* format, va_list args) {
   return OS::VSCreate(this, format, args);
 }
 
 
 #ifndef PRODUCT
 void Zone::PrintJSON(JSONStream* stream) const {
   JSONObject jsobj(stream);
-  intptr_t capacity = SizeInBytes();
-  intptr_t used_size = UsedSizeInBytes();
+  intptr_t capacity = CapacityInBytes();
+  intptr_t used_size = SizeInBytes();
   jsobj.AddProperty("type", "_Zone");
   jsobj.AddProperty("capacity", capacity);
   jsobj.AddProperty("used", used_size);
 }
 #endif
 
 
 StackZone::StackZone(Thread* thread) : StackResource(thread), zone_() {
   if (FLAG_trace_zones) {
     OS::PrintErr("*** Starting a new Stack zone 0x%" Px "(0x%" Px ")\n",
                  reinterpret_cast<intptr_t>(this),
                  reinterpret_cast<intptr_t>(&zone_));
   }
   zone_.Link(thread->zone());
   thread->set_zone(&zone_);
 }
 
 
 StackZone::~StackZone() {
   ASSERT(thread()->zone() == &zone_);
   thread()->set_zone(zone_.previous_);
   if (FLAG_trace_zones) {
     OS::PrintErr("*** Deleting Stack zone 0x%" Px "(0x%" Px ")\n",
                  reinterpret_cast<intptr_t>(this),
                  reinterpret_cast<intptr_t>(&zone_));
   }
 }
 
 }  // namespace dart