MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

javac idle processes cleanup IDEA-CR-62977

Browse Source 
GitOrigin-RevId: 0b6e9c23b08571817ed569f74a5ad68c03f2c6bc
This commit is contained in:
Eugene Zhuravlev
2020-05-26 10:17:40 +03:00
committed by intellij-monorepo-bot
parent b39d794fa8
commit a3c488b79b
2 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
+4
View File
@@ -1100,6 +1100,10 @@ public class JavaBuilder extends ModuleLevelBuilder {
@Override
public void chunkBuildFinished(CompileContext context, ModuleChunk chunk) {
JavaBuilderUtil.cleanupChunkResources(context);
ExternalJavacManager extJavacManager = ExternalJavacManager.KEY.get(context);
if (extJavacManager != null) {
extJavacManager.shutdownIdleProcesses();
}
}
private static Map<File, Set<File>> buildOutputDirectoriesMap(CompileContext context, ModuleChunk chunk) {
jps/jps-builders/src/org/jetbrains/jps/javac/ExternalJavacManager.java
+28 -24
View File
@@ -40,6 +40,8 @@ import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collectors;
public class ExternalJavacManager extends ProcessAdapter {
@@ -205,9 +207,7 @@ public class ExternalJavacManager extends ProcessAdapter {
}
private ExternalJavacProcessHandler findRunningProcess(int processHash) {
if (LOG.isDebugEnabled()) {
LOG.debug("findRunningProcess: looking for hash " + processHash);
}
debug(()-> "findRunningProcess: looking for hash " + processHash);
List<ExternalJavacProcessHandler> idleProcesses = null;
try {
synchronized (myRunningProcesses) {
@@ -220,25 +220,19 @@ public class ExternalJavacManager extends ProcessAdapter {
final Integer hash = PROCESS_HASH.get(process);
if (hash != null && hash == processHash && process.lock()) {
if (LOG.isDebugEnabled()) {
LOG.debug("findRunningProcess: returning process " + process.getProcessId() + " for hash " + processHash);
}
debug(()-> "findRunningProcess: returning process " + process.getProcessId() + " for hash " + processHash);
return process;
}
if (process.getIdleTime() > myKeepAliveTimeout) {
if (idleProcesses == null) {
idleProcesses = new ArrayList<>();
}
if (LOG.isDebugEnabled()) {
LOG.debug("findRunningProcess: adding " + process.getProcessId() + " to idle list");
}
debug(()-> "findRunningProcess: adding " + process.getProcessId() + " to idle list");
idleProcesses.add(process);
}
}
}
if (LOG.isDebugEnabled()) {
LOG.debug("findRunningProcess: no running process for " + processHash + " is found");
}
debug(()-> "findRunningProcess: no running process for " + processHash + " is found");
return null;
}
finally {
@@ -250,6 +244,18 @@ public class ExternalJavacManager extends ProcessAdapter {
}
}
private static <T> void debug(T data, Function<T, String> message) {
if (LOG.isDebugEnabled()) {
LOG.debug(message.apply(data));
}
}
private static void debug(Supplier<String> message) {
if (LOG.isDebugEnabled()) {
LOG.debug(message.get());
}
}
private static int processHash(String sdkHomePath, List<String> vmOptions, JavaCompilingTool tool) {
return Objects.hash(sdkHomePath.replace(File.separatorChar, '/'), vmOptions, tool.getId());
}
@@ -304,10 +310,10 @@ public class ExternalJavacManager extends ProcessAdapter {
private boolean shutdownProcess(ExternalJavacProcessHandler process) {
UUID processId = process.getProcessId();
LOG.debug("shutdownProcess: shutting down " + processId);
debug(()-> "shutdownProcess: shutting down " + processId);
final Channel conn = myConnections.get(processId);
if (conn != null && process.lock()) {
LOG.debug("shutdownProcess: sending shutdown request to " + processId);
debug(()-> "shutdownProcess: sending shutdown request to " + processId);
conn.writeAndFlush(JavacProtoUtil.toMessage(processId, JavacProtoUtil.createShutdownRequest()));
return true;
}
@@ -374,9 +380,7 @@ public class ExternalJavacManager extends ProcessAdapter {
appendParam(cmdLine, FileUtil.toSystemIndependentName(workingDir.getPath()));
if (LOG.isDebugEnabled()) {
LOG.debug("starting external compiler: " + cmdLine);
}
debug(()-> "starting external compiler: " + cmdLine);
FileUtil.createDirectory(workingDir);
final int processHash = processHash(sdkHomePath, vmOptions, compilingTool);
@@ -384,7 +388,7 @@ public class ExternalJavacManager extends ProcessAdapter {
PROCESS_HASH.set(processHandler, processHash);
processHandler.lock();
myRunningProcesses.put(processId, processHandler);
LOG.debug("external compiler process registered: id=" + processId + ", hash=" + processHash);
debug(()-> "external compiler process registered: id=" + processId + ", hash=" + processHash);
processHandler.addProcessListener(this);
processHandler.startNotify();
return processHandler;
@@ -393,7 +397,7 @@ public class ExternalJavacManager extends ProcessAdapter {
@Override
public void processTerminated(@NotNull ProcessEvent event) {
final UUID processId = ((ExternalJavacProcessHandler)event.getProcessHandler()).getProcessId();
LOG.debug("process " + processId + " terminated");
debug(()-> "process " + processId + " terminated");
myRunningProcesses.remove(processId);
if (myConnections.get(processId) == null) {
// only if connection has never been established
@@ -596,10 +600,10 @@ public class ExternalJavacManager extends ProcessAdapter {
Channel channel = null;
synchronized (myConnections) {
channel = myConnections.get(processId);
LOG.debug("lookupChannel: channel for " + processId + " is " + channel);
debug(channel, ch-> "lookupChannel: channel for " + processId + " is " + ch);
while (channel == null) {
if (!myRunningProcesses.containsKey(processId)) {
LOG.debug("lookupChannel: no process for " + processId);
debug(()-> "lookupChannel: no process for " + processId);
break; // the process is already gone
}
try {
@@ -608,7 +612,7 @@ public class ExternalJavacManager extends ProcessAdapter {
catch (InterruptedException ignored) {
}
channel = myConnections.get(processId);
LOG.debug("lookupChannel: after wait channel for " + processId + " is " + channel);
debug(channel, ch-> "lookupChannel: after wait channel for " + processId + " is " + ch);
}
}
return channel;
@@ -710,7 +714,7 @@ public class ExternalJavacManager extends ProcessAdapter {
}
boolean successfully = isTerminatedSuccessfully();
if (!successfully) {
LOG.debug("Javac compile session " + myId + " in process " + myProcessId + "didn't terminate successfully");
debug(()-> "Javac compile session " + myId + " in process " + myProcessId + "didn't terminate successfully");
}
return successfully;
}
@@ -725,7 +729,7 @@ public class ExternalJavacManager extends ProcessAdapter {
}
boolean successfully = isTerminatedSuccessfully();
if (!successfully) {
LOG.debug("Javac compile session " + myId + " in process " + myProcessId + "didn't terminate successfully");
debug(()-> "Javac compile session " + myId + " in process " + myProcessId + "didn't terminate successfully");
}
return successfully;
}