Enable Gradle Daemon by default

gradle · May 31, 2016 · cd48cf3 · cd48cf3
1 parent d2b5150
commit cd48cf3
Show file tree

Hide file tree

Showing 22 changed files with 66 additions and 446 deletions.
diff --git a/...ting/src/main/groovy/org/gradle/integtests/fixtures/executer/InProcessGradleExecuter.java b/...ting/src/main/groovy/org/gradle/integtests/fixtures/executer/InProcessGradleExecuter.java
@@ -50,7 +50,6 @@
 import org.gradle.launcher.cli.ExecuteBuildAction;
 import org.gradle.launcher.cli.Parameters;
 import org.gradle.launcher.cli.ParametersConverter;
-import org.gradle.launcher.daemon.configuration.DaemonUsage;
 import org.gradle.launcher.exec.BuildActionExecuter;
 import org.gradle.launcher.exec.BuildActionParameters;
 import org.gradle.launcher.exec.DefaultBuildActionParameters;
@@ -263,7 +262,7 @@ private BuildResult executeBuild(GradleInvocation invocation, StandardOutputList
                 System.getenv(),
                 SystemProperties.getInstance().getCurrentDir(),
                 startParameter.getLogLevel(),
-                DaemonUsage.EXPLICITLY_DISABLED,
+                false,
                 startParameter.isContinuous(),
                 interactive,
                 ClassPath.EMPTY

diff --git a/...c/integTest/groovy/org/gradle/launcher/daemon/DaemonUsageSuggestionIntegrationTest.groovy b/...c/integTest/groovy/org/gradle/launcher/daemon/DaemonUsageSuggestionIntegrationTest.groovy
diff --git a/...her/src/integTest/groovy/org/gradle/launcher/daemon/SingleUseDaemonIntegrationTest.groovy b/...her/src/integTest/groovy/org/gradle/launcher/daemon/SingleUseDaemonIntegrationTest.groovy
@@ -154,19 +154,6 @@ assert System.getProperty('some-prop') == 'some-value'
         wasNotForked()
     }
 
-    def "does not print suggestion to use the daemon for a single use daemon"() {
-        given:
-        requireJvmArg('-Xmx64m')
-
-        when:
-        succeeds()
-
-        then:
-        !output.contains(DaemonUsageSuggestionIntegrationTest.DAEMON_USAGE_SUGGESTION_MESSAGE)
-        wasForked()
-        daemons.daemon.stops()
-    }
-
     def "does not print daemon startup message for a single use daemon"() {
         given:
         requireJvmArg('-Xmx64m')

diff --git a/subprojects/launcher/src/main/java/org/gradle/launcher/cli/BuildActionsFactory.java b/subprojects/launcher/src/main/java/org/gradle/launcher/cli/BuildActionsFactory.java
@@ -17,7 +17,6 @@
 package org.gradle.launcher.cli;
 
 import org.gradle.StartParameter;
-import org.gradle.api.internal.DocumentationRegistry;
 import org.gradle.api.internal.file.IdentityFileResolver;
 import org.gradle.cli.CommandLineConverter;
 import org.gradle.cli.CommandLineParser;
@@ -26,18 +25,23 @@
 import org.gradle.internal.SystemProperties;
 import org.gradle.internal.classpath.ClassPath;
 import org.gradle.internal.jvm.inspection.JvmVersionDetector;
+import org.gradle.internal.logging.events.OutputEventListener;
 import org.gradle.internal.nativeintegration.services.NativeServices;
 import org.gradle.internal.service.ServiceRegistry;
 import org.gradle.internal.service.ServiceRegistryBuilder;
 import org.gradle.internal.service.scopes.GlobalScopeServices;
 import org.gradle.launcher.daemon.bootstrap.ForegroundDaemonAction;
-import org.gradle.launcher.daemon.client.*;
+import org.gradle.launcher.daemon.client.DaemonClient;
+import org.gradle.launcher.daemon.client.DaemonClientFactory;
+import org.gradle.launcher.daemon.client.DaemonClientGlobalServices;
+import org.gradle.launcher.daemon.client.DaemonStopClient;
 import org.gradle.launcher.daemon.configuration.BuildProcess;
 import org.gradle.launcher.daemon.configuration.DaemonParameters;
 import org.gradle.launcher.daemon.configuration.ForegroundDaemonConfiguration;
-import org.gradle.launcher.exec.*;
-import org.gradle.internal.logging.text.StyledTextOutputFactory;
-import org.gradle.internal.logging.events.OutputEventListener;
+import org.gradle.launcher.exec.BuildActionExecuter;
+import org.gradle.launcher.exec.BuildActionParameters;
+import org.gradle.launcher.exec.BuildExecuter;
+import org.gradle.launcher.exec.DefaultBuildActionParameters;
 import org.gradle.process.internal.DefaultExecActionFactory;
 
 import java.lang.management.ManagementFactory;
@@ -69,7 +73,7 @@ public Runnable createAction(CommandLineParser parser, ParsedCommandLine command
                 UUID.randomUUID().toString(), daemonParameters.getBaseDir(), daemonParameters.getIdleTimeout(), daemonParameters.getPeriodicCheckInterval());
             return new ForegroundDaemonAction(loggingServices, conf);
         }
