unspeaker/tek
1
0
Fork 0
mirror of https://codeberg.org/unspeaker/tek.git synced 2025-12-07 12:16:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

replace top level mutex with rw lock

Browse source
This commit is contained in:
🪞👃🪞 2024-07-05 20:02:55 +03:00
parent 33de8bbf1d
commit 2989c79fd0
5 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/core.rs
View file

@ -34,7 +34,7 @@ submod!( handle midi render time );
pub type Usually<T> = Result<T, Box<dyn Error>>;
/// A UI component.
pub trait Component: Render + Handle {
pub trait Component: Render + Handle + Sync {
/// Perform type erasure for collecting heterogeneous components.
fn boxed (self) -> Box<dyn Component> where Self: Sized + 'static {
Box::new(self)
@ -42,7 +42,7 @@ pub trait Component: Render + Handle {
}
/// Anything that implements `Render` + `Handle` can be used as a UI component.
impl<T: Render + Handle> Component for T {}
impl<T: Render + Handle + Sync> Component for T {}
/// A UI component that may be associated with a JACK client by the `Jack` factory.
pub trait Device: Render + Handle + Process + Send + Sync {
@ -61,11 +61,11 @@ pub use crate::{submod, render, handle, process, phrase, keymap, key, ports};
// Reexport JACK proto-lib:
pub use crate::jack::*;
impl<T: Render + Handle + Send + Sized + 'static> Run for T {}
impl<T: Render + Handle + Send + Sync + Sized + 'static> Run for T {}
pub trait Run: Render + Handle + Send + Sized + 'static {
fn run (self, init: Option<impl FnOnce(Arc<Mutex<Self>>)->Usually<()>>) -> Usually<()> {
let app = Arc::new(Mutex::new(self));
pub trait Run: Render + Handle + Send + Sync + Sized + 'static {
fn run (self, init: Option<impl FnOnce(Arc<RwLock<Self>>)->Usually<()>>) -> Usually<()> {
let app = Arc::new(RwLock::new(self));
let exited = Arc::new(AtomicBool::new(false));
let _input_thread = input_thread(&exited, &app);
terminal_setup()?;
@ -106,7 +106,7 @@ pub fn terminal_teardown () -> Usually<()> {
/// Main thread render loop
pub fn main_thread (
exited: &Arc<AtomicBool>,
device: &Arc<Mutex<impl Render + Send + 'static>>
device: &Arc<RwLock<impl Render + Send + Sync + 'static>>
) -> Usually<JoinHandle<()>> {
let exited = exited.clone();
let device = device.clone();
@ -117,7 +117,7 @@ pub fn main_thread (
terminal.draw(|frame|{
let area = frame.size();
let buffer = frame.buffer_mut();
device.lock().unwrap()
device.read().unwrap()
.render(buffer, area)
.expect("Failed to render content");
}).expect("Failed to render frame");
@ -134,7 +134,7 @@ pub fn main_thread (
/// Spawn thread that listens for user input
pub fn input_thread (
exited: &Arc<AtomicBool>,
device: &Arc<Mutex<impl Handle + Send + 'static>>
device: &Arc<RwLock<impl Handle + Send + Sync + 'static>>
) -> JoinHandle<()> {
let poll = Duration::from_millis(100);
let exited = exited.clone();
@ -155,7 +155,7 @@ pub fn input_thread (
}) => {
exited.store(true, Ordering::Relaxed);
},
_ => if device.lock().unwrap().handle(&AppEvent::Input(event)).is_err() {
_ => if device.write().unwrap().handle(&AppEvent::Input(event)).is_err() {
break
}
}