Выполнение операций на отдельном тред-пуле

Author: nixel2007

src/main/java/com/github/_1c_syntax/bsl/languageserver/AnalyzeProjectOnStart.java

@@ -28,8 +28,12 @@
 import com.github._1c_syntax.bsl.languageserver.utils.Resources;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ForkJoinPool;
+
 /**
  * Перехватчик события заполнения контекста сервера, запускающий анализ всех файлов контекста.
  */
@@ -42,6 +46,7 @@ public class AnalyzeProjectOnStart {
   private final WorkDoneProgressHelper workDoneProgressHelper;
 
   @EventListener
+  @Async
   public void handleEvent(ServerContextPopulatedEvent event) {
     if (!configuration.getDiagnosticsOptions().isAnalyzeOnStart()) {
       return;
@@ -53,16 +58,28 @@ public void handleEvent(ServerContextPopulatedEvent event) {
     var progress = workDoneProgressHelper.createProgress(documentContexts.size(), getMessage("filesSuffix"));
     progress.beginProgress(getMessage("analyzeProject"));
 
-    documentContexts.forEach((DocumentContext documentContext) -> {
+    var executorService = new ForkJoinPool(ForkJoinPool.getCommonPoolParallelism());
 
-      progress.tick();
+    try {
+      executorService.submit(() ->
+        documentContexts.parallelStream().forEach((DocumentContext documentContext) -> {
+          progress.tick();
 
-      serverContext.rebuildDocument(documentContext);
-      diagnosticProvider.computeAndPublishDiagnostics(documentContext);
+          serverContext.rebuildDocument(documentContext);
+          diagnosticProvider.computeAndPublishDiagnostics(documentContext);
 
-      serverContext.tryClearDocument(documentContext);
+          serverContext.tryClearDocument(documentContext);
+        })
+      ).get();
 
-    });
+    } catch (ExecutionException e) {
+      throw new RuntimeException("Can't analyze project on start", e);
+    } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      throw new RuntimeException("Interrupted while analyzing project on start", e);
+    } finally {
+      executorService.shutdown();
+    }
 
     progress.endProgress(getMessage("projectAnalyzed"));
   }

src/main/java/com/github/_1c_syntax/bsl/languageserver/context/ServerContext.java

@@ -50,7 +50,7 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executors;
+import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
@@ -245,7 +245,7 @@ private Configuration computeConfigurationMetadata() {
     progress.beginProgress(getMessage("computeConfigurationMetadata"));
 
     Configuration configuration;
-    var executorService = Executors.newCachedThreadPool();
+    var executorService = new ForkJoinPool(ForkJoinPool.getCommonPoolParallelism());
     try {
       configuration = executorService.submit(() -> Configuration.create(configurationRoot)).get();
     } catch (ExecutionException e) {