Add a Kill() function to the Program class.

llvm-svn: 81246

llvm/include/llvm/System/Program.h

@@ -30,7 +30,7 @@ namespace sys {
   /// @brief An abstraction for finding and executing programs.
   class Program {
     /// Opaque handle for target specific data.
-	void *Data;
+    void *Data;
 
     unsigned Pid_;
 
@@ -43,7 +43,7 @@ namespace sys {
   public:
 
     Program();
-	~Program();
+    ~Program();
 
     /// Return process ID of this program.
     unsigned GetPid() { return Pid_; }
@@ -103,6 +103,17 @@ namespace sys {
       ///< program.
       );
 
+    /// This function terminates the program.
+    /// @returns true if an error occured.
+    /// @see Execute
+    /// @brief Terminates the program.
+    bool Kill
+    ( std::string* ErrMsg = 0 ///< If non-zero, provides a pointer to a string
+      ///< instance in which error messages will be returned. If the string
+      ///< is non-empty upon return an error occurred while invoking the
+      ///< program.
+      );
+
     /// This static constructor (factory) will attempt to locate a program in
     /// the operating system's file system using some pre-determined set of
     /// locations to search (e.g. the PATH on Unix).

llvm/lib/System/Unix/Program.inc

@@ -283,6 +283,16 @@ Program::Wait(unsigned secondsToWait,
 
 }
 
+bool
+Program::Kill(std::string* ErrMsg) {
+  if (Pid_ == 0) {
+    MakeErrMsg(ErrMsg, "Process not started!");
+    return true;
+  }
+
+  return (kill(Pid_, SIGKILL) == 0);
+}
+
 bool Program::ChangeStdinToBinary(){
   // Do nothing, as Unix doesn't differentiate between text and binary.
   return false;

llvm/lib/System/Win32/Program.inc

@@ -28,11 +28,11 @@ using namespace sys;
 Program::Program() : Pid_(0), Data(0) {}
 
 Program::~Program() {
-	if (Data) {
+  if (Data) {
-		HANDLE hProcess = (HANDLE) Data;
+    HANDLE hProcess = (HANDLE) Data;
-		CloseHandle(hProcess);
+    CloseHandle(hProcess);
-		Data = 0;
+    Data = 0;
-	}
+  }
 }
 
 // This function just uses the PATH environment variable to find the program.
@@ -335,6 +335,17 @@ Program::Wait(unsigned secondsToWait,
   return status;
 }
 
+bool
+Program::Kill(std::string* ErrMsg) {
+  if (Data == 0) {
+    MakeErrMsg(ErrMsg, "Process not started!");
+    return true;
+  }
+
+  HANDLE hProcess = reinterpret_cast<HANDLE>(Data);
+  return TerminateProcess(hProcess, 1);
+}
+
 bool Program::ChangeStdinToBinary(){
   int result = _setmode( _fileno(stdin), _O_BINARY );
   return result == -1;