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

prefer no overhead execute()/big overhead hasModal() over small constant overhead always

Browse Source
This commit is contained in:
Alexey Kudravtsev
2018-07-31 18:50:25 +03:00
parent c95d31e5f0
commit f3bffb96a6
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/openapi/progress/impl/CoreProgressManager.java
+3 -5
View File
@@ -37,7 +37,6 @@ public class CoreProgressManager extends ProgressManager implements Disposable {
static final int CHECK_CANCELED_DELAY_MILLIS = 10;
private final AtomicInteger myCurrentUnsafeProgressCount = new AtomicInteger(0);
private final AtomicInteger myCurrentModalProgressCount = new AtomicInteger(0);
public static final boolean ENABLED = !"disabled".equals(System.getProperty("idea.ProcessCanceledException"));
private static CheckCanceledHook ourCheckCanceledHook;
@@ -136,7 +135,9 @@ public class CoreProgressManager extends ProgressManager implements Disposable {
@Override
public boolean hasModalProgressIndicator() {
return myCurrentModalProgressCount.get() > 0;
synchronized (threadsUnderIndicator) {
return ContainerUtil.or(threadsUnderIndicator.keySet(), i -> i.isModal());
}
}
@Override
@@ -506,8 +507,6 @@ public class CoreProgressManager extends ProgressManager implements Disposable {
@Override
public void executeProcessUnderProgress(@NotNull Runnable process, ProgressIndicator progress) throws ProcessCanceledException {
boolean modal = progress != null && progress.isModal();
if (modal) myCurrentModalProgressCount.incrementAndGet();
if (progress == null) myCurrentUnsafeProgressCount.incrementAndGet();
try {
@@ -529,7 +528,6 @@ public class CoreProgressManager extends ProgressManager implements Disposable {
}
finally {
if (progress == null) myCurrentUnsafeProgressCount.decrementAndGet();
if (modal) myCurrentModalProgressCount.decrementAndGet();
}
}