andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only schedule a ThreadDeathWatcher task if caches are used.

Browse Source 
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:
Norman Maurer 2016-12-01 09:58:54 +01:00
parent b1d6b303b8
commit 965cddcd5d
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
buffer/src/main/java/io/netty/buffer/PoolThreadCache.java
View File

@ -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;
} }
// We only need to watch the thread when any cache is used.
if (tinySubPageDirectCaches != null || smallSubPageDirectCaches != null || normalDirectCaches != null
|| 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 thread-local cache will keep a list of pooled buffers which must be returned to
// the pool when the thread is not alive anymore. // the pool when the thread is not alive anymore.
ThreadDeathWatcher.watch(thread, freeTask); 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) {