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

runtime/vm/thread.h

 // 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.
 
 #ifndef RUNTIME_VM_THREAD_H_
 #define RUNTIME_VM_THREAD_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/atomic.h"
 #include "vm/bitfield.h"
 #include "vm/globals.h"
 #include "vm/handles.h"
 #include "vm/os_thread.h"
 #include "vm/store_buffer.h"
 #include "vm/runtime_entry_list.h"
-
 namespace dart {
 
 class AbstractType;
 class ApiLocalScope;
 class Array;
 class CHA;
 class Class;
 class Code;
 class CompilerStats;
 class Error;
@@ skipping 232 matching lines @@
 
   // Monitor corresponding to this thread.
   Monitor* thread_lock() const { return thread_lock_; }
 
   // The topmost zone used for allocation in this thread.
   Zone* zone() const { return zone_; }
 
   bool ZoneIsOwnedByThread(Zone* zone) const;
 
   void IncrementMemoryUsage(uintptr_t value) {
-    current_thread_memory_ += value;
-    if (current_thread_memory_ > memory_high_watermark_) {
-      memory_high_watermark_ = current_thread_memory_;
+    current_zone_memory_usage_ += value;
+    ASSERT(current_zone_memory_usage_ <= current_zone_capacity_);
+  }
+
+  void DecrementMemoryUsage(uintptr_t value) {
+    ASSERT(current_zone_memory_usage_ >= value);
+    current_zone_memory_usage_ -= value;
+  }
+
+  uintptr_t current_zone_memory_usage() { return current_zone_memory_usage_; }
+
+  void IncrementMemoryCapacity(uintptr_t value) {
+    current_zone_capacity_ += value;
+    if (current_zone_capacity_ > zone_high_watermark_) {
+      zone_high_watermark_ = current_zone_capacity_;
     }
   }
 
-  void DecrementMemoryUsage(uintptr_t value) {
-    ASSERT(current_thread_memory_ >= value);
-    current_thread_memory_ -= value;
+  void DecrementMemoryCapacity(uintptr_t value) {
+    ASSERT(current_zone_capacity_ >= value);
+    current_zone_capacity_ -= value;
+    ASSERT(current_zone_capacity_ >= current_zone_memory_usage_);
   }
 
-  uintptr_t memory_high_watermark() const { return memory_high_watermark_; }
+  uintptr_t current_zone_capacity() { return current_zone_capacity_; }
 
-  void ResetHighWatermark() { memory_high_watermark_ = current_thread_memory_; }
+  uintptr_t zone_high_watermark() const { return zone_high_watermark_; }
+
+  void ResetHighWatermark() { zone_high_watermark_ = current_zone_capacity_; }
 
   // The reusable api local scope for this thread.
   ApiLocalScope* api_reusable_scope() const { return api_reusable_scope_; }
   void set_api_reusable_scope(ApiLocalScope* value) {
     ASSERT(value == NULL || api_reusable_scope_ == NULL);
     api_reusable_scope_ = value;
   }
 
   // The api local scope for this thread, this where all local handles
   // are allocated.
@@ skipping 416 matching lines @@
 #undef DECLARE_MEMBERS
 
 #define DECLARE_MEMBERS(returntype, name, ...) uword name##_entry_point_;
   LEAF_RUNTIME_ENTRY_LIST(DECLARE_MEMBERS)
 #undef DECLARE_MEMBERS
 
   TimelineStream* dart_stream_;
   OSThread* os_thread_;
   Monitor* thread_lock_;
   Zone* zone_;
-  uintptr_t current_thread_memory_;
-  uintptr_t memory_high_watermark_;
+  uintptr_t current_zone_memory_usage_;
+  uintptr_t current_zone_capacity_;
+  uintptr_t zone_high_watermark_;
   ApiLocalScope* api_reusable_scope_;
   ApiLocalScope* api_top_scope_;
   StackResource* top_resource_;
   LongJumpScope* long_jump_base_;
   int32_t no_callback_scope_depth_;
 #if defined(DEBUG)
   HandleScope* top_handle_scope_;
   int32_t no_handle_scope_depth_;
   int32_t no_safepoint_scope_depth_;
 #endif
@@ skipping 64 matching lines @@
 #undef REUSABLE_FRIEND_DECLARATION
 
   friend class ApiZone;
   friend class InterruptChecker;
   friend class Isolate;
   friend class IsolateTestHelper;
   friend class NoOOBMessageScope;
   friend class Simulator;
   friend class StackZone;
   friend class ThreadRegistry;
-
   DISALLOW_COPY_AND_ASSIGN(Thread);
 };
 
 
 #if defined(HOST_OS_WINDOWS)
 // Clears the state of the current thread and frees the allocation.
 void WindowsThreadCleanUp();
 #endif
 
 
 // Disable thread interrupts.
 class DisableThreadInterruptsScope : public StackResource {
  public:
   explicit DisableThreadInterruptsScope(Thread* thread);
   ~DisableThreadInterruptsScope();
 };
 
 }  // namespace dart
 
 #endif  // RUNTIME_VM_THREAD_H_