Update: Improved execution by changing from executeShell -> executeProcess thus halving number of processes

Author: MrcSnm

source/redub/api.d

@@ -449,7 +449,7 @@ ProjectDetails[] buildProjectUniversal(ArgsDetails args)
         ProjectDetails[] ret;
         ArgsDetails other = args;
 
-        string lipoRun = "lipo -create ";
+        string[] lipoRun = ["lipo", "-create"];
         string oldTargetName;
         foreach(arch; archs)
         {
@@ -460,15 +460,15 @@ ProjectDetails[] buildProjectUniversal(ArgsDetails args)
             d.tree.requirements.cfg.targetName~= "-"~arch;
             d = buildProject(d);
             ret~= d;
-            lipoRun~= " " ~ d.getOutputFile();
+            lipoRun~= d.getOutputFile();
         }
 
         ret[0].tree.requirements.cfg.targetName = oldTargetName~"-osx-universal";
-        lipoRun~= " -output "~ret[0].getOutputFile();
+        lipoRun~= ["-output", ret[0].getOutputFile()];
         ret[0].tree.requirements.cfg.targetName = oldTargetName~"-"~archs[0];
 
         vvlog(lipoRun);
-        auto res = executeShell(lipoRun);
+        auto res = execute(lipoRun, getRedubEnv);
         if(res.status)
             throw new BuildException(res.output);
 

source/redub/buildapi.d

@@ -7,7 +7,7 @@ import redub.package_searching.api;
 
 
 ///vX.X.X
-enum RedubVersionOnly = "v1.26.2";
+enum RedubVersionOnly = "v1.26.3";
 ///Redub vX.X.X
 enum RedubVersionShort = "Redub "~RedubVersionOnly;
 ///Redub vX.X.X - Description

source/redub/building/utils.d

@@ -3,13 +3,17 @@ import redub.buildapi;
 public import redub.misc.shell;
 import core.sys.posix.sys.ioctl;
 
-string getHighPriorityCmd()
+string[] getHighPriorityCmd(string[] compileFlags)
 {
     version(Posix)
     {
-        return "nice -n 0 ";
+        import std.array;
+        string[] ret = new string[compileFlags.length + 3];
+        ret[0..3] = ["nice", "-n", "0"].staticArray;
+        ret[3..$] = compileFlags;
+        return ret;
     }
-    else return "";
+    return compileFlags;
 }
 
 ProcessExec2 execCompiler(const BuildConfiguration cfg, Compiler compiler, string[] compileFlags, out string compilationCommands, bool hasHighPriority, out string cmdFile, const string[string] env)
@@ -27,7 +31,7 @@ ProcessExec2 execCompiler(const BuildConfiguration cfg, Compiler compiler, strin
     {
         cmdFile = createCommandFile(cfg, compileFlags, compilationCommands);
         compilationCommands = compilerBin ~ " "~compilationCommands;
-        ProcessExec2 ret = executeShell2(compilerBin~ " @"~cmdFile, env, Config.none, size_t.max, cfg.workingDir);
+        ProcessExec2 ret = executeProcess2([compilerBin, "@"~cmdFile], env, Config.none, size_t.max, cfg.workingDir);
 
         version(Windows)
         {
@@ -37,11 +41,10 @@ ProcessExec2 execCompiler(const BuildConfiguration cfg, Compiler compiler, strin
                 SetPriorityClass(ret.pipe.pid.osHandle, REALTIME_PRIORITY_CLASS);
             }
         }
-
         return ret;
     }
     compilationCommands = escapeCompilationCommands(compilerBin, compileFlags);
-    return executeShell2(getHighPriorityCmd ~ compilationCommands, env, Config.none, size_t.max, cfg.workingDir);
+    return executeProcess2(cast(const(char)[][])getHighPriorityCmd(compileFlags), env, Config.none, size_t.max, cfg.workingDir);
 }
 
 
@@ -115,5 +118,5 @@ auto executeArchiver(const ThreadBuildData data, CompilingSession s, string main
 
     putSourceFiles(cmd, null, [cacheDir], data.cfg.sourceFiles, data.cfg.excludeSourceFiles, ".o", ".obj");
 
-    return executeShell(escapeShellCommand(cmd), data.env);
+    return execute(cmd, data.env);
 }

source/redub/extensions/update.d

@@ -47,7 +47,7 @@ int updateMain(string[] args)
     }
     setLogLevel(update.vverbose ? LogLevel.vverbose : LogLevel.info);
 
-    int gitCode = executeShell("git --help").status;
+    int gitCode = execute(["git", "--help"]).status;
     enum isNotGitRepo = 128;
     enum hasNoGitWindows = 9009;
     enum hasNoGitPosix = 127;
