Add os.wait[pid] and associated functions/constants

coolreader18 · youknowone · commit d40533be5f06 · 2020-06-21T20:53:45.000+09:00
diff --git a/vm/src/function.rs b/vm/src/function.rs
@@ -274,6 +274,11 @@ impl<T> From<HashMap<String, T>> for KwArgs<T> {
         KwArgs(map)
     }
 }
+impl<T> Default for KwArgs<T> {
+    fn default() -> Self {
+        KwArgs(HashMap::new())
+    }
+}
 
 impl<T> FromArgs for KwArgs<T>
 where
diff --git a/vm/src/obj/objdict.rs b/vm/src/obj/objdict.rs
@@ -10,7 +10,7 @@ use crate::exceptions::PyBaseExceptionRef;
 use crate::function::{KwArgs, OptionalArg, PyFuncArgs};
 use crate::pyobject::{
     IdProtocol, IntoPyObject, ItemProtocol, PyAttributes, PyClassImpl, PyContext, PyIterable,
-    PyObjectRef, PyRef, PyResult, PyValue,
+    PyObjectRef, PyRef, PyResult, PyValue, TryFromObject,
 };
 use crate::vm::{ReprGuard, VirtualMachine};
 
@@ -681,3 +681,26 @@ pub(crate) fn init(context: &PyContext) {
     PyDictItems::extend_class(context, &context.types.dictitems_type);
     PyDictItemIterator::extend_class(context, &context.types.dictitemiterator_type);
 }
+
+pub struct PyMapping {
+    dict: PyDictRef,
+}
+
+impl TryFromObject for PyMapping {
+    fn try_from_object(vm: &VirtualMachine, obj: PyObjectRef) -> PyResult<Self> {
+        let dict = vm.ctx.new_dict();
+        PyDictRef::merge(
+            &dict.entries,
+            OptionalArg::Present(obj),
+            KwArgs::default(),
+            vm,
+        )?;
+        Ok(PyMapping { dict })
+    }
+}
+
+impl PyMapping {
+    pub fn into_dict(self) -> PyDictRef {
+        self.dict
+    }
+}
diff --git a/vm/src/stdlib/os.rs b/vm/src/stdlib/os.rs
@@ -30,7 +30,7 @@ use crate::exceptions::PyBaseExceptionRef;
 use crate::function::{IntoPyNativeFunc, OptionalArg, PyFuncArgs};
 use crate::obj::objbyteinner::PyBytesLike;
 use crate::obj::objbytes::{PyBytes, PyBytesRef};
-use crate::obj::objdict::PyDictRef;
+use crate::obj::objdict::{PyDictRef, PyMapping};
 use crate::obj::objint::PyIntRef;
 use crate::obj::objiter;
 use crate::obj::objset::PySet;
@@ -1615,7 +1615,7 @@ struct PosixSpawnArgs {
     #[pyarg(positional_only)]
     args: PyIterable<PyPathLike>,
     #[pyarg(positional_only)]
-    env: PyDictRef,
+    env: PyMapping,
     #[pyarg(keyword_only, default = "None")]
     file_actions: Option<PyIterable<PyTupleRef>>,
     #[pyarg(keyword_only, default = "None")]
@@ -1721,7 +1721,7 @@ impl PosixSpawnArgs {
             .map(|s| s.as_ptr() as _)
             .chain(std::iter::once(std::ptr::null_mut()))
             .collect();
-        let mut env = envp_from_dict(self.env, vm)?;
+        let mut env = envp_from_dict(self.env.into_dict(), vm)?;
         let envp: Vec<*mut libc::c_char> = env
             .iter_mut()
             .map(|s| s.as_ptr() as _)
@@ -1768,6 +1768,44 @@ fn os_posix_spawnp(args: PosixSpawnArgs, vm: &VirtualMachine) -> PyResult<libc::
     args.spawn(true, vm)
 }
 
+#[cfg(unix)]
+fn os_wifsignaled(status: i32) -> bool {
+    unsafe { libc::WIFSIGNALED(status) }
+}
+#[cfg(unix)]
+fn os_wifstopped(status: i32) -> bool {
+    unsafe { libc::WIFSTOPPED(status) }
+}
+#[cfg(unix)]
+fn os_wifexited(status: i32) -> bool {
+    unsafe { libc::WIFEXITED(status) }
+}
+#[cfg(unix)]
+fn os_wtermsig(status: i32) -> i32 {
+    unsafe { libc::WTERMSIG(status) }
+}
+#[cfg(unix)]
+fn os_wstopsig(status: i32) -> i32 {
+    unsafe { libc::WSTOPSIG(status) }
+}
+#[cfg(unix)]
+fn os_wexitstatus(status: i32) -> i32 {
+    unsafe { libc::WEXITSTATUS(status) }
+}
+
+// TODO: os.wait[pid] for windows
+#[cfg(unix)]
+fn os_waitpid(pid: libc::pid_t, opt: i32, vm: &VirtualMachine) -> PyResult<(libc::pid_t, i32)> {
+    let mut status = 0;
+    let pid = unsafe { libc::waitpid(pid, &mut status, opt) };
+    let pid = Errno::result(pid).map_err(|e| convert_nix_error(vm, e))?;
+    Ok((pid, status))
+}
+#[cfg(unix)]
+fn os_wait(vm: &VirtualMachine) -> PyResult<(libc::pid_t, i32)> {
+    os_waitpid(-1, 0, vm)
+}
+
 pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
     let ctx = &vm.ctx;
 
@@ -1956,6 +1994,15 @@ fn extend_module_platform_specific(vm: &VirtualMachine, module: &PyObjectRef) {
         "ttyname" => ctx.new_function(os_ttyname),
         "uname" => ctx.new_function(os_uname),
         "uname_result" => uname_result,
+        "wait" => ctx.new_function(os_wait),
+        "waitpid" => ctx.new_function(os_waitpid),
+        "WIFSIGNALED" => ctx.new_function(os_wifsignaled),
+        "WIFSTOPPED" => ctx.new_function(os_wifstopped),
+        "WIFEXITED" => ctx.new_function(os_wifexited),
+        "WTERMSIG" => ctx.new_function(os_wtermsig),
+        "WSTOPSIG" => ctx.new_function(os_wstopsig),
+        "WEXITSTATUS" => ctx.new_function(os_wexitstatus),
+        "WNOHANG" => ctx.new_int(libc::WNOHANG),
         "EX_OK" => ctx.new_int(exitcode::OK as i8),
         "EX_USAGE" => ctx.new_int(exitcode::USAGE as i8),
         "EX_DATAERR" => ctx.new_int(exitcode::DATAERR as i8),

Original file line number	Diff line number	Diff line change
`@@ -274,6 +274,11 @@ impl<T> From<HashMap<String, T>> for KwArgs<T> {`
`274`	`274`	`KwArgs(map)`
`275`	`275`	`}`
`276`	`276`	`}`
	`277`	`+impl<T> Default for KwArgs<T> {`
	`278`	`+ fn default() -> Self {`
	`279`	`+ KwArgs(HashMap::new())`
	`280`	`+ }`
	`281`	`+}`
`277`	`282`
`278`	`283`	`impl<T> FromArgs for KwArgs<T>`
`279`	`284`	`where`