Merge "Implement RS GC worker thread." into jb-mr2-dev

This commit is contained in:
Jason Sams
2013-04-10 04:21:01 +00:00
committed by Android (Google) Code Review
4 changed files with 75 additions and 1 deletions

View File

@ -759,6 +759,8 @@ public class RenderScript {
int mContext;
@SuppressWarnings({"FieldCanBeLocal"})
MessageThread mMessageThread;
GCThread mGCThread;
Element mElement_U8;
Element mElement_I8;
@ -1041,6 +1043,49 @@ public class RenderScript {
}
}
static class GCThread extends Thread {
RenderScript mRS;
boolean mRun = true;
int currentSize = 0;
final static int targetSize = 256*1024*1024; // call System.gc after 256MB of allocs
GCThread(RenderScript rs) {
super("RSGCThread");
mRS = rs;
}
public void run() {
while(mRun) {
boolean doGC = false;
synchronized(this) {
if (currentSize >= targetSize) {
doGC = true;
}
}
if (doGC == true) {
System.gc();
}
try {
sleep(1, 0);
} catch(InterruptedException e) {
}
}
Log.d(LOG_TAG, "GCThread exiting.");
}
public synchronized void addAllocSize(int bytes) {
currentSize += bytes;
}
public synchronized void removeAllocSize(int bytes) {
currentSize -= bytes;
}
}
RenderScript(Context ctx) {
if (ctx != null) {
mApplicationContext = ctx.getApplicationContext();
@ -1063,6 +1108,15 @@ public class RenderScript {
return create(ctx, sdkVersion, ContextType.NORMAL);
}
void addAllocSizeForGC(int bytes) {
mGCThread.addAllocSize(bytes);
}
void removeAllocSizeForGC(int bytes) {
mGCThread.removeAllocSize(bytes);
}
/**
* Create a basic RenderScript context.
*
@ -1079,7 +1133,9 @@ public class RenderScript {
throw new RSDriverException("Failed to create RS context.");
}
rs.mMessageThread = new MessageThread(rs);
rs.mGCThread = new GCThread(rs);
rs.mMessageThread.start();
rs.mGCThread.start();
return rs;
}
@ -1134,8 +1190,10 @@ public class RenderScript {
validate();
nContextDeinitToClient(mContext);
mMessageThread.mRun = false;
mGCThread.mRun = false;
try {
mMessageThread.join();
mGCThread.join();
} catch(InterruptedException e) {
}