stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8324673: javacserver failed during build: RejectedExecutionException

Browse Source 
Reviewed-by: cstein, erikj
This commit is contained in:
Daniel Jeliński 2024-04-09 14:10:58 +00:00
parent 5fb5e6c8f0
commit 3b6629cec7
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
make/langtools/tools/javacserver/server/CompilerThreadPool.java
View File

@ -43,14 +43,8 @@ public class CompilerThreadPool {
this.pool = Executors.newFixedThreadPool(POOLSIZE);
}
public int dispatchCompilation(String[] args) {
Log log = Log.get();
try {
return pool.submit(() -> Server.runCompiler(log, args)).get();
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("Error during compile", e);
}
public void execute(Runnable runnable) {
this.pool.execute(runnable);
}
public void shutdown() {

17
make/langtools/tools/javacserver/server/Server.java
View File

@ -168,10 +168,8 @@ public class Server {
do {
try {
Socket socket = serverSocket.accept();
// Handle each incoming request in a separate thread. This is just for socket communication,
// the actual compilation will be done by the threadpool.
Thread requestHandler = new Thread(() -> handleRequest(socket));
requestHandler.start();
// Handle each incoming request in a threapool thread
compilerThreadPool.execute(() -> handleRequest(socket));
} catch (SocketException se) {
// Caused by serverSocket.close() and indicates shutdown
}
@ -206,9 +204,9 @@ public class Server {
// If there has been any internal errors, notify client
checkInternalErrorLog();
// Perform compilation. This will call runCompiler() on a
// thread in the thread pool
int exitCode = compilerThreadPool.dispatchCompilation(args);
// Perform compilation
int exitCode = runCompiler(args);
Protocol.sendExitCode(out, exitCode);
// Check for internal errors again.
@ -220,15 +218,14 @@ public class Server {
// Not much to be done at this point. The client side request
// code will most likely throw an IOException and the
// compilation will fail.
ex.printStackTrace();
Log.error(ex);
} finally {
Log.setLogForCurrentThread(null);
}
}
public static int runCompiler(Log log, String[] args) {
Log.setLogForCurrentThread(log);
public static int runCompiler(String[] args) {
// Direct logging to our byte array stream.
StringWriter strWriter = new StringWriter();
PrintWriter printWriter = new PrintWriter(strWriter);