Intermediate merge of debug-spew backout
authorChris Jones <jones.chris.g@gmail.com>
Tue, 26 Jan 2010 20:08:38 -0600
changeset 46602 065a181a71363bb6e7f28989e3b002d346bb3a4c
parent 46600 7a8fe3c399368ed9db2f266a4d86dd2a7c524243 (current diff)
parent 46601 557538492a354ea5ce541fa728e92b2a417f81bb (diff)
child 46604 d41ca0dfd03373a41403a8dd26445fd1f3d3dddc
push idunknown
push userunknown
push dateunknown
milestone1.9.3a1pre
Intermediate merge of debug-spew backout
ipc/chromium/src/chrome/common/process_watcher_posix_sigchld.cc
--- a/ipc/chromium/src/chrome/common/process_watcher_posix_sigchld.cc
+++ b/ipc/chromium/src/chrome/common/process_watcher_posix_sigchld.cc
@@ -117,35 +117,24 @@ protected:
     DCHECK(process_);
 
 
 
     printf("TEST-UNEXPECTED-FAIL | process %d busy-waiting on | child process %d\n", getpid(), process_);
 
 
 
-#if 0
-    HANDLE_EINTR(waitpid(process_, NULL, 0));
-#else
 
-    const int maxWaits = 30;
-    int waits = 0;
-    while (!IsProcessDead(process_) && ++waits < maxWaits)
-      sleep(1);
+    HANDLE_EINTR(waitpid(process_, NULL, 0));
+
 
-    if (waits < maxWaits) {
-      printf("TEST-UNEXPECTED-FAIL | process %d done busy-waiting on | child process %d\n", getpid(), process_);
-    }
-    else {
-      printf("TEST-UNEXPECTED-FAIL | process %d wait on | child process %d timed out!\n", getpid(), process_);
-      // kill the child in such a way that breakpad is triggered
-      kill(process_, SIGSEGV);
-      HANDLE_EINTR(waitpid(process_, NULL, 0));
-    }
-#endif
+
+
+    printf("TEST-UNEXPECTED-FAIL | process %d done busy-waiting on | child process %d\n", getpid(), process_);
+
 
 
 
   }
 
   pid_t process_;
 
 private: