langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/SjavacServer.java
equal
deleted
inserted
replaced
38 import java.util.HashMap; |
38 import java.util.HashMap; |
39 import java.util.Map; |
39 import java.util.Map; |
40 import java.util.Random; |
40 import java.util.Random; |
41 import java.util.concurrent.atomic.AtomicBoolean; |
41 import java.util.concurrent.atomic.AtomicBoolean; |
42 |
42 |
|
43 import com.sun.tools.javac.main.Main; |
|
44 import com.sun.tools.javac.main.Main.Result; |
43 import com.sun.tools.sjavac.Log; |
45 import com.sun.tools.sjavac.Log; |
44 import com.sun.tools.sjavac.Util; |
46 import com.sun.tools.sjavac.Util; |
45 import com.sun.tools.sjavac.client.PortFileInaccessibleException; |
47 import com.sun.tools.sjavac.client.PortFileInaccessibleException; |
46 import com.sun.tools.sjavac.comp.PooledSjavac; |
48 import com.sun.tools.sjavac.comp.PooledSjavac; |
47 import com.sun.tools.sjavac.comp.SjavacImpl; |
49 import com.sun.tools.sjavac.comp.SjavacImpl; |
165 portFile.lock(); |
167 portFile.lock(); |
166 portFile.getValues(); |
168 portFile.getValues(); |
167 if (portFile.containsPortInfo()) { |
169 if (portFile.containsPortInfo()) { |
168 Log.debug("Javac server not started because portfile exists!"); |
170 Log.debug("Javac server not started because portfile exists!"); |
169 portFile.unlock(); |
171 portFile.unlock(); |
170 return -1; |
172 return Result.ERROR.exitCode; |
171 } |
173 } |
172 |
174 |
173 // .-----------. .--------. .------. |
175 // .-----------. .--------. .------. |
174 // socket -->| IdleReset |-->| Pooled |-->| Impl |--> javac |
176 // socket -->| IdleReset |-->| Pooled |-->| Impl |--> javac |
175 // '-----------' '--------' '------' |
177 // '-----------' '--------' '------' |
219 Log.debug("Total wall clock time " + realTime + "ms build time " + totalBuildTime + "ms"); |
221 Log.debug("Total wall clock time " + realTime + "ms build time " + totalBuildTime + "ms"); |
220 |
222 |
221 // Shut down |
223 // Shut down |
222 sjavac.shutdown(); |
224 sjavac.shutdown(); |
223 |
225 |
224 return 0; |
226 return Result.OK.exitCode; |
225 } |
227 } |
226 |
228 |
227 @Override |
229 @Override |
228 public void shutdown(String quitMsg) { |
230 public void shutdown(String quitMsg) { |
229 if (!keepAcceptingRequests.compareAndSet(true, false)) { |
231 if (!keepAcceptingRequests.compareAndSet(true, false)) { |