Only schedule a ThreadDeathWatcher task if caches are used.
Motivation: If caches are disabled it does not make sense to schedule a task that will free up memory consumed by the caches. Modifications: Do not schedule if caches are disabled. Result: Less overhead.
This commit is contained in:
parent
2055f4cf12
commit
24b39bc287
@ -55,15 +55,10 @@ final class PoolThreadCache {
|
|||||||
private final int numShiftsNormalHeap;
|
private final int numShiftsNormalHeap;
|
||||||
private final int freeSweepAllocationThreshold;
|
private final int freeSweepAllocationThreshold;
|
||||||
|
|
||||||
private int allocations;
|
private final Thread deathWatchThread;
|
||||||
|
private final Runnable freeTask;
|
||||||
|
|
||||||
private final Thread thread = Thread.currentThread();
|
private int allocations;
|
||||||
private final Runnable freeTask = new Runnable() {
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
free0();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// TODO: Test if adding padding helps under contention
|
// TODO: Test if adding padding helps under contention
|
||||||
//private long pad0, pad1, pad2, pad3, pad4, pad5, pad6, pad7;
|
//private long pad0, pad1, pad2, pad3, pad4, pad5, pad6, pad7;
|
||||||
@ -120,9 +115,25 @@ final class PoolThreadCache {
|
|||||||
numShiftsNormalHeap = -1;
|
numShiftsNormalHeap = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
// The thread-local cache will keep a list of pooled buffers which must be returned to
|
// We only need to watch the thread when any cache is used.
|
||||||
// the pool when the thread is not alive anymore.
|
if (tinySubPageDirectCaches != null || smallSubPageDirectCaches != null || normalDirectCaches != null
|
||||||
ThreadDeathWatcher.watch(thread, freeTask);
|
|| tinySubPageHeapCaches != null || smallSubPageHeapCaches != null || normalHeapCaches != null) {
|
||||||
|
freeTask = new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
free0();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
deathWatchThread = Thread.currentThread();
|
||||||
|
|
||||||
|
// The thread-local cache will keep a list of pooled buffers which must be returned to
|
||||||
|
// the pool when the thread is not alive anymore.
|
||||||
|
ThreadDeathWatcher.watch(deathWatchThread, freeTask);
|
||||||
|
} else {
|
||||||
|
freeTask = null;
|
||||||
|
deathWatchThread = null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static <T> MemoryRegionCache<T>[] createSubPageCaches(
|
private static <T> MemoryRegionCache<T>[] createSubPageCaches(
|
||||||
@ -231,7 +242,10 @@ final class PoolThreadCache {
|
|||||||
* Should be called if the Thread that uses this cache is about to exist to release resources out of the cache
|
* Should be called if the Thread that uses this cache is about to exist to release resources out of the cache
|
||||||
*/
|
*/
|
||||||
void free() {
|
void free() {
|
||||||
ThreadDeathWatcher.unwatch(thread, freeTask);
|
if (freeTask != null) {
|
||||||
|
assert deathWatchThread != null;
|
||||||
|
ThreadDeathWatcher.unwatch(deathWatchThread, freeTask);
|
||||||
|
}
|
||||||
free0();
|
free0();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -244,7 +258,7 @@ final class PoolThreadCache {
|
|||||||
free(normalHeapCaches);
|
free(normalHeapCaches);
|
||||||
|
|
||||||
if (numFreed > 0 && logger.isDebugEnabled()) {
|
if (numFreed > 0 && logger.isDebugEnabled()) {
|
||||||
logger.debug("Freed {} thread-local buffer(s) from thread: {}", numFreed, thread.getName());
|
logger.debug("Freed {} thread-local buffer(s) from thread: {}", numFreed, Thread.currentThread().getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (directArena != null) {
|
if (directArena != null) {
|
||||||
|
Loading…
Reference in New Issue
Block a user