---

yaml
---
r: 57309
b: refs/heads/incoming
c: eebf29e
h: refs/heads/master
i:
  57307: 62c2dfb
v: v3

Author: gifnksm

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: bf67eb2362b7d0f37012f2d6dac604c3bbacd2c6
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: 483e95a35c9f3ab01666de4808134af26fded68c
+refs/heads/incoming: eebf29ed377189c111afe457be920b645835296c
 refs/heads/dist-snap: 00dbbd01c2aee72982b3e0f9511ae1d4428c3ba9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/libc.rs

@@ -863,7 +863,6 @@ pub mod consts {
             pub static F_TEST : int = 3;
             pub static F_TLOCK : int = 2;
             pub static F_ULOCK : int = 0;
-            pub static SIGKILL : int = 9;
         }
         pub mod posix01 {
         }
@@ -931,7 +930,6 @@ pub mod consts {
             pub static F_TEST : int = 3;
             pub static F_TLOCK : int = 2;
             pub static F_ULOCK : int = 0;
-            pub static SIGKILL : int = 9;
         }
         pub mod posix01 {
         }
@@ -1000,7 +998,6 @@ pub mod consts {
             pub static F_TEST : int = 3;
             pub static F_TLOCK : int = 2;
             pub static F_ULOCK : int = 0;
-            pub static SIGKILL : int = 9;
         }
         pub mod posix01 {
         }
@@ -1485,17 +1482,6 @@ pub mod funcs {
                              -> ssize_t;
             }
         }
-
-        #[nolink]
-        #[abi = "cdecl"]
-        pub mod signal {
-            use libc::types::os::arch::c95::{c_int};
-            use libc::types::os::arch::posix88::{pid_t};
-
-            pub extern {
-                unsafe fn kill(pid: pid_t, sig: c_int) -> c_int;
-            }
-        }
     }
 
     #[cfg(target_os = "linux")]
