Browse Source

Distinct behaviour for main and non-main threads

pull/28/head
Andrea Ciliberti 3 years ago
parent
commit
32d17e552a
  1. 2
      ctru-rs/examples/thread-basic.rs
  2. 21
      ctru-rs/src/lib.rs

2
ctru-rs/examples/thread-basic.rs

@ -16,7 +16,7 @@ fn main() {
let prio = thread::current().priority(); let prio = thread::current().priority();
println!("Main thread prio: {}\n", prio); println!("Main thread prio: {}\n", prio);
for ix in 0..3 { for ix in 0..3 {
thread::Builder::new() thread::Builder::new()
.priority(prio - 1) .priority(prio - 1)

21
ctru-rs/src/lib.rs

@ -11,20 +11,27 @@ pub fn init() {
use std::panic::PanicInfo; use std::panic::PanicInfo;
let main_thread = thread::current().id();
// Panic Hook setup // Panic Hook setup
let default_hook = std::panic::take_hook(); let default_hook = std::panic::take_hook();
let new_hook = Box::new(move |info: &PanicInfo| { let new_hook = Box::new(move |info: &PanicInfo| {
println!("\x1b[1;31m\n--------------------------------------------------"); println!("\x1b[1;31m\n--------------------------------------------------"); // Red ANSI Color Code
default_hook(info); default_hook(info);
println!("\nPress SELECT to exit the software");
let hid = services::hid::Hid::init().unwrap();
loop { // Only for panics in the main thread
hid.scan_input(); if main_thread == thread::current().id() {
if hid.keys_down().contains(services::hid::KeyPad::KEY_SELECT) { println!("\nPress SELECT to exit the software");
break; let hid = services::hid::Hid::init().unwrap();
loop {
hid.scan_input();
if hid.keys_down().contains(services::hid::KeyPad::KEY_SELECT) {
break;
}
} }
} }
println!("\x1b[1;37m\n"); // Get back to white
}); });
std::panic::set_hook(new_hook); std::panic::set_hook(new_hook);
} }

Loading…
Cancel
Save