MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

interrupt leaking threads

Browse Source
This commit is contained in:
Alexey Kudravtsev
2015-11-26 16:20:19 +03:00
parent a623af069f
commit 2d0a1faac7
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/testFramework/src/com/intellij/testFramework/ThreadTracker.java
+11 -4
View File
@@ -20,7 +20,7 @@ import com.intellij.openapi.project.ProjectManager;
import com.intellij.openapi.project.impl.ProjectManagerImpl;
import com.intellij.openapi.util.Condition;
import com.intellij.util.ReflectionUtil;
import com.intellij.util.TimeoutUtil;
import com.intellij.util.WaitFor;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.ContainerUtilRt;
import gnu.trove.THashSet;
@@ -110,7 +110,7 @@ public class ThreadTracker {
Collection<Thread> after = new THashSet<Thread>(getThreads());
after.removeAll(before);
for (Thread thread : after) {
for (final Thread thread : after) {
if (thread == Thread.currentThread()) continue;
ThreadGroup group = thread.getThreadGroup();
if (group != null && "system".equals(group.getName()))continue;
@@ -126,8 +126,15 @@ public class ThreadTracker {
if (!thread.isAlive()) continue;
if (thread.getStackTrace().length == 0) {
TimeoutUtil.sleep(10000);
if (!thread.isAlive()) continue;
thread.interrupt();
if (new WaitFor(10000){
@Override
protected boolean condition() {
return !thread.isAlive();
}
}.isConditionRealized()) {
continue;
}
}
String trace = "Thread leaked: " + thread+"; " + thread.getState()+" ("+ thread.isAlive()+")\n--- its stacktrace:\n";
platform/util/src/com/intellij/util/ConcurrencyUtil.java
+1 -1
View File
@@ -151,7 +151,7 @@ public class ConcurrencyUtil {
}
if (executor.getPoolSize() != 0) {
String dump = ThreadDumper.dumpThreadsToString();
System.err.println("Executor "+executor+" is still active after "+unit.toSeconds(timeout)+" seconds:\n"+ dump);
System.err.println("Executor "+executor+" is still active after "+unit.toSeconds(timeout)+" seconds://///\n"+ dump+"\n/////");
}
}
}