From dcc0027ffe3fc435c136f75b8db81e729f2a7460 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Thu, 7 Jul 2016 15:52:48 +0300 Subject: [PATCH] make run faster under log debug level --- .../testSrc/com/intellij/psi/PsiConcurrencyStressTest.java | 5 ++++- .../codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/psi/PsiConcurrencyStressTest.java b/java/java-tests/testSrc/com/intellij/psi/PsiConcurrencyStressTest.java index 308264e653ad..d28823038000 100644 --- a/java/java-tests/testSrc/com/intellij/psi/PsiConcurrencyStressTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/PsiConcurrencyStressTest.java @@ -26,6 +26,7 @@ import com.intellij.codeInsight.daemon.impl.analysis.HighlightInfoHolder; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.Result; import com.intellij.openapi.application.ex.PathManagerEx; +import com.intellij.openapi.application.impl.ApplicationInfoImpl; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.editor.Document; import com.intellij.openapi.extensions.Extensions; @@ -54,6 +55,7 @@ public class PsiConcurrencyStressTest extends DaemonAnalyzerTestCase { @Override protected void setUp() throws Exception { + ApplicationInfoImpl.setInPerformanceTest(true); super.setUp(); LanguageLevelProjectExtension.getInstance(myProject).setLanguageLevel(LanguageLevel.JDK_1_5); @@ -63,7 +65,8 @@ public class PsiConcurrencyStressTest extends DaemonAnalyzerTestCase { } public void testStress() throws Exception { - int numOfThreads = 10; + DaemonProgressIndicator.setDebug(false); + int numOfThreads = Runtime.getRuntime().availableProcessors(); int iterations = Timings.adjustAccordingToMySpeed(20, true); System.out.println("iterations = " + iterations); final int readIterations = iterations * 3; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java index 4e3889786d67..d6361e6acb6f 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java @@ -32,6 +32,7 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.application.ex.ApplicationEx; import com.intellij.openapi.application.ex.ApplicationManagerEx; +import com.intellij.openapi.application.impl.ApplicationInfoImpl; import com.intellij.openapi.components.PersistentStateComponent; import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; @@ -325,7 +326,7 @@ public class DaemonCodeAnalyzerImpl extends DaemonCodeAnalyzerEx implements Pers if (application.isWriteAccessAllowed()) { throw new AssertionError("Must not start highlighting from within write action, or deadlock is imminent"); } - DaemonProgressIndicator.setDebug(true); + DaemonProgressIndicator.setDebug(!ApplicationInfoImpl.isInPerformanceTest()); ((FileTypeManagerImpl)FileTypeManager.getInstance()).drainReDetectQueue(); // pump first so that queued event do not interfere UIUtil.dispatchAllInvocationEvents();