Reimplemented zone memory tracking to avoid race conditions that were causing crashes in the previo…

runtime/vm/json_stream.cc

 // Copyright (c) 2013, 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 "platform/assert.h"
 
 #include "include/dart_native_api.h"
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
 #include "vm/json_stream.h"
@@ skipping 544 matching lines @@
   reg->PrintJSON(this);
 }
 
 
 void JSONStream::PrintValue(Thread* thread) {
   PrintCommaIfNeeded();
   thread->PrintJSON(this);
 }
 
 
-void JSONStream::PrintValue(Zone* zone) {
-  PrintCommaIfNeeded();
-  zone->PrintJSON(this);
-}
-
-
 void JSONStream::PrintValue(const TimelineEvent* timeline_event) {
   PrintCommaIfNeeded();
   timeline_event->PrintJSON(this);
 }
 
 
 void JSONStream::PrintValue(const TimelineEventBlock* timeline_event_block) {
   PrintCommaIfNeeded();
   timeline_event_block->PrintJSON(this);
 }
@@ skipping 115 matching lines @@
   PrintValue(reg);
 }
 
 
 void JSONStream::PrintProperty(const char* name, Thread* thread) {
   PrintPropertyName(name);
   PrintValue(thread);
 }
 
 
-void JSONStream::PrintProperty(const char* name, Zone* zone) {
-  PrintPropertyName(name);
-  PrintValue(zone);
-}
-
-
 void JSONStream::PrintProperty(const char* name,
                                const TimelineEvent* timeline_event) {
   PrintPropertyName(name);
   PrintValue(timeline_event);
 }
 
 
 void JSONStream::PrintProperty(const char* name,
                                const TimelineEventBlock* timeline_event_block) {
   PrintPropertyName(name);
@@ skipping 309 matching lines @@
   ASSERT(len == len2);
   stream_->buffer_.AddChar('"');
   stream_->AddEscapedUTF8String(p);
   stream_->buffer_.AddChar('"');
   free(p);
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart