From d95031af81ca2f1792b0d7a19945409e547783a4 Mon Sep 17 00:00:00 2001 From: Alexandr Evstigneev Date: Mon, 4 Feb 2019 16:10:58 +0300 Subject: [PATCH] Renamed method to measureExecutionTime IDEA-CR-42681 --- .../autodetect/JavaAutoDetectIndentPerformanceTest.java | 6 +++--- .../daemon/impl/focusMode/FocusModePassFactory.java | 2 +- .../com/intellij/ide/startup/impl/StartupManagerImpl.java | 2 +- .../src/com/intellij/testFramework/CpuTimings.java | 2 +- platform/util/src/com/intellij/util/TimeoutUtil.java | 2 +- .../org/intellij/lang/xpath/xslt/XsltHighlightingTest.java | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/java/psi/codeStyle/autodetect/JavaAutoDetectIndentPerformanceTest.java b/java/java-tests/testSrc/com/intellij/java/psi/codeStyle/autodetect/JavaAutoDetectIndentPerformanceTest.java index 74e3c1417ea0..5e453bdee2c6 100644 --- a/java/java-tests/testSrc/com/intellij/java/psi/codeStyle/autodetect/JavaAutoDetectIndentPerformanceTest.java +++ b/java/java-tests/testSrc/com/intellij/java/psi/codeStyle/autodetect/JavaAutoDetectIndentPerformanceTest.java @@ -42,9 +42,9 @@ public class JavaAutoDetectIndentPerformanceTest extends AbstractIndentAutoDetec public void testBigColdFile() { Ref ref = Ref.create(); - long fileLoadTime = TimeoutUtil.runAndGetExecutionTime(() -> configureByFile(getFileNameWithExtension())); + long fileLoadTime = TimeoutUtil.measureExecutionTime(() -> configureByFile(getFileNameWithExtension())); - long detectingTime = TimeoutUtil.runAndGetExecutionTime(() -> ref.set(detectIndentOptions())); + long detectingTime = TimeoutUtil.measureExecutionTime(() -> ref.set(detectIndentOptions())); double ratio = (double)detectingTime / fileLoadTime; if (ratio > 0.3) { TeamCityLogger.error("Detecting indent have taken too much time proportionally to file read time " + ratio); @@ -69,7 +69,7 @@ public class JavaAutoDetectIndentPerformanceTest extends AbstractIndentAutoDetec public void testBigOneLineFile() { configureByFile("oneLine.json"); - long time = TimeoutUtil.runAndGetExecutionTime(AbstractIndentAutoDetectionTest::detectIndentOptions); + long time = TimeoutUtil.measureExecutionTime(AbstractIndentAutoDetectionTest::detectIndentOptions); assertTrue(time < 40); } } \ No newline at end of file diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/focusMode/FocusModePassFactory.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/focusMode/FocusModePassFactory.java index 9df9ed9b646e..5a024d7beb88 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/focusMode/FocusModePassFactory.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/focusMode/FocusModePassFactory.java @@ -70,7 +70,7 @@ public class FocusModePassFactory implements TextEditorHighlightingPassFactory { @NotNull private static List calcFocusZones(@NotNull FocusModeProvider focusModeProvider, @NotNull PsiFile psiFile) { Ref> resultRef = Ref.create(); - long executionTime = TimeoutUtil.runAndGetExecutionTime(() -> resultRef.set(focusModeProvider.calcFocusZones(psiFile))); + long executionTime = TimeoutUtil.measureExecutionTime(() -> resultRef.set(focusModeProvider.calcFocusZones(psiFile))); if (executionTime > MAX_ALLOWED_TIME) { LOG.warn("Focus zones collecting took too long: " + executionTime + "ms; " + "Provider: " + focusModeProvider.getClass().getSimpleName() + "; " + diff --git a/platform/platform-impl/src/com/intellij/ide/startup/impl/StartupManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/startup/impl/StartupManagerImpl.java index fdcd1b8df7cf..d844fd40a028 100644 --- a/platform/platform-impl/src/com/intellij/ide/startup/impl/StartupManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/ide/startup/impl/StartupManagerImpl.java @@ -149,7 +149,7 @@ public class StartupManagerImpl extends StartupManagerEx { } private void logActivityDuration(AtomicBoolean uiFreezeWarned, StartupActivity extension) { - long duration = TimeoutUtil.runAndGetExecutionTime(() -> extension.runActivity(myProject)); + long duration = TimeoutUtil.measureExecutionTime(() -> extension.runActivity(myProject)); Application app = ApplicationManager.getApplication(); if (duration > 100 && !app.isUnitTestMode()) { diff --git a/platform/testFramework/src/com/intellij/testFramework/CpuTimings.java b/platform/testFramework/src/com/intellij/testFramework/CpuTimings.java index 64ff7eff1161..5492805224ae 100644 --- a/platform/testFramework/src/com/intellij/testFramework/CpuTimings.java +++ b/platform/testFramework/src/com/intellij/testFramework/CpuTimings.java @@ -38,7 +38,7 @@ class CpuTimings { StringBuilder log = new StringBuilder(); for (int i = 0;; i++) { - long time = TimeoutUtil.runAndGetExecutionTime(CpuTimings::addBigIntegers); + long time = TimeoutUtil.measureExecutionTime(CpuTimings::addBigIntegers); if (time < minTime) { //log.append("Iteration " + i + ", time " + time + "\n"); minTime = time; diff --git a/platform/util/src/com/intellij/util/TimeoutUtil.java b/platform/util/src/com/intellij/util/TimeoutUtil.java index 049b9e452192..0c8f4d17f332 100644 --- a/platform/util/src/com/intellij/util/TimeoutUtil.java +++ b/platform/util/src/com/intellij/util/TimeoutUtil.java @@ -69,7 +69,7 @@ public final class TimeoutUtil { * @return time of running {@code runnable} in milliseconds */ @ApiStatus.Experimental - public static long runAndGetExecutionTime(@NotNull ThrowableRunnable runnable) throws E { + public static long measureExecutionTime(@NotNull ThrowableRunnable runnable) throws E { long startTime = System.currentTimeMillis(); runnable.run(); return System.currentTimeMillis() - startTime; diff --git a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/XsltHighlightingTest.java b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/XsltHighlightingTest.java index 0c537bc7bde1..4cc757854c31 100644 --- a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/XsltHighlightingTest.java +++ b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/xslt/XsltHighlightingTest.java @@ -130,7 +130,7 @@ public class XsltHighlightingTest extends TestBase { final Project project = myFixture.getProject(); PsiDocumentManager.getInstance(project).commitAllDocuments(); - return TimeoutUtil.runAndGetExecutionTime(() -> ReadAction.run( + return TimeoutUtil.measureExecutionTime(() -> ReadAction.run( () -> CodeInsightTestFixtureImpl.instantiateAndRun(myFixture.getFile(), myFixture.getEditor(), ArrayUtil.EMPTY_INT_ARRAY, false))); }