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

FileBasedIndexImpl.waitForVfsEventsExecuted without busy-wait

Browse Source
This commit is contained in:
peter
2019-01-21 12:30:02 +01:00
parent 340412cca0
commit 889e110b0d
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java
+6 -10
View File
@@ -65,7 +65,6 @@ import com.intellij.util.concurrency.SequentialTaskExecutor;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.IntObjectMap;
import com.intellij.util.gist.GistManager;
import com.intellij.util.gist.GistManagerImpl;
import com.intellij.util.indexing.impl.InvertedIndexValueIterator;
import com.intellij.util.indexing.impl.MapReduceIndex;
import com.intellij.util.io.DataOutputStream;
@@ -2495,18 +2494,15 @@ public class FileBasedIndexImpl extends FileBasedIndex implements BaseComponent,
@TestOnly
public void waitForVfsEventsExecuted(long timeout, @NotNull TimeUnit unit) throws Exception {
ApplicationManager.getApplication().assertIsDispatchThread();
// wait in the other thread to be able to handle invokeLater() which myChangedFilesCollector.myVfsEventsExecutor issues
Future<?> future = ApplicationManager.getApplication().executeOnPooledThread(() -> {
long deadline = System.nanoTime() + unit.toNanos(timeout);
while (System.nanoTime() < deadline) {
try {
((BoundedTaskExecutor)myChangedFilesCollector.myVfsEventsExecutor).waitAllTasksExecuted(timeout, unit);
((BoundedTaskExecutor)myChangedFilesCollector.myVfsEventsExecutor).waitAllTasksExecuted(1, TimeUnit.MILLISECONDS);
return;
}
catch (Exception e) {
throw new RuntimeException(e);
catch (TimeoutException e) {
UIUtil.dispatchAllInvocationEvents();
}
});
while (!future.isDone()) {
UIUtil.dispatchAllInvocationEvents();
}
future.get();
}
}