mirror of
https://github.com/andyk/ht.git
synced 2024-10-04 01:08:04 +03:00
Extract thread code into one function per thread
This commit is contained in:
Marcin Kulik
parent
60a77fef7c
commit
378d1c1320
315
src/main.rs
315
src/main.rs
@ -7,6 +7,7 @@ use nix::unistd::{self, ForkResult};
|
||||
use std::env;
|
||||
use std::ffi::{CString, NulError};
|
||||
use std::io;
|
||||
use std::os::fd::OwnedFd;
|
||||
use std::sync::mpsc;
|
||||
use std::thread;
|
||||
use std::{
|
||||
@ -49,154 +50,176 @@ fn main() {
|
||||
|
||||
fn handle_parent(master_fd: RawFd, child: unistd::Pid) {
|
||||
let (sender, receiver) = mpsc::channel::<Message>();
|
||||
let (rx, tx) = nix::unistd::pipe().unwrap();
|
||||
let mut input = unsafe { File::from_raw_fd(tx.as_raw_fd()) };
|
||||
let s1 = sender.clone();
|
||||
let (input_rx, input_tx) = nix::unistd::pipe().unwrap();
|
||||
let sender_ = sender.clone();
|
||||
thread::spawn(move || read_stdin(sender_));
|
||||
let sender_ = sender.clone();
|
||||
thread::spawn(move || handle_master(master_fd, input_rx, sender_));
|
||||
let input = unsafe { File::from_raw_fd(input_tx.as_raw_fd()) };
|
||||
process_messages(receiver, input);
|
||||
}
|
||||
|
||||
let h1 = thread::spawn(move || {
|
||||
for line in std::io::stdin().lines() {
|
||||
let json: serde_json::Value = serde_json::from_str(&line.unwrap()).unwrap();
|
||||
fn handle_child<S>(command: &[S]) -> io::Result<()>
|
||||
where
|
||||
S: AsRef<str>,
|
||||
{
|
||||
let command = command
|
||||
.iter()
|
||||
.map(|s| CString::new(s.as_ref()))
|
||||
.collect::<Result<Vec<CString>, NulError>>()
|
||||
.unwrap();
|
||||
|
||||
match json["action"].as_str() {
|
||||
Some("input") => {
|
||||
let i = json["payload"].as_str().unwrap().to_string();
|
||||
s1.send(Message::Command(Command::Input(i))).unwrap();
|
||||
env::set_var("TERM", "xterm-256color");
|
||||
unsafe { signal::signal(Signal::SIGPIPE, SigHandler::SigDfl) }.unwrap();
|
||||
unistd::execvp(&command[0], &command).unwrap();
|
||||
unsafe { libc::_exit(1) }
|
||||
}
|
||||
|
||||
fn read_stdin(sender: mpsc::Sender<Message>) {
|
||||
for line in std::io::stdin().lines() {
|
||||
let json: serde_json::Value = serde_json::from_str(&line.unwrap()).unwrap();
|
||||
|
||||
match json["action"].as_str() {
|
||||
Some("input") => {
|
||||
let i = json["payload"].as_str().unwrap().to_string();
|
||||
sender.send(Message::Command(Command::Input(i))).unwrap();
|
||||
}
|
||||
|
||||
Some("getView") => {
|
||||
sender.send(Message::Command(Command::GetView)).unwrap();
|
||||
}
|
||||
|
||||
_ => (),
|
||||
}
|
||||
}
|
||||
|
||||
println!("input closed!");
|
||||
}
|
||||
|
||||
fn handle_master(master_fd: RawFd, input_rx: OwnedFd, sender: mpsc::Sender<Message>) {
|
||||
const MASTER: mio::Token = mio::Token(0);
|
||||
const INPUT: mio::Token = mio::Token(1);
|
||||
const BUF_SIZE: usize = 128 * 1024;
|
||||
|
||||
let mut poll = mio::Poll::new().unwrap();
|
||||
let mut events = mio::Events::with_capacity(128);
|
||||
let mut master_file = unsafe { File::from_raw_fd(master_fd) };
|
||||
let mut master_source = SourceFd(&master_fd);
|
||||
let input_fd = input_rx.as_raw_fd();
|
||||
let mut input_file = unsafe { File::from_raw_fd(input_fd) };
|
||||
let mut input_source = SourceFd(&input_fd);
|
||||
let mut buf = [0u8; BUF_SIZE];
|
||||
let mut input: Vec<u8> = Vec::with_capacity(BUF_SIZE);
|
||||
nbio::set_non_blocking(&input_fd).unwrap();
|
||||
nbio::set_non_blocking(&master_fd).unwrap();
|
||||
|
||||
poll.registry()
|
||||
.register(&mut master_source, MASTER, mio::Interest::READABLE)
|
||||
.unwrap();
|
||||
|
||||
poll.registry()
|
||||
.register(&mut input_source, INPUT, mio::Interest::READABLE)
|
||||
.unwrap();
|
||||
|
||||
loop {
|
||||
if let Err(e) = poll.poll(&mut events, None) {
|
||||
if e.kind() == io::ErrorKind::Interrupted {
|
||||
continue;
|
||||
} else {
|
||||
panic!("{}", e);
|
||||
}
|
||||
}
|
||||
|
||||
for event in events.iter() {
|
||||
match event.token() {
|
||||
MASTER => {
|
||||
if event.is_readable() {
|
||||
println!("master read");
|
||||
|
||||
while let Some(n) = nbio::read(&mut master_file, &mut buf).unwrap() {
|
||||
if n > 0 {
|
||||
sender
|
||||
.send(Message::Output(
|
||||
String::from_utf8_lossy(&buf[0..n]).to_string(),
|
||||
))
|
||||
.unwrap();
|
||||
} else {
|
||||
println!("master read closed");
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if event.is_writable() {
|
||||
println!("master write");
|
||||
|
||||
let mut buf: &[u8] = input.as_ref();
|
||||
|
||||
while let Some(n) = nbio::write(&mut master_file, buf).unwrap() {
|
||||
buf = &buf[n..];
|
||||
|
||||
if buf.is_empty() {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
let left = buf.len();
|
||||
|
||||
if left == 0 {
|
||||
input.clear();
|
||||
|
||||
poll.registry()
|
||||
.reregister(&mut master_source, MASTER, mio::Interest::READABLE)
|
||||
.unwrap();
|
||||
} else {
|
||||
input.drain(..input.len() - left);
|
||||
}
|
||||
}
|
||||
|
||||
// needed?
|
||||
// if event.is_read_closed() {
|
||||
// poll.registry().deregister(&mut master_source).unwrap();
|
||||
// return;
|
||||
// }
|
||||
}
|
||||
|
||||
Some("getView") => {
|
||||
s1.send(Message::Command(Command::GetView)).unwrap();
|
||||
INPUT => {
|
||||
if event.is_readable() {
|
||||
println!("input read");
|
||||
|
||||
while let Some(n) = nbio::read(&mut input_file, &mut buf).unwrap() {
|
||||
println!("read some input! {n}");
|
||||
|
||||
if n > 0 {
|
||||
input.extend_from_slice(&buf[0..n]);
|
||||
|
||||
poll.registry()
|
||||
.reregister(
|
||||
&mut master_source,
|
||||
MASTER,
|
||||
mio::Interest::READABLE | mio::Interest::WRITABLE,
|
||||
)
|
||||
.unwrap();
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// needed?
|
||||
// if event.is_read_closed() {
|
||||
// poll.registry().deregister(&mut input_source).unwrap();
|
||||
// return;
|
||||
// }
|
||||
}
|
||||
|
||||
_ => (),
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
println!("input closed!");
|
||||
});
|
||||
|
||||
let h2 = thread::spawn(move || {
|
||||
const MASTER: mio::Token = mio::Token(0);
|
||||
const INPUT: mio::Token = mio::Token(1);
|
||||
const BUF_SIZE: usize = 128 * 1024;
|
||||
|
||||
let mut poll = mio::Poll::new().unwrap();
|
||||
let mut events = mio::Events::with_capacity(128);
|
||||
let mut master_file = unsafe { File::from_raw_fd(master_fd) };
|
||||
let mut master_source = SourceFd(&master_fd);
|
||||
let input_fd = rx.as_raw_fd();
|
||||
let mut input_file = unsafe { File::from_raw_fd(input_fd) };
|
||||
let mut input_source = SourceFd(&input_fd);
|
||||
let mut buf = [0u8; BUF_SIZE];
|
||||
let mut input: Vec<u8> = Vec::with_capacity(BUF_SIZE);
|
||||
nbio::set_non_blocking(&input_fd).unwrap();
|
||||
nbio::set_non_blocking(&master_fd).unwrap();
|
||||
|
||||
poll.registry()
|
||||
.register(&mut master_source, MASTER, mio::Interest::READABLE)
|
||||
.unwrap();
|
||||
|
||||
poll.registry()
|
||||
.register(&mut input_source, INPUT, mio::Interest::READABLE)
|
||||
.unwrap();
|
||||
|
||||
loop {
|
||||
if let Err(e) = poll.poll(&mut events, None) {
|
||||
if e.kind() == io::ErrorKind::Interrupted {
|
||||
continue;
|
||||
} else {
|
||||
panic!("{}", e);
|
||||
}
|
||||
}
|
||||
|
||||
for event in events.iter() {
|
||||
match event.token() {
|
||||
MASTER => {
|
||||
if event.is_readable() {
|
||||
println!("master read");
|
||||
|
||||
while let Some(n) = nbio::read(&mut master_file, &mut buf).unwrap() {
|
||||
if n > 0 {
|
||||
sender
|
||||
.send(Message::Output(
|
||||
String::from_utf8_lossy(&buf[0..n]).to_string(),
|
||||
))
|
||||
.unwrap();
|
||||
} else {
|
||||
println!("master read closed");
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if event.is_writable() {
|
||||
println!("master write");
|
||||
|
||||
let mut buf: &[u8] = input.as_ref();
|
||||
|
||||
while let Some(n) = nbio::write(&mut master_file, buf).unwrap() {
|
||||
buf = &buf[n..];
|
||||
|
||||
if buf.is_empty() {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
let left = buf.len();
|
||||
|
||||
if left == 0 {
|
||||
input.clear();
|
||||
|
||||
poll.registry()
|
||||
.reregister(&mut master_source, MASTER, mio::Interest::READABLE)
|
||||
.unwrap();
|
||||
} else {
|
||||
input.drain(..input.len() - left);
|
||||
}
|
||||
}
|
||||
|
||||
// needed?
|
||||
// if event.is_read_closed() {
|
||||
// poll.registry().deregister(&mut master_source).unwrap();
|
||||
// return;
|
||||
// }
|
||||
}
|
||||
|
||||
INPUT => {
|
||||
if event.is_readable() {
|
||||
println!("input read");
|
||||
|
||||
while let Some(n) = nbio::read(&mut input_file, &mut buf).unwrap() {
|
||||
println!("read some input! {n}");
|
||||
|
||||
if n > 0 {
|
||||
input.extend_from_slice(&buf[0..n]);
|
||||
|
||||
poll.registry()
|
||||
.reregister(
|
||||
&mut master_source,
|
||||
MASTER,
|
||||
mio::Interest::READABLE | mio::Interest::WRITABLE,
|
||||
)
|
||||
.unwrap();
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// needed?
|
||||
// if event.is_read_closed() {
|
||||
// poll.registry().deregister(&mut input_source).unwrap();
|
||||
// return;
|
||||
// }
|
||||
}
|
||||
|
||||
_ => (),
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
fn process_messages(receiver: mpsc::Receiver<Message>, mut input: File) {
|
||||
let mut vt = avt::Vt::builder().size(80, 24).build();
|
||||
|
||||
for message in receiver {
|
||||
@ -223,19 +246,3 @@ fn handle_parent(master_fd: RawFd, child: unistd::Pid) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn handle_child<S>(command: &[S]) -> io::Result<()>
|
||||
where
|
||||
S: AsRef<str>,
|
||||
{
|
||||
let command = command
|
||||
.iter()
|
||||
.map(|s| CString::new(s.as_ref()))
|
||||
.collect::<Result<Vec<CString>, NulError>>()
|
||||
.unwrap();
|
||||
|
||||
env::set_var("TERM", "xterm-256color");
|
||||
unsafe { signal::signal(Signal::SIGPIPE, SigHandler::SigDfl) }.unwrap();
|
||||
unistd::execvp(&command[0], &command).unwrap();
|
||||
unsafe { libc::_exit(1) }
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user