mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-04 23:05:47 +02:00
Code Issues Wiki Activity

refactor ProcessFactory.java to put all process creations in one function. (#188)

Browse source 
* refactor ProcessFactory.java to put all process creations in one function.

Prerequisite of #187

* add missing $NON-NLS$ tags
This commit is contained in:
徐持恒 Xu Chiheng 2022-12-04 01:06:28 +08:00 • committed by GitHub
parent f41d5ff25b
commit 9114ac3ff2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 101 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

153
core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/spawner/ProcessFactory.java
View file

@ -17,6 +17,7 @@ package org.eclipse.cdt.utils.spawner;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.StringTokenizer;
import org.eclipse.cdt.internal.core.natives.CNativePlugin; import org.eclipse.cdt.internal.core.natives.CNativePlugin;
import org.eclipse.cdt.internal.core.natives.Messages; import org.eclipse.cdt.internal.core.natives.Messages;
@ -31,7 +32,82 @@ public class ProcessFactory {
static private ProcessFactory instance; static private ProcessFactory instance;
private boolean hasSpawner; private boolean hasSpawner;
private Runtime runtime; private Runtime runtime;
private final static String FLATPAK_CMD = "flatpak-spawn --host --watch-bus "; //$NON-NLS-1$
private class Builder {
String[] cmdarray;
String[] envp;
File dir;
boolean use_pty;
PTY pty;
boolean has_gracefulExitTimeMs;
int gracefulExitTimeMs;
public Builder(String cmd) throws IOException {
if (cmd.isEmpty()) {
throw new IllegalArgumentException("Empty command"); //$NON-NLS-1$
}
StringTokenizer st = new StringTokenizer(cmd);
this.cmdarray = new String[st.countTokens()];
for (int i = 0; st.hasMoreTokens(); i++)
this.cmdarray[i] = st.nextToken();
}
public Builder(String[] cmdarray) throws IOException {
if (cmdarray.length == 0 || cmdarray[0].isEmpty()) {
throw new IllegalArgumentException("Empty command"); //$NON-NLS-1$
}
this.cmdarray = cmdarray;
}
public Builder environment(String[] envp) {
this.envp = envp;
return this;
}
public Builder directory(File directory) {
this.dir = directory;
return this;
}
public Builder pty(PTY pty) {
this.use_pty = true;
this.pty = pty;
return this;
}
public Builder gracefulExitTimeMs(int gracefulExitTimeMs) {
this.has_gracefulExitTimeMs = true;
this.gracefulExitTimeMs = gracefulExitTimeMs;
return this;
}
public Process start() throws IOException {
cmdarray = modifyCmdArrayIfFlatpak(cmdarray);
Process p;
if (hasSpawner) {
if (use_pty) {
if (has_gracefulExitTimeMs) {
p = new Spawner(cmdarray, envp, dir, pty, gracefulExitTimeMs);
} else {
p = new Spawner(cmdarray, envp, dir, pty);
}
} else {
if (has_gracefulExitTimeMs) {
p = new Spawner(cmdarray, envp, dir, gracefulExitTimeMs);
} else {
p = new Spawner(cmdarray, envp, dir);
}
}
} else {
if (use_pty || has_gracefulExitTimeMs) {
throw new UnsupportedOperationException(Messages.Util_exception_cannotCreatePty);
} else {
p = runtime.exec(cmdarray, envp, dir);
}
}
return p;
}
}
private ProcessFactory() { private ProcessFactory() {
hasSpawner = false; hasSpawner = false;
@ -63,44 +139,34 @@ public class ProcessFactory {
*/ */
@Deprecated @Deprecated
public Process exec(String cmd) throws IOException { public Process exec(String cmd) throws IOException {
cmd = modifyCmdIfFlatpak(cmd); Process p = new Builder(cmd).start();
if (hasSpawner) return p;
return new Spawner(cmd);
return runtime.exec(cmd);
} }
public Process exec(String[] cmdarray) throws IOException { public Process exec(String[] cmdarray) throws IOException {
cmdarray = modifyCmdArrayIfFlatpak(cmdarray); Process p = new Builder(cmdarray).start();
if (hasSpawner) return p;
return new Spawner(cmdarray);
return runtime.exec(cmdarray);
} }
/** /**
* @since 6.2 * @since 6.2
*/ */
public Process exec(String[] cmdarray, int gracefulExitTimeMs) throws IOException { public Process exec(String[] cmdarray, int gracefulExitTimeMs) throws IOException {
cmdarray = modifyCmdArrayIfFlatpak(cmdarray); Process p = new Builder(cmdarray).gracefulExitTimeMs(gracefulExitTimeMs).start();
if (hasSpawner) return p;
return new Spawner(cmdarray, gracefulExitTimeMs);
return runtime.exec(cmdarray);
} }
public Process exec(String[] cmdarray, String[] envp) throws IOException { public Process exec(String[] cmdarray, String[] envp) throws IOException {
cmdarray = modifyCmdArrayIfFlatpak(cmdarray); Process p = new Builder(cmdarray).environment(envp).start();
if (hasSpawner) return p;
return new Spawner(cmdarray, envp);
return runtime.exec(cmdarray, envp);
} }
/** /**
* @since 6.2 * @since 6.2
*/ */
public Process exec(String[] cmdarray, String[] envp, int gracefulExitTimeMs) throws IOException { public Process exec(String[] cmdarray, String[] envp, int gracefulExitTimeMs) throws IOException {
cmdarray = modifyCmdArrayIfFlatpak(cmdarray); Process p = new Builder(cmdarray).environment(envp).gracefulExitTimeMs(gracefulExitTimeMs).start();
if (hasSpawner) return p;
return new Spawner(cmdarray, envp, gracefulExitTimeMs);
return runtime.exec(cmdarray, envp);
} }
/** /**
@ -108,10 +174,8 @@ public class ProcessFactory {
*/ */
@Deprecated @Deprecated
public Process exec(String cmd, String[] envp) throws IOException { public Process exec(String cmd, String[] envp) throws IOException {
cmd = modifyCmdIfFlatpak(cmd); Process p = new Builder(cmd).environment(envp).start();
if (hasSpawner) return p;
return new Spawner(cmd, envp);
return runtime.exec(cmd, envp);
} }
/** /**
@ -119,34 +183,27 @@ public class ProcessFactory {
*/ */
@Deprecated @Deprecated
public Process exec(String cmd, String[] envp, File dir) throws IOException { public Process exec(String cmd, String[] envp, File dir) throws IOException {
cmd = modifyCmdIfFlatpak(cmd); Process p = new Builder(cmd).environment(envp).directory(dir).start();
if (hasSpawner) return p;
return new Spawner(cmd, envp, dir);
return runtime.exec(cmd, envp, dir);
} }
public Process exec(String cmdarray[], String[] envp, File dir) throws IOException { public Process exec(String cmdarray[], String[] envp, File dir) throws IOException {
cmdarray = modifyCmdArrayIfFlatpak(cmdarray); Process p = new Builder(cmdarray).environment(envp).directory(dir).start();
if (hasSpawner) return p;
return new Spawner(cmdarray, envp, dir);
return runtime.exec(cmdarray, envp, dir);
} }
/** /**
* @since 6.2 * @since 6.2
*/ */
public Process exec(String cmdarray[], String[] envp, File dir, int gracefulExitTimeMs) throws IOException { public Process exec(String cmdarray[], String[] envp, File dir, int gracefulExitTimeMs) throws IOException {
cmdarray = modifyCmdArrayIfFlatpak(cmdarray); Process p = new Builder(cmdarray).environment(envp).directory(dir).gracefulExitTimeMs(gracefulExitTimeMs)
if (hasSpawner) .start();
return new Spawner(cmdarray, envp, dir, gracefulExitTimeMs); return p;
return runtime.exec(cmdarray, envp, dir);
} }
public Process exec(String cmdarray[], String[] envp, File dir, PTY pty) throws IOException { public Process exec(String cmdarray[], String[] envp, File dir, PTY pty) throws IOException {
cmdarray = modifyCmdArrayIfFlatpak(cmdarray); Process p = new Builder(cmdarray).environment(envp).directory(dir).pty(pty).start();
if (hasSpawner) return p;
return new Spawner(cmdarray, envp, dir, pty);
throw new UnsupportedOperationException(Messages.Util_exception_cannotCreatePty);
} }
/** /**
@ -154,17 +211,9 @@ public class ProcessFactory {
*/ */
public Process exec(String cmdarray[], String[] envp, File dir, PTY pty, int gracefulExitTimeMs) public Process exec(String cmdarray[], String[] envp, File dir, PTY pty, int gracefulExitTimeMs)
throws IOException { throws IOException {
cmdarray = modifyCmdArrayIfFlatpak(cmdarray); Process p = new Builder(cmdarray).environment(envp).directory(dir).pty(pty)
if (hasSpawner) .gracefulExitTimeMs(gracefulExitTimeMs).start();
return new Spawner(cmdarray, envp, dir, pty, gracefulExitTimeMs); return p;
throw new UnsupportedOperationException(Messages.Util_exception_cannotCreatePty);
}
private String modifyCmdIfFlatpak(String cmd) {
if (System.getenv("FLATPAK_SANDBOX_DIR") != null) { //$NON-NLS-1$
cmd = FLATPAK_CMD + cmd;
}
return cmd;
} }
private String[] modifyCmdArrayIfFlatpak(String[] cmdarray) { private String[] modifyCmdArrayIfFlatpak(String[] cmdarray) {