summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNico Weber <thakis@chromium.org>2014-05-13 19:35:52 (GMT)
committerNico Weber <thakis@chromium.org>2014-05-13 19:37:31 (GMT)
commit47993664be821df46b009d3e48d251e6266cefc9 (patch)
treead5d847c6aa2ff4efc92eec7caad75a9fa300d32 /src
parent6c9a54649d4eec45f58e117612a34a2c214a0214 (diff)
downloadNinja-47993664be821df46b009d3e48d251e6266cefc9.zip
Ninja-47993664be821df46b009d3e48d251e6266cefc9.tar.gz
Ninja-47993664be821df46b009d3e48d251e6266cefc9.tar.bz2
wip for console pool on windows
Diffstat (limited to 'src')
-rw-r--r--src/manifest_parser.cc4
-rw-r--r--src/subprocess-posix.cc2
-rw-r--r--src/subprocess-win32.cc24
-rw-r--r--src/subprocess.h5
4 files changed, 18 insertions, 17 deletions
diff --git a/src/manifest_parser.cc b/src/manifest_parser.cc
index a566eda..6fa4f7c 100644
--- a/src/manifest_parser.cc
+++ b/src/manifest_parser.cc
@@ -317,10 +317,6 @@ bool ManifestParser::ParseEdge(string* err) {
Pool* pool = state_->LookupPool(pool_name);
if (pool == NULL)
return lexer_.Error("unknown pool name '" + pool_name + "'", err);
-#ifdef _WIN32
- if (pool == &State::kConsolePool)
- return lexer_.Error("console pool unsupported on Windows", err);
-#endif
edge->pool_ = pool;
}
diff --git a/src/subprocess-posix.cc b/src/subprocess-posix.cc
index 793d48f..7311f64 100644
--- a/src/subprocess-posix.cc
+++ b/src/subprocess-posix.cc
@@ -84,6 +84,8 @@ bool Subprocess::Start(SubprocessSet* set, const string& command) {
error_pipe = 2;
close(output_pipe[1]);
}
+ // In the console case, child_pipe is still inherited by the child and
+ // closed when the subprocess finishes, which then notifies ninja.
execl("/bin/sh", "/bin/sh", "-c", command.c_str(), (char *) NULL);
} while (false);
diff --git a/src/subprocess-win32.cc b/src/subprocess-win32.cc
index c9607e1..c71f95b 100644
--- a/src/subprocess-win32.cc
+++ b/src/subprocess-win32.cc
@@ -21,7 +21,9 @@
#include "util.h"
-Subprocess::Subprocess() : child_(NULL) , overlapped_(), is_reading_(false) {
+Subprocess::Subprocess(bool use_console) : child_(NULL) , overlapped_(),
+ is_reading_(false),
+ use_console_(use_console) {
}
Subprocess::~Subprocess() {
@@ -87,10 +89,14 @@ bool Subprocess::Start(SubprocessSet* set, const string& command) {
STARTUPINFOA startup_info;
memset(&startup_info, 0, sizeof(startup_info));
startup_info.cb = sizeof(STARTUPINFO);
- startup_info.dwFlags = STARTF_USESTDHANDLES;
- startup_info.hStdInput = nul;
- startup_info.hStdOutput = child_pipe;
- startup_info.hStdError = child_pipe;
+ if (!use_console_) {
+ startup_info.dwFlags = STARTF_USESTDHANDLES;
+ startup_info.hStdInput = nul;
+ startup_info.hStdOutput = child_pipe;
+ startup_info.hStdError = child_pipe;
+ }
+ // In the console case, child_pipe is still inherited by the child and closed
+ // when the subprocess finishes, which then notifies ninja.
PROCESS_INFORMATION process_info;
memset(&process_info, 0, sizeof(process_info));
@@ -215,9 +221,7 @@ BOOL WINAPI SubprocessSet::NotifyInterrupted(DWORD dwCtrlType) {
}
Subprocess *SubprocessSet::Add(const string& command, bool use_console) {
- assert(!use_console); // We don't support this yet on Windows.
-
- Subprocess *subprocess = new Subprocess;
+ Subprocess *subprocess = new Subprocess(use_console);
if (!subprocess->Start(this, command)) {
delete subprocess;
return 0;
@@ -269,7 +273,9 @@ Subprocess* SubprocessSet::NextFinished() {
void SubprocessSet::Clear() {
for (vector<Subprocess*>::iterator i = running_.begin();
i != running_.end(); ++i) {
- if ((*i)->child_) {
+ // Since the foreground process is in our process group, it will receive a
+ // SIGINT at the same time as us. XXX is this true on windows?
+ if ((*i)->child_ && !(*i)->use_console_) {
if (!GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT,
GetProcessId((*i)->child_))) {
Win32Fatal("GenerateConsoleCtrlEvent");
diff --git a/src/subprocess.h b/src/subprocess.h
index 6ea6f62..b7a1a4c 100644
--- a/src/subprocess.h
+++ b/src/subprocess.h
@@ -44,14 +44,13 @@ struct Subprocess {
const string& GetOutput() const;
private:
+ Subprocess(bool use_console);
bool Start(struct SubprocessSet* set, const string& command);
void OnPipeReady();
string buf_;
#ifdef _WIN32
- Subprocess();
-
/// Set up pipe_ as the parent-side pipe of the subprocess; return the
/// other end of the pipe, usable in the child process.
HANDLE SetupPipe(HANDLE ioport);
@@ -62,8 +61,6 @@ struct Subprocess {
char overlapped_buf_[4 << 10];
bool is_reading_;
#else
- Subprocess(bool use_console);
-
int fd_;
pid_t pid_;
#endif