commit 18fd7ec440e90260bf1c9eddca34229553a79b86
author Ian Rogers <irogers@google.com> Fri Oct 19 11:45:23 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 19 11:45:23 2012 -0700
tree b0e86fc30f6f2d207ca5a068a303a98b01aae86f
parent f852fb2921128d3b71a76e6b17c78d10fb7085e2
parent 3056d0ca38acc3d829a13ec8f97d35a002ee354e

Merge "Improve accuracy of heap trim times" into dalvik-dev

src/heap.cc

diff --git a/src/heap.cc b/src/heap.cc
index c6f2395..584c5b2 100644
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -2040,8 +2040,7 @@
   }
 }
 
-void Heap::Trim(Thread* self) {
-  WaitForConcurrentGcToComplete(self);
+void Heap::Trim() {
   alloc_space_->Trim();
 }
 

src/heap.h

diff --git a/src/heap.h b/src/heap.h
index 14d8382..984a329 100644
--- a/src/heap.h
+++ b/src/heap.h
@@ -278,7 +278,7 @@
 
   void DumpForSigQuit(std::ostream& os);
 
-  void Trim(Thread* self);
+  void Trim();
 
   HeapBitmap* GetLiveBitmap() SHARED_LOCKS_REQUIRED(Locks::heap_bitmap_lock_) {
     return live_bitmap_.get();

src/native/dalvik_system_VMRuntime.cc

diff --git a/src/native/dalvik_system_VMRuntime.cc b/src/native/dalvik_system_VMRuntime.cc
index b98f974..9c40041 100644
--- a/src/native/dalvik_system_VMRuntime.cc
+++ b/src/native/dalvik_system_VMRuntime.cc
@@ -156,15 +156,14 @@
   }
 }
 
-static void VMRuntime_trimHeap(JNIEnv* env, jobject) {
+static void VMRuntime_trimHeap(JNIEnv*, jobject) {
   // Trim the managed heap.
   Heap* heap = Runtime::Current()->GetHeap();
   uint64_t start_ns = NanoTime();
   DlMallocSpace* alloc_space = heap->GetAllocSpace();
   size_t alloc_space_size = alloc_space->Size();
   float utilization = static_cast<float>(alloc_space->GetNumBytesAllocated()) / alloc_space_size;
-  Thread* self = static_cast<JNIEnvExt*>(env)->self;
-  heap->Trim(self);
+  heap->Trim();
   // Trim the native heap.
   dlmalloc_trim(0);
   dlmalloc_inspect_all(MspaceMadviseCallback, NULL);