commit 92b3b5623ec8b65f3e099c076e247bb8273692f8
author Elliott Hughes <enh@google.com> Thu Sep 08 16:32:26 2011 -0700
committer Elliott Hughes <enh@google.com> Thu Sep 08 18:11:55 2011 -0700
tree 94f85f0a8d33884b41227a1a560a755deccfffa2
parent 15041f433341f111665943ecfb9ca88c77d5c19a

Add locking to the heap.

Now tsan is happy with us too, at least on the host.

Change-Id: Ib4657f56be2014de832dff8886b63843a40ea788

src/heap.h

diff --git a/src/heap.h b/src/heap.h
index 3dc612a..296266a 100644
--- a/src/heap.h
+++ b/src/heap.h
@@ -67,9 +67,9 @@
   // Blocks the caller until the garbage collector becomes idle.
   static void WaitForConcurrentGcToComplete();
 
-  static Mutex* GetLock() {
-    return lock_;
-  }
+  static void Lock();
+
+  static void Unlock();
 
   static const std::vector<Space*>& GetSpaces() {
     return spaces_;
@@ -134,20 +134,25 @@
     verify_object_disabled_ = true;
   }
 
-  static void RecordFree(Space* space, const Object* object);
+  // Callers must hold the heap lock.
+  static void RecordFreeLocked(Space* space, const Object* object);
 
  private:
   // Allocates uninitialized storage.
-  static Object* Allocate(size_t num_bytes);
-  static Object* Allocate(Space* space, size_t num_bytes);
+  static Object* AllocateLocked(size_t num_bytes);
+  static Object* AllocateLocked(Space* space, size_t num_bytes);
 
-  static void RecordAllocation(Space* space, const Object* object);
+  static void RecordAllocationLocked(Space* space, const Object* object);
   static void RecordImageAllocations(Space* space);
 
   static void CollectGarbageInternal();
 
   static void GrowForUtilization();
 
+  static void VerifyObjectLocked(const Object *obj);
+
+  static void VerificationCallback(Object* obj, void *arg);
+
   static Mutex* lock_;
 
   static std::vector<Space*> spaces_;