about summary refs log tree commit diff
path: root/src/libstd/sys
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-11-20 22:35:41 +0000
committerbors <bors@rust-lang.org>2017-11-20 22:35:41 +0000
commit1e44fee88d48e9f7844c6d316ae8540db19dc9fa (patch)
tree9172d777e1fb0167b82154a5391cf53ed9cac16c /src/libstd/sys
parent33374fa9d09e2a790979b31e61100dfed4b44139 (diff)
parent079a6e4cc2ade85faf8c7a4be1bbbd60c7aee9c1 (diff)
downloadrust-1e44fee88d48e9f7844c6d316ae8540db19dc9fa.tar.gz
rust-1e44fee88d48e9f7844c6d316ae8540db19dc9fa.zip
Auto merge of #46130 - kennytm:rollup, r=kennytm
Rollup of 9 pull requests

- Successful merges: #46082, #46088, #46092, #46107, #46119, #46121, #46122, #46124, #46128
- Failed merges:
Diffstat (limited to 'src/libstd/sys')
-rw-r--r--src/libstd/sys/redox/os.rs4
-rw-r--r--src/libstd/sys/unix/ext/process.rs6
-rw-r--r--src/libstd/sys/unix/os.rs4
3 files changed, 14 insertions, 0 deletions
diff --git a/src/libstd/sys/redox/os.rs b/src/libstd/sys/redox/os.rs
index c27e2ee172c..480765b77a0 100644
--- a/src/libstd/sys/redox/os.rs
+++ b/src/libstd/sys/redox/os.rs
@@ -213,3 +213,7 @@ pub fn exit(code: i32) -> ! {
 pub fn getpid() -> u32 {
     syscall::getpid().unwrap() as u32
 }
+
+pub fn getppid() -> u32 {
+    syscall::getppid().unwrap() as u32
+}
diff --git a/src/libstd/sys/unix/ext/process.rs b/src/libstd/sys/unix/ext/process.rs
index cde21b089a2..60309bec6d4 100644
--- a/src/libstd/sys/unix/ext/process.rs
+++ b/src/libstd/sys/unix/ext/process.rs
@@ -191,3 +191,9 @@ impl IntoRawFd for process::ChildStderr {
         self.into_inner().into_fd().into_raw()
     }
 }
+
+/// Returns the OS-assigned process identifier associated with this process's parent.
+#[unstable(feature = "unix_ppid", issue = "46104")]
+pub fn parent_id() -> u32 {
+    ::sys::os::getppid()
+}
diff --git a/src/libstd/sys/unix/os.rs b/src/libstd/sys/unix/os.rs
index 40b73f1b307..7e965b4b4c5 100644
--- a/src/libstd/sys/unix/os.rs
+++ b/src/libstd/sys/unix/os.rs
@@ -515,3 +515,7 @@ pub fn exit(code: i32) -> ! {
 pub fn getpid() -> u32 {
     unsafe { libc::getpid() as u32 }
 }
+
+pub fn getppid() -> u32 {
+    unsafe { libc::getppid() as u32 }
+}