Have Program::Wait return -2 for crashed and timeouts instead of embedding
info in the error message. Per Dan's request.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@131780 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Support/Unix/Program.inc b/lib/Support/Unix/Program.inc
index 86f3aa9..346baf1 100644
--- a/lib/Support/Unix/Program.inc
+++ b/lib/Support/Unix/Program.inc
@@ -298,8 +298,7 @@
int
Program::Wait(const sys::Path &path,
unsigned secondsToWait,
- std::string* ErrMsg,
- const char* SignalPrefix)
+ std::string* ErrMsg)
{
#ifdef HAVE_SYS_WAIT_H
struct sigaction Act, Old;
@@ -339,7 +338,7 @@
else
MakeErrMsg(ErrMsg, "Child timed out", 0);
- return -1; // Timeout detected
+ return -2; // Timeout detected
} else if (errno != EINTR) {
MakeErrMsg(ErrMsg, "Error waiting for child process");
return -1;
@@ -377,15 +376,15 @@
}
} else if (WIFSIGNALED(status)) {
if (ErrMsg) {
- if (SignalPrefix)
- *ErrMsg = SignalPrefix;
- *ErrMsg += strsignal(WTERMSIG(status));
+ *ErrMsg = strsignal(WTERMSIG(status));
#ifdef WCOREDUMP
if (WCOREDUMP(status))
*ErrMsg += " (core dumped)";
#endif
}
- return -1;
+ // Return a special value to indicate that the process received an unhandled
+ // signal during execution as opposed to failing to execute.
+ return -2;
}
return result;
#else