MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 13:02:30 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-992 Perf tests testRead50Write50LockPerformance and testRead100Write0LockPerformance don't wait till the measurements are done

Browse Source 
1. Remove excessive "run on EDT" calls. All testsuite is executed on EDT.

2. Wait properly for test completion: waiting for a task could run a task on current thread (EDT) and fail assertion. Wait on background thread.

3. New lock is slower in a high-contention read situation, decrease number of iterations 10 times. For now such situation is unrealistic for IDEA.

GitOrigin-RevId: 58558ded17ab3c4722f8864966f5cfa8bed2b17b
This commit is contained in:
Lev Serebryakov
2024-04-10 15:23:13 +02:00
committed by intellij-monorepo-bot
parent 1ec624b1b9
commit d83a9eef42
1 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
platform/platform-tests/testSrc/com/intellij/openapi/application/impl/ApplicationImplTest.java
View File

@@ -19,7 +19,6 @@ import com.intellij.openapi.progress.util.ProgressIndicatorBase;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.EmptyRunnable;
import com.intellij.openapi.util.ThrowableComputable;
import com.intellij.testFramework.EdtTestUtil;
import com.intellij.testFramework.LightPlatformTestCase;
import com.intellij.testFramework.PlatformTestUtil;
import com.intellij.testFramework.RunFirst;
@@ -34,7 +33,6 @@ import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import java.io.IOException;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -65,27 +63,22 @@ public class ApplicationImplTest extends LightPlatformTestCase {
private volatile Throwable exception;
public void testRead50Write50LockPerformance() throws NoSuchMethodException {
Method m = this.getClass().getMethod("testRead50Write50LockPerformance");
ApplicationManager.getApplication().executeOnPooledThread(() -> runReadWrites(m, 500_000, 500_000));
runReadWrites(500_000, 500_000);
}
public void testRead100Write0LockPerformance() throws NoSuchMethodException {
Method m = this.getClass().getMethod("testRead50Write50LockPerformance");
ApplicationManager.getApplication().executeOnPooledThread(() -> runReadWrites(m,50_000_000, 0));
runReadWrites(5_000_000, 0);
}
private void runReadWrites(Method test, final int readIterations, final int writeIterations) {
private void runReadWrites(final int readIterations, final int writeIterations) {
final ApplicationImpl application = (ApplicationImpl)ApplicationManager.getApplication();
Disposable disposable = Disposer.newDisposable();
EdtTestUtil.runInEdtAndWait(() -> {
NonBlockingReadActionImpl.waitForAsyncTaskCompletion();
application.disableEventsUntil(disposable);
ThreadingAssertions.assertEventDispatchThread();
}); // someone might've submitted a task depending on app events which we disable now
NonBlockingReadActionImpl.waitForAsyncTaskCompletion();
application.disableEventsUntil(disposable);
ThreadingAssertions.assertEventDispatchThread();
final String launchName = "lock/unlock " + getTestName(false);
try {
PlatformTestUtil.newPerformanceTest(launchName, () -> {
PlatformTestUtil.newPerformanceTest("lock/unlock " + getTestName(false), () -> {
final int numOfThreads = JobSchedulerImpl.getJobPoolParallelism();
List<Job<Void>> threads = new ArrayList<>(numOfThreads);
for (int i = 0; i < numOfThreads; i++) {
@@ -98,13 +91,25 @@ public class ApplicationImplTest extends LightPlatformTestCase {
threads.add(thread);
}
EdtTestUtil.runInEdtAndWait(() -> {
for (int i = 0; i < writeIterations; i++) {
ApplicationManager.getApplication().runWriteAction(EmptyRunnable.getInstance());
for (int i = 0; i < writeIterations; i++) {
ApplicationManager.getApplication().runWriteAction(EmptyRunnable.getInstance());
}
// Waiting for a read job could provoke ForkJoinPool.awaitQuiescence() in Job implementation.
// It leads to running read job on EDT, which causes assertion to fail.
// So, run this waiting on background thread
Throwable ex = application.executeOnPooledThread(() -> {
try {
waitWithTimeout(threads);
return null;
} catch (Throwable t) {
return t;
}
});
waitWithTimeout(threads);
}).start(test, launchName);
}).get();
if (ex != null) {
throw ex;
}
}).start();
}
finally {
Disposer.dispose(disposable);