From 0ae1d1acea22f2c1758bf9b3564e84bc95b607b0 Mon Sep 17 00:00:00 2001
From: Julia Beliaeva <Julia.Beliaeva@jetbrains.com>
Date: Fri, 1 Apr 2016 22:25:27 +0300
Subject: [PATCH] [vcs-log] wait for a window between heavy processes to start
 log initialization

---
 .../vcs/log/impl/HeavyAwareExecutor.java      | 70 +++++++++++++++++++
 .../vcs/log/impl/VcsLogProjectManager.java    |  7 +-
 2 files changed, 74 insertions(+), 3 deletions(-)
 create mode 100644 platform/vcs-log/impl/src/com/intellij/vcs/log/impl/HeavyAwareExecutor.java

diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/HeavyAwareExecutor.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/HeavyAwareExecutor.java
new file mode 100644
index 000000000000..151163cf8907
--- /dev/null
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/HeavyAwareExecutor.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.vcs.log.impl;
+
+import com.intellij.openapi.Disposable;
+import com.intellij.openapi.util.Disposer;
+import com.intellij.util.Alarm;
+import com.intellij.util.SingleAlarm;
+import com.intellij.util.io.storage.HeavyProcessLatch;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class HeavyAwareExecutor implements Disposable {
+  private static final int DELAY_MILLIS = 5000;
+  @NotNull private final AtomicBoolean myIsExecuted = new AtomicBoolean(false);
+
+  public HeavyAwareExecutor(@NotNull Disposable parentDisposable) {
+    Disposer.register(parentDisposable, this);
+  }
+
+  public void execute(@NotNull Runnable command) {
+    SingleAlarm alarm = new SingleAlarm(new Runnable() {
+      @Override
+      public void run() {
+        if (!HeavyProcessLatch.INSTANCE.isRunning()) {
+          if (myIsExecuted.compareAndSet(false, true)) {
+            Disposer.dispose(HeavyAwareExecutor.this);
+            command.run();
+          }
+        }
+      }
+    }, DELAY_MILLIS, Alarm.ThreadToUse.SWING_THREAD, this);
+
+    HeavyProcessLatch.INSTANCE.addListener(alarm, new HeavyProcessLatch.HeavyProcessListener() {
+      @Override
+      public void processStarted() {
+        alarm.cancel();
+      }
+
+      @Override
+      public void processFinished() {
+        if (!HeavyProcessLatch.INSTANCE.isRunning()) {
+          alarm.request();
+        }
+      }
+    });
+
+    if (!HeavyProcessLatch.INSTANCE.isRunning()) {
+      alarm.request();
+    }
+  }
+
+  @Override
+  public void dispose() {
+  }
+}
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogProjectManager.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogProjectManager.java
index eef41646eb67..423b5177e8c1 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogProjectManager.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogProjectManager.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.vcs.log.impl;
 
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.startup.StartupActivity;
@@ -154,10 +153,12 @@ public class VcsLogProjectManager {
       }
     }
 
-    private static void init(@NotNull VcsLogProjectManager logManager, @NotNull MessageBusConnection connection, @NotNull AtomicBoolean isInitialized) {
+    private static void init(@NotNull VcsLogProjectManager logManager,
+                             @NotNull MessageBusConnection connection,
+                             @NotNull AtomicBoolean isInitialized) {
       if (isInitialized.compareAndSet(false, true)) {
         connection.disconnect();
-        ApplicationManager.getApplication().invokeLater(new Runnable() {
+        new HeavyAwareExecutor(logManager.myProject).execute(new Runnable() {
           @Override
           public void run() {
             logManager.init();