github/ouch
1
1
Fork 0
mirror of https://github.com/ouch-org/ouch.git synced 2025-06-05 02:55:31 +00:00
Code Issues 15 Packages Projects Releases Wiki Activity

move code to function spawn_logger_thread

Browse Source
This commit is contained in:
João Marcos P. Bezerra 2024-03-15 16:26:12 -03:00 committed by João Marcos
parent 28daa9e8c4
commit d0280f0579
2 changed files with 45 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/commands/mod.rs
View File

@ -22,7 +22,7 @@ use crate::{
list::ListOptions,
utils::{
self,
logger::{info_accessible, map_message, setup_channel, warning},
logger::{info_accessible, map_message, setup_channel, warning, LogReceiver},
to_utf, EscapedPathDisplay, FileVisibilityPolicy,
},
CliArgs, QuestionPolicy,
@ -60,44 +60,8 @@ pub fn run(
let log_receiver = setup_channel();
let pair = Arc::new((Mutex::new(false), Condvar::new()));
let pair2 = Arc::clone(&pair);
// Log received messages until all senders are dropped
rayon::spawn(move || {
const BUFFER_SIZE: usize = 10;
let mut buffer = Vec::<String>::with_capacity(BUFFER_SIZE);
loop {
let msg = log_receiver.recv();
// Senders are still active
if let Ok(msg) = msg {
// Print messages if buffer is full otherwise append to it
if buffer.len() == BUFFER_SIZE {
let mut tmp = buffer.join("\n");
if let Some(msg) = map_message(&msg) {
tmp.push_str(&msg);
}
eprintln!("{}", tmp);
buffer.clear();
} else if let Some(msg) = map_message(&msg) {
buffer.push(msg);
}
} else {
// All senders have been dropped
eprintln!("{}", buffer.join("\n"));
// Wake up the main thread
let (lock, cvar) = &*pair2;
let mut flushed = lock.lock().unwrap();
*flushed = true;
cvar.notify_one();
break;
}
}
});
spawn_logger_thread(log_receiver, pair.clone());
match args.cmd {
Subcommand::Compress {
@ -282,3 +246,41 @@ pub fn run(
Ok(())
}
fn spawn_logger_thread(log_receiver: LogReceiver, synchronization_pair: Arc<(Mutex<bool>, Condvar)>) {
rayon::spawn(move || {
const BUFFER_SIZE: usize = 10;
let mut buffer = Vec::<String>::with_capacity(BUFFER_SIZE);
loop {
let msg = log_receiver.recv();
// Senders are still active
if let Ok(msg) = msg {
// Print messages if buffer is full otherwise append to it
if buffer.len() == BUFFER_SIZE {
let mut tmp = buffer.join("\n");
if let Some(msg) = map_message(&msg) {
tmp.push_str(&msg);
}
eprintln!("{}", tmp);
buffer.clear();
} else if let Some(msg) = map_message(&msg) {
buffer.push(msg);
}
} else {
// All senders have been dropped
eprintln!("{}", buffer.join("\n"));
// Wake up the main thread
let (lock, cvar) = &*synchronization_pair;
let mut flushed = lock.lock().unwrap();
*flushed = true;
cvar.notify_one();
break;
}
}
});
}

10
src/utils/logger.rs
View File

@ -3,19 +3,19 @@ use std::sync::{mpsc, OnceLock};
use super::colors::{ORANGE, RESET, YELLOW};
use crate::accessible::is_running_in_accessible_mode;
type Receiver = mpsc::Receiver<PrintMessage>;
type Sender = mpsc::Sender<PrintMessage>;
pub type LogReceiver = mpsc::Receiver<PrintMessage>;
type LogSender = mpsc::Sender<PrintMessage>;
static SENDER: OnceLock<Sender> = OnceLock::new();
static SENDER: OnceLock<LogSender> = OnceLock::new();
pub fn setup_channel() -> Receiver {
pub fn setup_channel() -> LogReceiver {
let (tx, rx) = mpsc::channel();
SENDER.set(tx).expect("`setup_channel` should only be called once");
rx
}
#[track_caller]
fn get_sender() -> &'static Sender {
fn get_sender() -> &'static LogSender {
SENDER.get().expect("No sender, you need to call `setup_channel` first")
}