---

yaml
---
r: 60732
b: refs/heads/auto
c: e2fcb92
h: refs/heads/master
v: v3

Author: steveklabnik

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: b7294e1f1bc390ffe940e01d98d01f4f26ce895c
+refs/heads/auto: e2fcb92a6d5c92c6beddec92fa0514d2c5de0fab
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/compiletest/procsrv.rs

@@ -10,6 +10,8 @@
 
 use core::prelude::*;
 
+use core::libc::c_int;
+use core::run::spawn_process;
 use core::run;
 
 #[cfg(target_os = "win32")]
@@ -36,35 +38,86 @@ fn target_env(lib_path: &str, prog: &str) -> ~[(~str,~str)] {
 #[cfg(target_os = "macos")]
 #[cfg(target_os = "freebsd")]
 fn target_env(_lib_path: &str, _prog: &str) -> ~[(~str,~str)] {
-    os::env()
+    ~[]
 }
 
 pub struct Result {status: int, out: ~str, err: ~str}
 
+// FIXME (#2659): This code is duplicated in core::run::program_output
 pub fn run(lib_path: &str,
            prog: &str,
            args: &[~str],
            env: ~[(~str, ~str)],
            input: Option<~str>) -> Result {
+    let pipe_in = os::pipe();
+    let pipe_out = os::pipe();
+    let pipe_err = os::pipe();
+    let pid = spawn_process(prog, args,
+                            &Some(env + target_env(lib_path, prog)),
+                            &None, pipe_in.in, pipe_out.out, pipe_err.out);
+
+    os::close(pipe_in.in);
+    os::close(pipe_out.out);
+    os::close(pipe_err.out);
+    if pid == -1i32 {
+        os::close(pipe_in.out);
+        os::close(pipe_out.in);
+        os::close(pipe_err.in);
+        fail!();
+    }
 
-    let env = env + target_env(lib_path, prog);
-    let mut proc = run::Process::new(prog, args, run::ProcessOptions {
-        env: Some(env.slice(0, env.len())),
-        dir: None,
-        in_fd: None,
-        out_fd: None,
-        err_fd: None
-    });
 
-    for input.each |input| {
-        proc.input().write_str(*input);
+    writeclose(pipe_in.out, input);
+    let p = comm::PortSet::new();
+    let ch = p.chan();
+    do task::spawn_sched(task::SingleThreaded) || {
+        let errput = readclose(pipe_err.in);
+        ch.send((2, errput));
     }
-    let output = proc.finish_with_output();
+    let ch = p.chan();
+    do task::spawn_sched(task::SingleThreaded) || {
+        let output = readclose(pipe_out.in);
+        ch.send((1, output));
+    }
+    let status = run::waitpid(pid);
+    let mut errs = ~"";
+    let mut outs = ~"";
+    let mut count = 2;
+    while count > 0 {
+        match p.recv() {
+          (1, s) => {
+            outs = s;
+          }
+          (2, s) => {
+            errs = s;
+          }
+          _ => { fail!() }
+        };
+        count -= 1;
+    };
+    return Result {status: status, out: outs, err: errs};
+}
 
-    Result {
-        status: output.status,
-        out: str::from_bytes(output.output),
-        err: str::from_bytes(output.error)
+fn writeclose(fd: c_int, s: Option<~str>) {
+    if s.is_some() {
+        let writer = io::fd_writer(fd, false);
+        writer.write_str(s.get());
     }
+
+    os::close(fd);
 }
 
+fn readclose(fd: c_int) -> ~str {
+    unsafe {
+        // Copied from run::program_output
+        let file = os::fdopen(fd);
+        let reader = io::FILE_reader(file, false);
+        let mut buf = ~"";
+        while !reader.eof() {
+            let bytes = reader.read_bytes(4096u);
+            str::push_str(&mut buf, str::from_bytes(bytes));
+        }
+        os::fclose(file);
+        return buf;
+    }
+}

branches/auto/src/libextra/workcache.rs

@@ -415,7 +415,7 @@ fn test() {
         prep.declare_input("file", pth.to_str(), digest_file(&pth));
         do prep.exec |_exe| {
             let out = Path("foo.o");
-            run::process_status("gcc", [~"foo.c", ~"-o", out.to_str()]);
+            run::run_program("gcc", [~"foo.c", ~"-o", out.to_str()]);
             out.to_str()
         }
     };

branches/auto/src/libfuzzer/fuzzer.rc

@@ -412,20 +412,20 @@ pub fn check_whole_compiler(code: &str,
 pub fn removeIfExists(filename: &Path) {
     // So sketchy!
     assert!(!contains(filename.to_str(), " "));
-    run::process_status("bash", [~"-c", ~"rm " + filename.to_str()]);
+    run::program_output("bash", [~"-c", ~"rm " + filename.to_str()]);
 }
 
 pub fn removeDirIfExists(filename: &Path) {
     // So sketchy!
     assert!(!contains(filename.to_str(), " "));
-    run::process_status("bash", [~"-c", ~"rm -r " + filename.to_str()]);
+    run::program_output("bash", [~"-c", ~"rm -r " + filename.to_str()]);
 }
 
 pub fn check_running(exe_filename: &Path) -> happiness {
-    let p = run::process_output(
+    let p = run::program_output(
         "/Users/jruderman/scripts/timed_run_rust_program.py",
         [exe_filename.to_str()]);
-    let comb = str::from_bytes(p.output) + ~"\n" + str::from_bytes(p.error);
+    let comb = p.out + ~"\n" + p.err;
     if str::len(comb) > 1u {
         error!("comb comb comb: %?", comb);
     }
@@ -461,35 +461,33 @@ pub fn check_running(exe_filename: &Path) -> happiness {
 }
 
 pub fn check_compiling(filename: &Path) -> happiness {
-    let p = run::process_output(
-        "/Users/jruderman/code/rust/build/x86_64-apple-darwin/stage1/bin/rustc",
+    let p = run::program_output(
+        "/Users/jruderman/code/rust/build/x86_64-apple-darwin/\
+         stage1/bin/rustc",
         [filename.to_str()]);
 
-    let out = str::from_bytes(p.output);
-    let err = str::from_bytes(p.error);
-
     //error!("Status: %d", p.status);
     if p.status == 0 {
         passed
-    } else if !err.is_empty() {
-        if err.contains("error:") {
+    } else if p.err != ~"" {
+        if contains(p.err, "error:") {
             cleanly_rejected(~"rejected with span_error")
         } else {
-            error!("Stderr: %?", err);
+            error!("Stderr: %?", p.err);
             failed(~"Unfamiliar error message")
         }
-    } else if out.contains("Assertion") && out.contains("failed") {
-        error!("Stdout: %?", out);
+    } else if contains(p.out, "Assertion") && contains(p.out, "failed") {
+        error!("Stdout: %?", p.out);
         failed(~"Looks like an llvm assertion failure")
-    } else if out.contains("internal compiler error unimplemented") {
+    } else if contains(p.out, "internal compiler error unimplemented") {
         known_bug(~"Something unimplemented")
-    } else if out.contains("internal compiler error") {
-        error!("Stdout: %?", out);
+    } else if contains(p.out, "internal compiler error") {
+        error!("Stdout: %?", p.out);
         failed(~"internal compiler error")
 
     } else {
         error!("%?", p.status);
-        error!("!Stdout: %?", out);
+        error!("!Stdout: %?", p.out);
         failed(~"What happened?")
     }
 }
@@ -610,7 +608,9 @@ pub fn check_roundtrip_convergence(code: @~str, maxIters: uint) {
         error!("Did not converge after %u iterations!", i);
         write_file(&Path("round-trip-a.rs"), *oldv);
         write_file(&Path("round-trip-b.rs"), *newv);
-        run::process_status("diff", [~"-w", ~"-u", ~"round-trip-a.rs", ~"round-trip-b.rs"]);
+        run::run_program("diff",
+                         [~"-w", ~"-u", ~"round-trip-a.rs",
+                          ~"round-trip-b.rs"]);
         fail!("Mismatch");
     }
 }

branches/auto/src/librust/rust.rc

@@ -163,7 +163,7 @@ fn cmd_test(args: &[~str]) -> ValidUsage {
             let test_exec = Path(filename).filestem().unwrap() + "test~";
             invoke("rustc", &[~"--test", filename.to_owned(),
                               ~"-o", test_exec.to_owned()], rustc::main);
-            let exit_code = run::process_status(~"./" + test_exec, []);
+            let exit_code = run::run_program(~"./" + test_exec, []);
             Valid(exit_code)
         }
         _ => Invalid
@@ -176,7 +176,7 @@ fn cmd_run(args: &[~str]) -> ValidUsage {
             let exec = Path(filename).filestem().unwrap() + "~";
             invoke("rustc", &[filename.to_owned(), ~"-o", exec.to_owned()],
                    rustc::main);
-            let exit_code = run::process_status(~"./"+exec, prog_args);
+            let exit_code = run::run_program(~"./"+exec, prog_args);
             Valid(exit_code)
         }
         _ => Invalid

branches/auto/src/librustc/back/link.rs

@@ -403,14 +403,14 @@ pub mod write {
         cc_args.push(object.to_str());
         cc_args.push(assembly.to_str());
 
-        let prog = run::process_output(cc_prog, cc_args);
+        let prog = run::program_output(cc_prog, cc_args);
 
         if prog.status != 0 {
             sess.err(fmt!("building with `%s` failed with code %d",
                         cc_prog, prog.status));
             sess.note(fmt!("%s arguments: %s",
                         cc_prog, str::connect(cc_args, " ")));
-            sess.note(str::from_bytes(prog.error + prog.output));
+            sess.note(prog.err + prog.out);
             sess.abort_if_errors();
         }
     }
@@ -817,19 +817,19 @@ pub fn link_binary(sess: Session,
     let cc_args = link_args(sess, obj_filename, out_filename, lm);
     debug!("%s link args: %s", cc_prog, str::connect(cc_args, " "));
     // We run 'cc' here
-    let prog = run::process_output(cc_prog, cc_args);
+    let prog = run::program_output(cc_prog, cc_args);
     if 0 != prog.status {
         sess.err(fmt!("linking with `%s` failed with code %d",
                       cc_prog, prog.status));
         sess.note(fmt!("%s arguments: %s",
                        cc_prog, str::connect(cc_args, " ")));
-        sess.note(str::from_bytes(prog.error + prog.output));
+        sess.note(prog.err + prog.out);
         sess.abort_if_errors();
     }
 
     // Clean up on Darwin
     if sess.targ_cfg.os == session::os_macos {
-        run::process_status("dsymutil", [output.to_str()]);
+        run::run_program("dsymutil", [output.to_str()]);
     }
 
     // Remove the temporary object file if we aren't saving temps