| Alphare |
| hg-reviewers |
We no longer have to consume self and arguments.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| // Copyright 2018 Yuya Nishihara <yuya@tcha.org> | // Copyright 2018 Yuya Nishihara <yuya@tcha.org> | ||||
| // | // | ||||
| // This software may be used and distributed according to the terms of the | // This software may be used and distributed according to the terms of the | ||||
| // GNU General Public License version 2 or any later version. | // GNU General Public License version 2 or any later version. | ||||
| mod attachio; | mod attachio; | ||||
| //mod clientext; | //mod clientext; | ||||
| //pub mod locator; | //pub mod locator; | ||||
| pub mod message; | pub mod message; | ||||
| pub mod procutil; | pub mod procutil; | ||||
| //mod runcommand; | //mod runcommand; | ||||
| //mod uihandler; | mod uihandler; | ||||
| //pub use clientext::ChgClientExt; | //pub use clientext::ChgClientExt; | ||||
| //pub use uihandler::{ChgUiHandler, SystemHandler}; | pub use uihandler::{ChgUiHandler, SystemHandler}; | ||||
| // Copyright 2018 Yuya Nishihara <yuya@tcha.org> | // Copyright 2018 Yuya Nishihara <yuya@tcha.org> | ||||
| // | // | ||||
| // This software may be used and distributed according to the terms of the | // This software may be used and distributed according to the terms of the | ||||
| // GNU General Public License version 2 or any later version. | // GNU General Public License version 2 or any later version. | ||||
| use futures::future::IntoFuture; | use async_trait::async_trait; | ||||
| use futures::Future; | |||||
| use std::io; | use std::io; | ||||
| use std::os::unix::io::AsRawFd; | use std::os::unix::io::AsRawFd; | ||||
| use std::os::unix::process::ExitStatusExt; | use std::os::unix::process::ExitStatusExt; | ||||
| use std::process::Stdio; | use std::process::Stdio; | ||||
| use tokio; | use tokio; | ||||
| use tokio::process::{ChildStdin, Command}; | use tokio::process::{ChildStdin, Command}; | ||||
| use crate::message::CommandSpec; | use crate::message::CommandSpec; | ||||
| use crate::procutil; | use crate::procutil; | ||||
| /// Callback to process shell command requests received from server. | /// Callback to process shell command requests received from server. | ||||
| pub trait SystemHandler: Sized { | #[async_trait] | ||||
| pub trait SystemHandler { | |||||
| type PagerStdin: AsRawFd; | type PagerStdin: AsRawFd; | ||||
| type SpawnPagerResult: IntoFuture<Item = (Self, Self::PagerStdin), Error = io::Error>; | |||||
| type RunSystemResult: IntoFuture<Item = (Self, i32), Error = io::Error>; | |||||
| /// Handles pager command request. | /// Handles pager command request. | ||||
| /// | /// | ||||
| /// Returns the pipe to be attached to the server if the pager is spawned. | /// Returns the pipe to be attached to the server if the pager is spawned. | ||||
| fn spawn_pager(self, spec: CommandSpec) -> Self::SpawnPagerResult; | async fn spawn_pager(&mut self, spec: &CommandSpec) -> io::Result<Self::PagerStdin>; | ||||
| /// Handles system command request. | /// Handles system command request. | ||||
| /// | /// | ||||
| /// Returns command exit code (positive) or signal number (negative). | /// Returns command exit code (positive) or signal number (negative). | ||||
| fn run_system(self, spec: CommandSpec) -> Self::RunSystemResult; | async fn run_system(&mut self, spec: &CommandSpec) -> io::Result<i32>; | ||||
| } | } | ||||
| /// Default cHg implementation to process requests received from server. | /// Default cHg implementation to process requests received from server. | ||||
| pub struct ChgUiHandler {} | pub struct ChgUiHandler {} | ||||
| impl ChgUiHandler { | impl ChgUiHandler { | ||||
| pub fn new() -> ChgUiHandler { | pub fn new() -> ChgUiHandler { | ||||
| ChgUiHandler {} | ChgUiHandler {} | ||||
| } | } | ||||
| } | } | ||||
| #[async_trait] | |||||
| impl SystemHandler for ChgUiHandler { | impl SystemHandler for ChgUiHandler { | ||||
| type PagerStdin = ChildStdin; | type PagerStdin = ChildStdin; | ||||
| type SpawnPagerResult = io::Result<(Self, Self::PagerStdin)>; | |||||
| type RunSystemResult = Box<dyn Future<Item = (Self, i32), Error = io::Error> + Send>; | |||||
| fn spawn_pager(self, spec: CommandSpec) -> Self::SpawnPagerResult { | async fn spawn_pager(&mut self, spec: &CommandSpec) -> io::Result<Self::PagerStdin> { | ||||
| let mut pager = new_shell_command(&spec).stdin(Stdio::piped()).spawn()?; | let mut pager = new_shell_command(&spec).stdin(Stdio::piped()).spawn()?; | ||||
| let pin = pager.stdin.take().unwrap(); | let pin = pager.stdin.take().unwrap(); | ||||
| procutil::set_blocking_fd(pin.as_raw_fd())?; | procutil::set_blocking_fd(pin.as_raw_fd())?; | ||||
| // TODO: if pager exits, notify the server with SIGPIPE immediately. | // TODO: if pager exits, notify the server with SIGPIPE immediately. | ||||
| // otherwise the server won't get SIGPIPE if it does not write | // otherwise the server won't get SIGPIPE if it does not write | ||||
| // anything. (issue5278) | // anything. (issue5278) | ||||
| // kill(peerpid, SIGPIPE); | // kill(peerpid, SIGPIPE); | ||||
| tokio::spawn(pager.map(|_| ()).map_err(|_| ())); // just ignore errors | tokio::spawn(async { pager.await }); // just ignore errors | ||||
| Ok((self, pin)) | Ok(pin) | ||||
| } | } | ||||
| fn run_system(self, spec: CommandSpec) -> Self::RunSystemResult { | async fn run_system(&mut self, spec: &CommandSpec) -> io::Result<i32> { | ||||
| let fut = new_shell_command(&spec) | let status = new_shell_command(&spec).spawn()?.await?; | ||||
| .spawn() | // TODO: unindent | ||||
| .into_future() | { | ||||
| .flatten() | { | ||||
| .map(|status| { | |||||
| let code = status | let code = status | ||||
| .code() | .code() | ||||
| .or_else(|| status.signal().map(|n| -n)) | .or_else(|| status.signal().map(|n| -n)) | ||||
| .expect("either exit code or signal should be set"); | .expect("either exit code or signal should be set"); | ||||
| (self, code) | Ok(code) | ||||
| }); | } | ||||
| Box::new(fut) | } | ||||
| } | } | ||||
| } | } | ||||
| fn new_shell_command(spec: &CommandSpec) -> Command { | fn new_shell_command(spec: &CommandSpec) -> Command { | ||||
| let mut builder = Command::new("/bin/sh"); | let mut builder = Command::new("/bin/sh"); | ||||
| builder | builder | ||||
| .arg("-c") | .arg("-c") | ||||
| .arg(&spec.command) | .arg(&spec.command) | ||||
| .current_dir(&spec.current_dir) | .current_dir(&spec.current_dir) | ||||
| .env_clear() | .env_clear() | ||||
| .envs(spec.envs.iter().cloned()); | .envs(spec.envs.iter().cloned()); | ||||
| builder | builder | ||||
| } | } | ||||