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

runtime/vm/thread.cc

 // Copyright (c) 2015, 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/thread.h"
 
 #include "vm/compiler_stats.h"
 #include "vm/dart_api_state.h"
 #include "vm/growable_array.h"
 #include "vm/isolate.h"
@@ skipping 31 matching lines @@
   ASSERT(api_top_scope() == NULL);
   // Delete the resusable api scope if there is one.
   if (api_reusable_scope_) {
     delete api_reusable_scope_;
     api_reusable_scope_ = NULL;
   }
   delete thread_lock_;
   thread_lock_ = NULL;
 }
 
-
 #if defined(DEBUG)
 #define REUSABLE_HANDLE_SCOPE_INIT(object)                                     \
   reusable_##object##_handle_scope_active_(false),
 #else
 #define REUSABLE_HANDLE_SCOPE_INIT(object)
 #endif  // defined(DEBUG)
 
 #define REUSABLE_HANDLE_INITIALIZERS(object) object##_handle_(NULL),
 
 
 Thread::Thread(Isolate* isolate)
     : BaseThread(false),
       stack_limit_(0),
       stack_overflow_flags_(0),
       isolate_(NULL),
       heap_(NULL),
       top_exit_frame_info_(0),
       store_buffer_block_(NULL),
       vm_tag_(0),
       task_kind_(kUnknownTask),
       async_stack_trace_(StackTrace::null()),
       dart_stream_(NULL),
       os_thread_(NULL),
       thread_lock_(new Monitor()),
       zone_(NULL),
-      current_thread_memory_(0),
-      memory_high_watermark_(0),
+      current_zone_memory_usage_(0),
+      current_zone_capacity_(0),
+      zone_high_watermark_(0),
       api_reusable_scope_(NULL),
       api_top_scope_(NULL),
       top_resource_(NULL),
       long_jump_base_(NULL),
       no_callback_scope_depth_(0),
 #if defined(DEBUG)
       top_handle_scope_(NULL),
       no_handle_scope_depth_(0),
       no_safepoint_scope_depth_(0),
 #endif
@@ skipping 40 matching lines @@
 
   if (FLAG_support_compiler_stats) {
     compiler_stats_ = new CompilerStats(isolate);
     if (FLAG_compiler_benchmark) {
       compiler_stats_->EnableBenchmark();
     }
   }
   // This thread should not yet own any zones. If it does, we need to make sure
   // we've accounted for any memory it has already allocated.
   if (zone_ == NULL) {
-    ASSERT(current_thread_memory_ == 0);
+    ASSERT(current_zone_capacity_ == 0);
   } else {
     Zone* current = zone_;
     uintptr_t total_zone_capacity = 0;
     while (current != NULL) {
-      total_zone_capacity += static_cast<uintptr_t>(current->CapacityInBytes());
+      total_zone_capacity += current->CapacityInBytes();
       current = current->previous();
     }
-    ASSERT(current_thread_memory_ == total_zone_capacity);
+    ASSERT(current_zone_capacity_ == total_zone_capacity);
   }
 }
 
 
 static const struct ALIGN16 {
   uint64_t a;
   uint64_t b;
 } double_negate_constant = {0x8000000000000000LL, 0x8000000000000000LL};
 
 static const struct ALIGN16 {
@@ skipping 63 matching lines @@
 
 
 #ifndef PRODUCT
 // Collect information about each individual zone associated with this thread.
 void Thread::PrintJSON(JSONStream* stream) const {
   JSONObject jsobj(stream);
   jsobj.AddProperty("type", "_Thread");
   jsobj.AddPropertyF("id", "threads/%" Pd "",
                      OSThread::ThreadIdToIntPtr(os_thread()->trace_id()));
   jsobj.AddProperty("kind", TaskKindToCString(task_kind()));
-  jsobj.AddPropertyF("_memoryHighWatermark", "%" Pu "", memory_high_watermark_);
+  jsobj.AddPropertyF("_zoneHighWatermark", "%" Pu "", zone_high_watermark_);
+  jsobj.AddPropertyF("_zoneCapacity", "%" Pu "", current_zone_capacity_);
+  jsobj.AddPropertyF("_zoneUsage", "%" Pu "", current_zone_memory_usage_);
 }
 #endif
 
 
 RawGrowableObjectArray* Thread::pending_functions() {
   if (pending_functions_ == GrowableObjectArray::null()) {
     pending_functions_ = GrowableObjectArray::New(Heap::kOld);
   }
   return pending_functions_;
 }
@@ skipping 664 matching lines @@
 
 DisableThreadInterruptsScope::~DisableThreadInterruptsScope() {
   if (thread() != NULL) {
     OSThread* os_thread = thread()->os_thread();
     ASSERT(os_thread != NULL);
     os_thread->EnableThreadInterrupts();
   }
 }
 
 }  // namespace dart