summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2012-12-14 10:29:38 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2012-12-14 11:06:00 +1000
commit47f7797011c7c4f9d7bc5d06837c4a7891941ac0 (patch)
treece548720dfe9cefd172cd2903aa7cc89a7da864f
parentb19d74930587abfb8a3fb1d4afbf18949c10637b (diff)
process: drop a few SCOPED_TRACE
SCOPED_TRACE will only print if the current scope fails and this can never happen here. Change one message to standard printf, drop the others. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/process.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/process.cpp b/src/process.cpp
index 43ac0d6..af8b0f8 100644
--- a/src/process.cpp
+++ b/src/process.cpp
@@ -155,18 +155,15 @@ bool xorg::testing::Process::WaitForExit(unsigned int timeout) {
struct timespec sig_timeout = {timeout / 1000,
(timeout % 1000) * 1000000L};
- if (sigtimedwait(&sig_mask, NULL, &sig_timeout) != SIGCHLD && errno != EAGAIN) {
- SCOPED_TRACE("INFO: Failure waiting for SIGCHLD: " +
- std::string(strerror(errno)) + ". I slept instead.");
+ if (sigtimedwait(&sig_mask, NULL, &sig_timeout) != SIGCHLD && errno != EAGAIN)
usleep(timeout * 1000);
- }
if (!sigismember(&sig_mask, SIGCHLD)) {
if (sigprocmask(SIG_UNBLOCK, &sig_mask, NULL) == -1)
- SCOPED_TRACE("WARNING: Failed to unblock SIGCHLD. Tests may behave funny.\n");
+ std::cout << "WARNING: Failed to unblock SIGCHLD. Tests may behave funny.\n";
}
+
} else { /* oops, can't wait for SIGCHLD, sleep instead */
- SCOPED_TRACE("INFO: Failed to set SIGCHLD mask, sleeping instead.\n");
usleep(timeout * 1000);
}