diff options
author | Rory Dudley | 2024-02-27 03:49:01 -0700 |
---|---|---|
committer | Rory Dudley | 2024-02-27 03:49:01 -0700 |
commit | e94d09da9449cabd7ece2acd98d52b1946a922a4 (patch) | |
tree | f0fb980662c01bf0c37bc2cfe30dcc5f7952f869 /src/main.rs | |
parent | 0548e74cb3227716cf445f27bd64b8c0b4d0f981 (diff) | |
download | dwarvish-e94d09da9449cabd7ece2acd98d52b1946a922a4.tar.gz |
Remove custom errors and fix background forking
Removes the custom errors in src/recite/erro.rs, and replaces them with
std::io::Errors throughout (recite(), incant_, macros).
Fixed a bug with the way forking to the background is handled, where
registering the signal handler in main for all processes would break
couplets (i.e. pipes). Instead, this sets up a new signal handler each
time a process is forked into the background. It uses a Vec<i32> to keep
track of all the background processes.
Notes
Notes:
First off, there is some defunct code in the main repl loop, which is an
example of killing zombie processes after each prompt. This should be
removed, but I kept it in, just in case I go back to it for some reason.
To be honest, I have no clue why this code works. In theory, I should
have to remove the pid from the pids: Vec<i32> if waitpid returns a
positive integer. However, when I tried this, it completely broke the
program. ¯\_(ツ)_/¯
Also, it's worth noting that registering a signal handler with
signal_hook::low_level::register, is somewhat costly, according to their
docs. Given that this only occurs for background processes that are
forked, however, I think it is acceptable.
Finally, we never unregister the signal handler, so I'm not sure if
that's still hanging out in memory somewhere or no.
Diffstat (limited to 'src/main.rs')
-rw-r--r-- | src/main.rs | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/main.rs b/src/main.rs index 44f2726..b87089a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,4 @@ mod recite; -use libc::{waitpid, WNOHANG}; use recite::path::prefresh; use recite::Poem; use std::io::{self, Write}; @@ -43,6 +42,16 @@ fn repl(path: &Vec<&Path>, prompt: &str) { break; } + // Kill zombies + // TODO: Remove this (since it was implemented in incant_quiet()) + // unsafe { + // let mut status = -1; + // let mut pid = waitpid(-1, &mut status, WNOHANG); + // while pid > 0 { + // pid = waitpid(-1, &mut status, WNOHANG); + // } + // } + // Trim the input let poetry = String::from(poetry.trim()); @@ -56,7 +65,7 @@ fn repl(path: &Vec<&Path>, prompt: &str) { match poem { Some(poem) => match poem.recite(path, &mut bins) { Ok(_) => {} - Err(e) => eprintln!("dwvsh: {}", e), + Err(e) => eprintln!("dwvsh: {}", e.to_string().to_lowercase()), }, None => {} }; @@ -89,16 +98,6 @@ fn main() { io::stdout().flush().unwrap(); }) .unwrap(); - - signal_hook::low_level::register(signal_hook::consts::SIGCHLD, move || { - let mut status: i32 = -1; - let pid: i32 = waitpid(-1, &mut status, WNOHANG); - if pid != -1 { - print!("[&] + done {}", pid); - io::stdout().flush().unwrap(); - } - }) - .unwrap(); }; // Begin evaluating commands |