Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

484822 Jetty ThreadMonitor memory leak

This commit is contained in:
Jan Bartel 2015-12-23 14:12:47 +11:00
parent 8f4cc73613
commit 2dc78a5cd9
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jetty-monitor/src/main/java/org/eclipse/jetty/monitor/ThreadMonitor.java
View File

@ -24,8 +24,11 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import org.eclipse.jetty.monitor.thread.ThreadMonitorException; import org.eclipse.jetty.monitor.thread.ThreadMonitorException;
import org.eclipse.jetty.monitor.thread.ThreadMonitorInfo; import org.eclipse.jetty.monitor.thread.ThreadMonitorInfo;
@ -321,6 +324,8 @@ public class ThreadMonitor extends AbstractLifeCycle implements Runnable
_runner.join(); _runner.join();
} }
catch (InterruptedException ex) {} catch (InterruptedException ex) {}
_monitorInfo.clear();
} }
} }
@ -424,6 +429,8 @@ public class ThreadMonitor extends AbstractLifeCycle implements Runnable
// retrieving a single thread stack trace. // retrieving a single thread stack trace.
Map<Thread,StackTraceElement[]> all = Thread.getAllStackTraces(); Map<Thread,StackTraceElement[]> all = Thread.getAllStackTraces();
Set<Long> newOrUpdatedIds = new HashSet<Long>();
for (Map.Entry<Thread,StackTraceElement[]> entry : all.entrySet()) for (Map.Entry<Thread,StackTraceElement[]> entry : all.entrySet())
{ {
Thread thread = entry.getKey(); Thread thread = entry.getKey();
@ -490,7 +497,18 @@ public class ThreadMonitor extends AbstractLifeCycle implements Runnable
} }
} }
} }
newOrUpdatedIds.add(Long.valueOf(threadId));
} }
//clean out threads that no longer exist
Iterator<Long> iter = _monitorInfo.keySet().iterator();
while (iter.hasNext())
{
Long id = iter.next();
if (!newOrUpdatedIds.contains(id))
iter.remove();
}
newOrUpdatedIds.clear();
} }
catch (Exception ex) catch (Exception ex)
{ {