Add options to disable multithreading to the CLI.

Author: Dadoum

frontends/cli/source/cli_frontend.d

@@ -6,6 +6,7 @@ import std.array;
 import std.datetime;
 import std.exception;
 import std.format;
+import std.parallelism;
 import std.path;
 import std.process;
 import std.stdio;
@@ -225,6 +226,7 @@ int entryPoint(Commands commands)
         setlocale(LC_ALL, "");
     }
 
+    defaultPoolThreads = commands.threadCount;
     configureLoggingProvider(new shared DefaultProvider(true, commands.debug_ ? Levels.DEBUG : Levels.INFO));
 
     try
@@ -252,6 +254,9 @@ struct Commands
     @(NamedArgument("d", "debug").Description("Enable debug logging"))
     bool debug_;
 
+    @(NamedArgument("thread-count").Description("Numbers of threads to be used for signing the application bundle"))
+    uint threadCount = uint.max;
+
     @SubCommands
     SumType!(AppIdCommand, CertificateCommand, InstallCommand, SignCommand, TeamCommand, ToolCommand, VersionCommand) cmd;
 }

frontends/cli/source/install.d

@@ -24,6 +24,9 @@ struct InstallCommand
     @(NamedArgument("udid").Description("UDID of the device (if multiple are available)."))
     string udid = null;
 
+    @(NamedArgument("singlethread").Description("Run the signature process on a single thread. Sacrifices speed for more consistency."))
+    bool singlethreaded;
+
     int opCall()
     {
         Application app = openApp(appPath);
@@ -67,7 +70,7 @@ struct InstallCommand
             message = action;
             progressBar.index = cast(int) (progress * 100);
             progressBar.update();
-        });
+        }, !singlethreaded);
         progressBar.finish();
 
         return 0;

frontends/cli/source/sign.d

@@ -28,6 +28,9 @@ struct SignCommand
     @(NamedArgument("m", "provision").Description("App's provisioning certificate.").Required())
     string mobileProvisionPath;
 
+    @(NamedArgument("singlethread").Description("Run the signature process on a single thread. Sacrifices speed for more consistency."))
+    bool singlethreaded;
+
     @(PositionalArgument(0, "app path").Description("App path."))
     string appFolder;
 
@@ -54,11 +57,12 @@ struct SignCommand
         sideloadSign(
             app,
             new CertificateIdentity(certificate, privateKey),
-                [app.bundleIdentifier(): ProvisioningProfile("", "", mobileProvisionFile)], // TODO make a better ctor
-                (p) {
+            [app.bundleIdentifier(): ProvisioningProfile("", "", mobileProvisionFile)], // TODO make a better ctor
+            (p) {
                 progressBar.index = cast(int) (progress += p * 100);
                 progressBar.update();
-            }
+            },
+            !singlethreaded
         );
         progressBar.finish();
 

source/sideload/package.d

@@ -30,6 +30,7 @@ void sideloadFull(
     DeveloperSession developer,
     Application app,
     void delegate(double progress, string action) progressCallback,
+    bool isMultithreaded = true,
 ) {
     enum STEP_COUNT = 9.0;
     auto log = getLogger();

source/sideload/sign.d

@@ -33,6 +33,7 @@ Tuple!(PlistDict, PlistDict) sign(
     CertificateIdentity identity,
     ProvisioningProfile[string] provisioningProfiles,
     void delegate(double progress) addProgress,
+    bool isMultithreaded = true,
     string teamId = null,
     MDxHashFunction sha1Hasher = null,
     MDxHashFunction sha2Hasher = null,
@@ -83,12 +84,13 @@ Tuple!(PlistDict, PlistDict) sign(
     size_t stepCount = subBundles.length + 2;
     const double stepSize = 1.0 / stepCount;
 
-    auto subBundlesTask = task({
+    void signSubBundles() {
         foreach (subBundle; parallel(subBundles)) {
             auto bundleFiles = subBundle.sign(
                 identity,
                 provisioningProfiles,
-                (double progress) => addProgress(progress * stepSize),
+                    (double progress) => addProgress(progress * stepSize),
+                isMultithreaded,
                 teamId,
                 sha1HasherParallel.get(),
                 sha2HasherParallel.get()
@@ -144,8 +146,13 @@ Tuple!(PlistDict, PlistDict) sign(
             addFile("_CodeSignature".buildPath("CodeResources"));
             addFile(subBundle.appInfo["CFBundleExecutable"].str().native());
         }
-    });
-    subBundlesTask.executeInNewThread();
+    }
+
+    typeof(task(&signSubBundles)) subBundlesTask;
+    if (isMultithreaded) {
+        subBundlesTask = task(&signSubBundles);
+        subBundlesTask.executeInNewThread();
+    }
 
     log.debugF!"Signing bundle %s..."(baseName(bundleFolder));
 
@@ -242,7 +249,9 @@ Tuple!(PlistDict, PlistDict) sign(
     // too lazy yet to add better progress tracking
     addProgress(stepSize);
 
-    subBundlesTask.yieldForce();
+    if (isMultithreaded) {
+        subBundlesTask.yieldForce();
+    }
 
     log.debug_("Making CodeResources...");
     string codeResources = dict(