summaryrefslogtreecommitdiffstats
path: root/libart/src/main/java/dalvik
diff options
context:
space:
mode:
authorMathieu Chartier <mathieuc@google.com>2014-12-18 15:17:44 -0800
committerMathieu Chartier <mathieuc@google.com>2014-12-19 17:03:10 -0800
commit152be540e335376f66ed662d8e63e601a09cb4b3 (patch)
tree556b55918e8f3c868371241ded26fac2d402f809 /libart/src/main/java/dalvik
parentf1f0b00a702658f7bdf950374b3878baa3703d65 (diff)
downloadlibcore-152be540e335376f66ed662d8e63e601a09cb4b3.zip
libcore-152be540e335376f66ed662d8e63e601a09cb4b3.tar.gz
libcore-152be540e335376f66ed662d8e63e601a09cb4b3.tar.bz2
Move heap trimming daemon and GC deamon into a single daemon
Bug: 18739541 Change-Id: Icf309cd8981372f24caa7c8b98a2e0591b1d90ea
Diffstat (limited to 'libart/src/main/java/dalvik')
-rw-r--r--libart/src/main/java/dalvik/system/VMRuntime.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/libart/src/main/java/dalvik/system/VMRuntime.java b/libart/src/main/java/dalvik/system/VMRuntime.java
index 58094d8..b054fb3 100644
--- a/libart/src/main/java/dalvik/system/VMRuntime.java
+++ b/libart/src/main/java/dalvik/system/VMRuntime.java
@@ -295,10 +295,13 @@ public final class VMRuntime {
*/
public native void registerNativeFree(int bytes);
- public native void trimHeap();
- public native void concurrentGC();
public native void requestConcurrentGC();
- public native void waitForConcurrentGCRequest();
+ public native void concurrentGC();
+ public native void requestHeapTrim();
+ public native void trimHeap();
+ public native void startHeapTaskProcessor();
+ public native void stopHeapTaskProcessor();
+ public native void runHeapTasks();
/**
* Let the heap know of the new process state. This can change allocation and garbage collection