@@ -1637,7 +1623,6 @@ pub mod funcs {
     pub mod extra {
 
         pub mod kernel32 {
-            use libc::types::os::arch::c95::{c_uint};
             use libc::types::os::arch::extra::{BOOL, DWORD, HMODULE};
             use libc::types::os::arch::extra::{LPCWSTR, LPWSTR, LPTCH};
             use libc::types::os::arch::extra::{LPSECURITY_ATTRIBUTES};
@@ -1678,7 +1663,6 @@ pub mod funcs {
                                        findFileData: HANDLE)
                     -> BOOL;
                 unsafe fn FindClose(findFile: HANDLE) -> BOOL;
-                unsafe fn TerminateProcess(hProcess: HANDLE, uExitCode: c_uint) -> BOOL;
             }
         }
 

branches/incoming/src/libcore/run.rs

@@ -1,4 +1,4 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -44,13 +44,13 @@ pub trait Program {
     /// Returns the process id of the program
     fn get_id(&mut self) -> pid_t;
 
-    /// Returns an io::Writer that can be used to write to stdin
+    /// Returns an io::writer that can be used to write to stdin
     fn input(&mut self) -> @io::Writer;
 
-    /// Returns an io::Reader that can be used to read from stdout
+    /// Returns an io::reader that can be used to read from stdout
     fn output(&mut self) -> @io::Reader;
 
-    /// Returns an io::Reader that can be used to read from stderr
+    /// Returns an io::reader that can be used to read from stderr
     fn err(&mut self) -> @io::Reader;
 
     /// Closes the handle to the child processes standard input
@@ -62,10 +62,7 @@ pub trait Program {
      */
     fn finish(&mut self) -> int;
 
-    /**
-     * Forcibly terminate the program. On Posix OSs SIGKILL will be sent
-     * to the process. On Win32 TerminateProcess(..) will be called.
-     */
+    /// Closes open handles
     fn destroy(&mut self);
 }
 
@@ -175,14 +172,6 @@ fn with_dirp<T>(d: &Option<~str>,
     }
 }
 
-/// helper function that closes non-NULL files and then makes them NULL
-priv unsafe fn fclose_and_null(f: &mut *libc::FILE) {
-    if *f != 0 as *libc::FILE {
-        libc::fclose(*f);
-        *f = 0 as *libc::FILE;
-    }
-}
-
 /**
  * Spawns a process and waits for it to terminate
  *
@@ -203,9 +192,9 @@ pub fn run_program(prog: &str, args: &[~str]) -> int {
 }
 
 /**
- * Spawns a process and returns a Program
+ * Spawns a process and returns a program
  *
- * The returned value is a boxed class containing a <Program> object that can
+ * The returned value is a boxed class containing a <program> object that can
  * be used for sending and receiving data over the standard file descriptors.
  * The class will ensure that file descriptors are closed properly.
  *
@@ -251,53 +240,28 @@ pub fn start_program(prog: &str, args: &[~str]) -> @Program {
             r.in_fd = invalid_fd;
         }
     }
-
-    fn close_repr_outputs(r: &mut ProgRepr) {
-        unsafe {
-            fclose_and_null(&mut r.out_file);
-            fclose_and_null(&mut r.err_file);
-        }
-    }
-
     fn finish_repr(r: &mut ProgRepr) -> int {
         if r.finished { return 0; }
         r.finished = true;
         close_repr_input(&mut *r);
         return waitpid(r.pid);
     }
-
     fn destroy_repr(r: &mut ProgRepr) {
-        killpid(r.pid);
-        finish_repr(&mut *r);
-        close_repr_outputs(&mut *r);
-
-        #[cfg(windows)]
-        fn killpid(pid: pid_t) {
-            unsafe {
-                libc::funcs::extra::kernel32::TerminateProcess(
-                    cast::transmute(pid), 1);
-            }
-        }
-
-        #[cfg(unix)]
-        fn killpid(pid: pid_t) {
-            unsafe {
-                libc::funcs::posix88::signal::kill(
-                    pid, libc::consts::os::posix88::SIGKILL as c_int);
-            }
+        unsafe {
+            finish_repr(&mut *r);
+            libc::fclose(r.out_file);
+            libc::fclose(r.err_file);
         }
     }
-
     struct ProgRes {
         r: ProgRepr,
     }
 
     impl Drop for ProgRes {
         fn finalize(&self) {
             unsafe {
-                // FIXME #4943: transmute is bad.
-                finish_repr(cast::transmute(&self.r));
-                close_repr_outputs(cast::transmute(&self.r));
+                // FIXME #4943: This is bad.
+                destroy_repr(cast::transmute(&self.r));
             }
         }
     }
@@ -323,7 +287,6 @@ pub fn start_program(prog: &str, args: &[~str]) -> @Program {
         fn finish(&mut self) -> int { finish_repr(&mut self.r) }
         fn destroy(&mut self) { destroy_repr(&mut self.r); }
     }
-
     let mut repr = ProgRepr {
         pid: pid,
         in_fd: pipe_input.out,
@@ -495,10 +458,8 @@ pub fn waitpid(pid: pid_t) -> int {
 
 #[cfg(test)]
 mod tests {
-    use libc;
     use option::None;
     use os;
-    use path::Path;
     use run::{readclose, writeclose};
     use run;
 
@@ -546,40 +507,6 @@ mod tests {
         assert!(status == 1);
     }
 
-    #[test]
-    pub fn test_destroy_once() {
-        let mut p = run::start_program("echo", []);
-        p.destroy(); // this shouldn't crash (and nor should the destructor)
-    }
-
-    #[test]
-    pub fn test_destroy_twice() {
-        let mut p = run::start_program("echo", []);
-        p.destroy(); // this shouldnt crash...
-        p.destroy(); // ...and nor should this (and nor should the destructor)
-    }
-
-    #[test]
-    #[cfg(unix)] // there is no way to sleep on windows from inside libcore...
-    pub fn test_destroy_actually_kills() {
-        let path = Path("test/core-run-test-destroy-actually-kills.tmp");
-
-        os::remove_file(&path);
-
-        let cmd = fmt!("sleep 5 && echo MurderDeathKill > %s", path.to_str());
-        let mut p = run::start_program("sh", [~"-c", cmd]);
-
-        p.destroy(); // destroy the program before it has a chance to echo its message
-
-        unsafe {
-            // wait to ensure the program is really destroyed and not just waiting itself
-            libc::sleep(10);
-        }
-
-        // the program should not have had chance to echo its message
-        assert!(!path.exists());
-    }
-
 }
 
 // Local Variables: