jdk-sandbox: comparison langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Main.java

equal deleted inserted replaced

-:d06a6d3c66c0
+:a4a156a33c94
 import java.io.PrintStream;
 import java.util.*;
 import java.nio.file.Path;
 import java.nio.file.Files;
+import com.sun.tools.sjavac.client.SjavacClient;
+import com.sun.tools.sjavac.comp.SjavacImpl;
+import com.sun.tools.sjavac.comp.PooledSjavac;
 import com.sun.tools.sjavac.options.Options;
 import com.sun.tools.sjavac.options.SourceLocation;
-import com.sun.tools.sjavac.server.JavacService;
+import com.sun.tools.sjavac.server.Sjavac;
-import com.sun.tools.sjavac.server.JavacServer;
+import com.sun.tools.sjavac.server.SjavacServer;
-import com.sun.tools.sjavac.server.JavacServiceClient;
 /**
 * The main class of the smart javac wrapper tool.
 *
-* <p><b>This is NOT part of any supported API.
+*  <p><b>This is NOT part of any supported API.
-* If you write code that depends on this, you do so at your own
+*  If you write code that depends on this, you do so at your own risk.
-* risk.  This code and its internal interfaces are subject to change
+*  This code and its internal interfaces are subject to change or
-* or deletion without notice.</b></p>
+*  deletion without notice.</b>
 */
 public class Main {
 /*  This is a smart javac wrapper primarily used when building the OpenJDK,
 though other projects are welcome to use it too. But please be aware
 if (args.length>1) {
 Log.error("When spawning a background server, only a single --startserver argument is allowed.");
 return;
 }
 // Spawn a background server.
-int rc = JavacServer.startServer(args[0], System.err);
+try {
-System.exit(rc);
+SjavacServer server = new SjavacServer(args[0], System.err);
+int rc = server.startServer();
+System.exit(rc);
+} catch (IOException ioex) {
+Log.error("IOException caught: " + ioex);
+System.exit(-1);
+}
 }
 Main main = new Main();
 int rc = main.go(args, System.out, System.err);
 // Remove the portfile, but only if this background=false was used.
-JavacServer.cleanup(args);
+SjavacServer.cleanup(args);
 System.exit(rc);
 }
 private void printHelp() {
 System.out.println("Usage: sjavac <options>\n"+
 return -1;
 if (!createIfMissing(options.getDestDir()))
 return -1;
+if (!createIfMissing(options.getStateDir()))
+return -1;
 Path gensrc = options.getGenSrcDir();
 if (gensrc != null && !createIfMissing(gensrc))
 return -1;
 Path hdrdir = options.getHeaderDir();
 // (Unless we allow them to be there.)
 // I.e. artifacts that are not known according to the build database (javac_state).
 // For examples, files that have been manually copied into these dirs.
 // Artifacts with bad timestamps (ie the on disk timestamp does not match the timestamp
 // in javac_state) have already been removed when the javac_state was loaded.
-if (!options.isUnidentifiedArtifactPermitted()) {
+if (!options.areUnidentifiedArtifactsPermitted()) {
 javac_state.removeUnidentifiedArtifacts();
 }
 // Go through all sources and taint all packages that miss artifacts.
 javac_state.taintPackagesThatMissArtifacts();
 // Do the compilations, repeatedly until no tainted packages exist.
 boolean again;
 // Collect the name of all compiled packages.
 Set<String> recently_compiled = new HashSet<>();
 boolean[] rc = new boolean[1];
+Sjavac sjavac;
+boolean background = Util.extractBooleanOption("background", options.getServerConf(), true);
 do {
 // Clean out artifacts in tainted packages.
 javac_state.deleteClassArtifactsInTaintedPackages();
-// Create a JavacService to delegate the actual compilation to.
+// Create an sjavac implementation to be used for compilation
-// Currently sjavac always connects to a server through a socket
+if (background) {
-// regardless if sjavac runs as a background service or not.
+sjavac = new SjavacClient(options);
-// This will most likely change in the future.
+} else {
-JavacService javacService = new JavacServiceClient(options.getServerConf());
+int poolsize = Util.extractIntOption("poolsize", options.getServerConf());
-again = javac_state.performJavaCompilations(javacService, options, recently_compiled, rc);
+if (poolsize <= 0)
+poolsize = Runtime.getRuntime().availableProcessors();
+sjavac = new PooledSjavac(new SjavacImpl(), poolsize);
+}
+again = javac_state.performJavaCompilations(sjavac, options, recently_compiled, rc);
 if (!rc[0]) break;
 } while (again);
 // Only update the state if the compile went well.
 if (rc[0]) {
 javac_state.save();
 // Reflatten only the artifacts.
 javac_state.now().flattenArtifacts(modules);
 // Remove artifacts that were generated during the last compile, but not this one.
 javac_state.removeSuperfluousArtifacts(recently_compiled);
 }
+if (!background)
+sjavac.shutdown();
 return rc[0] ? 0 : -1;
 } catch (ProblemException e) {
 Log.error(e.getMessage());
 return -1;
 } catch (Exception e) {
 if (options.getDestDir() == null) {
 err = "Please specify output directory.";
 } else if (options.isJavaFilesAmongJavacArgs()) {
 err = "Sjavac does not handle explicit compilation of single .java files.";
-} else if (options.isAtFilePresent()) {
-err = "Sjavac does not handle @-files.";
 } else if (options.getServerConf() == null) {
 err = "No server configuration provided.";
 } else if (!options.getImplicitPolicy().equals("none")) {
 err = "The only allowed setting for sjavac is -implicit:none";
 } else if (options.getSources().isEmpty()) {

changeset 26107	a4a156a33c94
parent 26098	32588700060b
parent 25874	83c19f00452c
child 26271	97603426a4ce