MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup (part of IJPL-202847 ReadAction.nonBlocking() must not leak tasks)

Browse Source 
GitOrigin-RevId: 472676da16e74582a60cde07702ae949d5dcf095
This commit is contained in:
Alexey Kudravtsev
2025-08-19 12:22:41 +02:00
committed by intellij-monorepo-bot
parent a3ee2d7ec0
commit c7441fd3f4
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
platform/platform-impl/src/com/intellij/openapi/application/impl/NonBlockingReadActionImpl.java
View File

@@ -28,7 +28,6 @@ import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.platform.diagnostic.telemetry.TelemetryManager;
import com.intellij.platform.locking.impl.IntelliJLockingUtil;
import com.intellij.psi.PsiElement;
import com.intellij.util.ArrayUtil;
import com.intellij.util.RunnableCallable;
@@ -83,7 +82,8 @@ public final class NonBlockingReadActionImpl<T> implements NonBlockingReadAction
/** Computation to be executed -- possible, wrapped into some monitoring */
private final Callable<? extends T> myActualComputation;
private static final Set<Submission<?>> ourTasks = ConcurrentCollectionFactory.createConcurrentSet();
@TestOnly
private static final Set<Submission<?>> ourTasksForTestMode = ConcurrentCollectionFactory.createConcurrentSet();
private static final Map<List<?>, Submission<?>> ourTasksByEquality = new HashMap<>();
private static final SubmissionTracker ourUnboundedSubmissionTracker = new SubmissionTracker();
@@ -301,7 +301,7 @@ public final class NonBlockingReadActionImpl<T> implements NonBlockingReadAction
myStartTrace = hasUnboundedExecutor() ? ourUnboundedSubmissionTracker.preventTooManySubmissions() : null;
if (shouldTrackInTests()) {
ourTasks.add(this);
ourTasksForTestMode.add(this);
}
if (!builder.myDisposables.isEmpty()) {
ApplicationManager.getApplication().runReadAction(() -> expireWithDisposables(this.builder.myDisposables));
@@ -408,7 +408,7 @@ public final class NonBlockingReadActionImpl<T> implements NonBlockingReadAction
ourUnboundedSubmissionTracker.unregisterSubmission(myStartTrace);
}
if (shouldTrackInTests()) {
ourTasks.remove(this);
ourTasksForTestMode.remove(this);
}
}
@@ -464,7 +464,7 @@ public final class NonBlockingReadActionImpl<T> implements NonBlockingReadAction
}
private void reportCoalescingConflict(@NotNull Submission<?> current) {
ourTasks.remove(this); // the next line will throw in tests and leave this submission hanging forever
ourTasksForTestMode.remove(this); // the next line will throw in tests and leave this submission hanging forever
LOG.error("Same coalesceBy arguments are already used by " + current.getComputationOrigin() + " so they can cancel each other. " +
"Please make them more unique.");
}
@@ -502,7 +502,8 @@ public final class NonBlockingReadActionImpl<T> implements NonBlockingReadAction
boolean computationSuccessful;
if (AppExecutorUtil.propagateContext()) {
computationSuccessful = ThreadContext.installThreadContext(myChildContext.getContext(), true, () -> attemptComputation());
} else {
}
else {
computationSuccessful = attemptComputation();
}
if (!computationSuccessful) {
@@ -804,7 +805,7 @@ public final class NonBlockingReadActionImpl<T> implements NonBlockingReadAction
public static void waitForAsyncTaskCompletion() {
ThreadingAssertions.assertEventDispatchThread();
assert ApplicationManager.getApplication()==null || !ApplicationManager.getApplication().isWriteAccessAllowed();
for (Submission<?> task : ourTasks) {
for (Submission<?> task : ourTasksForTestMode) {
TestOnlyThreading.releaseTheAcquiredWriteIntentLockThenExecuteActionAndTakeWriteIntentLockBack(() -> {
waitForTask(task);
return Unit.INSTANCE;