-        if (parameters.getDaemonParameters().getDaemonUsage().isEnabled()) {
+        if (parameters.getDaemonParameters().isEnabled()) {
             return runBuildWithDaemon(parameters.getStartParameter(), parameters.getDaemonParameters(), loggingServices);
         }
         if (canUseCurrentProcess(parameters.getDaemonParameters())) {
@@ -107,12 +111,7 @@ private Runnable runBuildInProcess(StartParameter startParameter, DaemonParamete
                 .provider(new GlobalScopeServices(startParameter.isContinuous()))
                 .build();
 
-        BuildActionExecuter<BuildActionParameters> executer = globalServices.get(BuildExecuter.class);
-        StyledTextOutputFactory textOutputFactory = globalServices.get(StyledTextOutputFactory.class);
-        DocumentationRegistry documentationRegistry = globalServices.get(DocumentationRegistry.class);
-        DaemonUsageSuggestingBuildActionExecuter daemonUsageSuggestingExecuter = new DaemonUsageSuggestingBuildActionExecuter(executer, textOutputFactory, documentationRegistry);
-
-        return runBuild(startParameter, daemonParameters, daemonUsageSuggestingExecuter, globalServices);
+        return runBuild(startParameter, daemonParameters, globalServices.get(BuildExecuter.class), globalServices);
     }
 
     private Runnable runBuildInSingleUseDaemon(StartParameter startParameter, DaemonParameters daemonParameters, ServiceRegistry loggingServices) {
@@ -147,7 +146,7 @@ private Runnable runBuild(StartParameter startParameter, DaemonParameters daemon
                 System.getenv(),
                 SystemProperties.getInstance().getCurrentDir(),
                 startParameter.getLogLevel(),
-                daemonParameters.getDaemonUsage(), startParameter.isContinuous(), daemonParameters.isInteractive(), ClassPath.EMPTY);
+                daemonParameters.isEnabled(), startParameter.isContinuous(), daemonParameters.isInteractive(), ClassPath.EMPTY);
         return new RunBuildAction(executer, startParameter, clientMetaData(), getBuildStartTime(), parameters, sharedServices);
     }
 

diff --git a/.../launcher/src/main/java/org/gradle/launcher/cli/converter/DaemonCommandLineConverter.java b/.../launcher/src/main/java/org/gradle/launcher/cli/converter/DaemonCommandLineConverter.java
@@ -36,11 +36,11 @@ public DaemonParameters convert(ParsedCommandLine args, DaemonParameters target)
         if (args.hasOption(STOP)) {
             target.setStop(true);
         }
+
         if (args.hasOption(NO_DAEMON)) {
-            return target.setEnabled(false);
-        }
-        if (args.hasOption(DAEMON)) {
-            return target.setEnabled(true);
+            target.setEnabled(false);
+        } else if (args.hasOption(DAEMON)) {
+            target.setEnabled(true);
         }
         return target;
     }

diff --git a/...cts/launcher/src/main/java/org/gradle/launcher/daemon/configuration/DaemonParameters.java b/...cts/launcher/src/main/java/org/gradle/launcher/daemon/configuration/DaemonParameters.java
@@ -45,7 +45,7 @@ public class DaemonParameters {
 
     private int periodicCheckInterval = DEFAULT_PERIODIC_CHECK_INTERVAL_MILLIS;
     private final DaemonJvmOptions jvmOptions = new DaemonJvmOptions(new IdentityFileResolver());
-    private DaemonUsage daemonUsage = DaemonUsage.IMPLICITLY_DISABLED;
+    private boolean enabled = true;
     private boolean hasJvmArgs;
     private boolean foreground;
     private boolean stop;
@@ -66,9 +66,12 @@ public boolean isInteractive() {
         return interactive;
     }
 
-    public DaemonParameters setEnabled(boolean enabled) {
-        daemonUsage = enabled ? DaemonUsage.EXPLICITLY_ENABLED : DaemonUsage.EXPLICITLY_DISABLED;
-        return this;
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
     }
 
     public File getBaseDir() {
@@ -156,10 +159,6 @@ public boolean getDebug() {
         return jvmOptions.getDebug();
     }
 
-    public DaemonUsage getDaemonUsage() {
-        return daemonUsage;
-    }
-
     public boolean isForeground() {
         return foreground;
     }

diff --git a/subprojects/launcher/src/main/java/org/gradle/launcher/daemon/configuration/DaemonUsage.java b/subprojects/launcher/src/main/java/org/gradle/launcher/daemon/configuration/DaemonUsage.java
diff --git a/subprojects/launcher/src/main/java/org/gradle/launcher/exec/BuildActionParameters.java b/subprojects/launcher/src/main/java/org/gradle/launcher/exec/BuildActionParameters.java
@@ -17,7 +17,6 @@
 
 import org.gradle.api.logging.LogLevel;
 import org.gradle.internal.classpath.ClassPath;
-import org.gradle.launcher.daemon.configuration.DaemonUsage;
 
 import java.io.File;
 import java.util.Map;
@@ -31,7 +30,7 @@ public interface BuildActionParameters {
 
     LogLevel getLogLevel();
 
-    DaemonUsage getDaemonUsage();
+    boolean isUseDaemon();
 
     boolean isContinuous();
 

diff --git a/...cher/src/main/java/org/gradle/launcher/exec/DaemonUsageSuggestingBuildActionExecuter.java b/...cher/src/main/java/org/gradle/launcher/exec/DaemonUsageSuggestingBuildActionExecuter.java