@@ -56,7 +56,7 @@ int updateMain(string[] args)
 
     if(gitCode == 0 && !update.noPull)
     {
-        auto ret = executeShell("git pull", null, Config.none, size_t.max, redubPath);
+        auto ret = execute(["git", "pull"], null, Config.none, size_t.max, redubPath);
         gitCode = ret.status;
         if(gitCode != 0 && gitCode != isNotGitRepo)
         {

source/redub/misc/_7zip.d

@@ -47,7 +47,7 @@ bool extract7ZipToFolder(string zPath, string outputDirectory)
     chdir(outputDirectory);
     scope(exit)
         chdir(dir);
-    auto res = executeShell(_7z ~ " x -y "~zPath);
+    auto res = execute([_7z, "x", "-y",zPath]);
     if(res.status)
         error("Could not extract 7z '", zPath, "' to '", outputDirectory, "': ", res.output);
     return res.status == 0;

source/redub/misc/shell.d

@@ -9,23 +9,21 @@ struct ProcessExec2
     Appender!string output;
 }
 
-ProcessExec2 executeShell2(scope const(char)[] command,
+ProcessExec2 executeProcess2(scope const(char)[][] command,
                   const string[string] env = null,
                   Config config = Config.none,
                   size_t maxOutput = size_t.max,
-                  scope const(char)[] workDir = null,
-                  string shellPath = nativeShell)
+                  scope const(char)[] workDir = null)
     @safe
 {
-    return executeImpl!pipeShell(command,
+    return executeImpl!pipeProcess(command,
                                  env,
                                  config,
                                  maxOutput,
-                                 workDir,
-                                 shellPath);
+                                 workDir);
 }
 
-// Does the actual work for execute() and executeShell().
+// Does the actual work for execute() and executeProcess().
 private ProcessExec2 executeImpl(alias pipeFunc, Cmd, ExtraPipeFuncArgs...)(
     Cmd commandLine,
     const string[string] env = null,

source/redub/misc/unzip.d

@@ -57,7 +57,7 @@ bool extractTarGzToFolder(string tarGzPath, string outputDirectory)
 	}
 	info("Extracting ", tarGzPath, " to ", outputDirectory);
 	std.file.mkdirRecurse(outputDirectory);
-    auto res = executeShell("tar -xf "~tarGzPath~" -C "~outputDirectory);
+    auto res = execute(["tar", "-xf", tarGzPath, "-C", outputDirectory]);
     if(res.status)
         error("Could not extract '",tarGzPath, "' to '", outputDirectory, "': ", res.output);
 	return res.status == 0;

source/redub/tooling/archiver_identification.d

@@ -58,9 +58,9 @@ Archiver getArchiver(AcceptedArchiver archiver, const string[string] env)
         if(binPath)
             return Archiver(archiver, binPath.str);
     }
-    string help = " --help";
-    if(archiver == AcceptedArchiver.llvmLib || archiver == AcceptedArchiver.lib) help = " /help";
-    auto res = executeShell(archiver~help, env);
+    string help = "--help";
+    if(archiver == AcceptedArchiver.llvmLib || archiver == AcceptedArchiver.lib) help = "/help";
+    auto res = execute([archiver, help], env);
     if(res.status == 0)
     {
         Archiver arch = Archiver(archiver, findExecutable(archiver));

source/redub/tooling/compilers_inference.d

@@ -23,7 +23,7 @@ public void saveGlobalCompiler(string compilerPath, JSONValue compilersInfo, boo
 
     CompilerBinary ret;
     string actualCompiler;
-    auto res = executeShell(compilerPath~" --version", getRedubEnv());
+    auto res = execute([compilerPath, "--version"], getRedubEnv());
     if(res.status)
         throw new Exception("saveGlobalCompiler was called in an inexistent compiler.");
     foreach(inf; isC ? cCompilersInference : dCompilersInference)
@@ -114,7 +114,7 @@ CompilerBinary inferCompiler(string compilerOrPath, string compilerAssumption, J
  * Params:
  *   preferredCompiler = The compiler that the user may have specified.
  *   actualCompiler = Actual compiler. If no compiler is found on the searchable list, the program will exit.
- * Returns: The output from executeShell. This will be processed for getting version information on the compiler.
+ * Returns: The output from executeProcess. This will be processed for getting version information on the compiler.
  */
 private string getActualCompilerToUse(string preferredCompiler, ref string actualCompiler, const string[] searchableCompilers, out bool isError)
 {
@@ -136,11 +136,9 @@ private string getActualCompilerToUse(string preferredCompiler, ref string actua
         else
             preferredTested = true;
 
-        string versionCommand = searchable;
-        if(searchable.baseName.stripExtension != "cl")
-            versionCommand~= " --version";
-
-        compVersionRes = executeShell(versionCommand, getRedubEnv());
+        string[2] versionCommand = [searchable, "--version"];
+        size_t args = searchable.baseName.stripExtension != "cl" ? 2 : 1;
+        compVersionRes = execute(versionCommand[0..args], getRedubEnv());
         if(compVersionRes.status == 0)
         {
             actualCompiler = searchable;

source/redub/tooling/linker_identification.d

@@ -38,7 +38,7 @@ AcceptedLinker getDefaultLinker()
         {
             import std.process;
             import std.string;
-            auto res = executeShell("ld -v");
+            auto res = execute(["ld", "-v"]);
             if(res.status == 0)
             {
                 if(res.output.startsWith("GNU ld"))