"Fix" to Compile on OS X as well as "Waiting on" messages from todo list

src/ninja.cc

@@ -29,6 +29,7 @@
 #include "graphviz.h"
 
 // Import browse.py as binary data.
+#if !defined(__APPLE__)
 asm(
 ".data\n"
 "browse_data_begin:\n"
@@ -38,6 +39,7 @@ asm(
 // Declare the symbols defined above.
 extern const char browse_data_begin[];
 extern const char browse_data_end[];
+#endif
 
 option options[] = {
   { "help", no_argument, NULL, 'h' },
@@ -130,6 +132,10 @@ int CmdQuery(State* state, int argc, char* argv[]) {
 }
 
 int CmdBrowse(State* state, int argc, char* argv[]) {
+#if defined(__APPLE__)
+  printf("Error: browse not supported in mac OS X\n");
+  return 1;
+#else
   // Create a temporary file, dump the Python code into it, and
   // delete the file, keeping our open handle to it.
   char tmpl[] = "browsepy-XXXXXX";
@@ -151,6 +157,7 @@ int CmdBrowse(State* state, int argc, char* argv[]) {
   // If we get here, the exec failed.
   printf("ERROR: Failed to spawn python for graph browsing, aborting.\n");
   return 1;
+#endif
 }
 
 int main(int argc, char** argv) {

src/subprocess.cc

@@ -41,6 +41,8 @@ Subprocess::~Subprocess() {
 }
 
 bool Subprocess::Start(const string& command) {
+  command_ = command;
+
   int stdout_pipe[2];
   if (pipe(stdout_pipe) < 0)
     Fatal("pipe: %s", strerror(errno));
@@ -154,12 +156,26 @@ void SubprocessSet::DoWork() {
     }
   }
 
-  int ret = poll(fds.data(), fds.size(), -1);
+  int ret = poll(fds.data(), fds.size(), POLL_TIMEOUT);
   if (ret == -1) {
     if (errno != EINTR)
       perror("poll");
     return;
   }
+  else if (ret == 0) {
+    fprintf(stderr, "\nStill waiting on\n");
+    for (vector<Subprocess*>::iterator i = running_.begin();
+       i != running_.end(); ++i) {
+        fprintf(stderr, "\t%s\n", (*i)->get_command().c_str());
+    }
+
+    ret = poll(fds.data(), fds.size(), -1);
+    if(ret == -1) {
+      if (errno != EINTR)
+        perror("poll");
+      return;
+    }
+  }
 
   for (size_t i = 0; i < fds.size(); ++i) {
     if (fds[i].revents) {

src/subprocess.h

@@ -17,6 +17,8 @@
 #include <queue>
 using namespace std;
 
+const int POLL_TIMEOUT = 1000;
+
 // Subprocess wraps a single async subprocess.  It is entirely
 // passive: it expects the caller to notify it when its fds are ready
 // for reading, as well as call Finish() to reap the child once done()
@@ -33,6 +35,10 @@ struct Subprocess {
     return stdout_.fd_ == -1 && stderr_.fd_ == -1;
   }
 
+  const string& get_command() const {
+    return command_;
+  }
+
   struct Stream {
     Stream();
     ~Stream();
@@ -41,6 +47,7 @@ struct Subprocess {
   };
   Stream stdout_, stderr_;
   pid_t pid_;
+  string command_;
 };
 
 // SubprocessSet runs a poll() loop around a set of Subprocesses.