diff --git a/Cargo.lock b/Cargo.lock index db92253..204bbbf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -168,6 +168,12 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "async-once-cell" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4288f83726785267c6f2ef073a3d83dc3f9b81464e9f99898240cced85fce35a" + [[package]] name = "async-std" version = "1.13.0" @@ -252,6 +258,15 @@ dependencies = [ "piper", ] +[[package]] +name = "blocking_semaphore" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88376f98b48312155a0ba2f868ad705f5d5b9a1065514b1f827e31c1d2f3dbb0" +dependencies = [ + "logwise", +] + [[package]] name = "borsh" version = "1.5.3" @@ -831,6 +846,24 @@ dependencies = [ "value-bag", ] +[[package]] +name = "logwise" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3f379dc0daef8061f0beab09c7d3528c1e238754e937bb640daec3553e1bceb" +dependencies = [ + "logwise_proc", + "wasm-bindgen", + "web-sys", + "web-time", +] + +[[package]] +name = "logwise_proc" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ba61263a12347d87ece9286fab931b7f3407b06a94ab952e676b350d7054a57" + [[package]] name = "memchr" version = "2.7.4" @@ -892,9 +925,11 @@ dependencies = [ name = "orchid-base" version = "0.1.0" dependencies = [ + "async-once-cell", "async-std", "derive_destructure", "dyn-clone", + "futures", "hashbrown 0.15.2", "itertools", "lazy_static", @@ -907,6 +942,7 @@ dependencies = [ "rust-embed", "rust_decimal", "substack", + "test_executors", "trait-set", ] @@ -1050,6 +1086,12 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "priority" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3331288c73a29bd726cd92d947059399bf8e4b01f13d24f02caecd5187e5b5d5" + [[package]] name = "proc-macro-crate" version = "3.2.0" @@ -1331,6 +1373,17 @@ dependencies = [ "autocfg", ] +[[package]] +name = "some_executor" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dde6a7a1595533e5bd451727a6f9c679e54160fc67a9efbaed30a9e8f7e79a01" +dependencies = [ + "priority", + "wasm-bindgen", + "web-time", +] + [[package]] name = "stdio-perftest" version = "0.1.0" @@ -1386,6 +1439,31 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +[[package]] +name = "test_executors" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23ce2c67509cbc71cf72942e95a6ef76309f418fccd966b7540c96a6f6db3435" +dependencies = [ + "blocking_semaphore", + "logwise", + "priority", + "some_executor", + "test_executors_proc", + "wasm-bindgen", + "web-time", +] + +[[package]] +name = "test_executors_proc" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b59087b1e1332227b88c6e0ac2ca8fefccb3e2ae2caa48690a5f9cca851a2e7e" +dependencies = [ + "quote 1.0.38", + "syn 2.0.95", +] + [[package]] name = "tinyvec" version = "1.8.1" @@ -1595,6 +1673,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + [[package]] name = "winapi-util" version = "0.1.9" diff --git a/orchid-base/Cargo.toml b/orchid-base/Cargo.toml index 3e21641..23d3214 100644 --- a/orchid-base/Cargo.toml +++ b/orchid-base/Cargo.toml @@ -6,9 +6,11 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] +async-once-cell = "0.5.4" async-std = "1.13.0" derive_destructure = "1.0.0" dyn-clone = "1.0.17" +futures = "0.3.31" hashbrown = "0.15.2" itertools = "0.14.0" lazy_static = "1.5.0" @@ -21,4 +23,5 @@ ordered-float = "4.6.0" rust-embed = "8.5.0" rust_decimal = "1.36.0" substack = "1.1.1" +test_executors = "0.3.2" trait-set = "0.3.0" diff --git a/orchid-base/src/interner.rs b/orchid-base/src/interner.rs index 78716bd..c3359ad 100644 --- a/orchid-base/src/interner.rs +++ b/orchid-base/src/interner.rs @@ -1,10 +1,12 @@ use std::borrow::Borrow; +use std::future::IntoFuture; use std::hash::BuildHasher as _; use std::num::NonZeroU64; use std::ops::{Deref, DerefMut}; use std::sync::{Arc, Mutex, MutexGuard, atomic}; use std::{fmt, hash, mem}; +use async_once_cell::Lazy; use hashbrown::{HashMap, HashSet}; use itertools::Itertools as _; use orchid_api_traits::{Decode, Encode, Request}; @@ -25,9 +27,9 @@ pub struct Tok { impl Tok { pub fn new(data: Arc, marker: T::Marker) -> Self { Self { data, marker: ForceSized(marker) } } pub fn to_api(&self) -> T::Marker { self.marker.0 } - pub fn from_api(marker: M) -> Self + pub async fn from_api(marker: M) -> Self where M: InternMarker { - deintern(marker) + deintern(marker).await } pub fn arc(&self) -> Arc { self.data.clone() } } @@ -68,7 +70,7 @@ impl Decode for Tok { pub trait Interned: Eq + hash::Hash + Clone + fmt::Debug + Internable { type Marker: InternMarker + Sized; - fn intern( + async fn intern( self: Arc, req: &(impl DynRequester + ?Sized), ) -> Self::Marker; @@ -82,7 +84,7 @@ pub trait Internable: fmt::Debug { pub trait InternMarker: Copy + PartialEq + Eq + PartialOrd + Ord + hash::Hash + Sized { type Interned: Interned; - fn resolve( + async fn resolve( self, req: &(impl DynRequester + ?Sized), ) -> Tok; @@ -92,21 +94,21 @@ pub trait InternMarker: Copy + PartialEq + Eq + PartialOrd + Ord + hash::Hash + impl Interned for String { type Marker = api::TStr; - fn intern( + async fn intern( self: Arc, req: &(impl DynRequester + ?Sized), ) -> Self::Marker { - req.request(api::InternStr(self)) + req.request(api::InternStr(self)).await } fn bimap(interners: &mut TypedInterners) -> &mut Bimap { &mut interners.strings } } impl InternMarker for api::TStr { type Interned = String; - fn resolve( + async fn resolve( self, req: &(impl DynRequester + ?Sized), ) -> Tok { - Tok::new(req.request(api::ExternStr(self)), self) + Tok::new(req.request(api::ExternStr(self)).await, self) } fn get_id(self) -> NonZeroU64 { self.0 } fn from_id(id: NonZeroU64) -> Self { Self(id) } @@ -122,22 +124,22 @@ impl Internable for String { impl Interned for Vec> { type Marker = api::TStrv; - fn intern( + async fn intern( self: Arc, req: &(impl DynRequester + ?Sized), ) -> Self::Marker { - req.request(api::InternStrv(Arc::new(self.iter().map(|t| t.to_api()).collect()))) + req.request(api::InternStrv(Arc::new(self.iter().map(|t| t.to_api()).collect()))).await } fn bimap(interners: &mut TypedInterners) -> &mut Bimap { &mut interners.vecs } } impl InternMarker for api::TStrv { type Interned = Vec>; - fn resolve( + async fn resolve( self, req: &(impl DynRequester + ?Sized), ) -> Tok { let data = - Arc::new(req.request(api::ExternStrv(self)).iter().map(|m| deintern(*m)).collect_vec()); + Arc::new(req.request(api::ExternStrv(self)).await.iter().map(|m| deintern(*m)).collect_vec()); Tok::new(data, self) } fn get_id(self) -> NonZeroU64 { self.0 } @@ -151,18 +153,18 @@ impl Internable for Vec> { type Interned = Vec>; fn get_owned(&self) -> Arc { Arc::new(self.to_vec()) } } -impl Internable for Vec { - type Interned = Vec>; - fn get_owned(&self) -> Arc { - Arc::new(self.iter().map(|ts| deintern(*ts)).collect()) - } -} -impl Internable for [api::TStr] { - type Interned = Vec>; - fn get_owned(&self) -> Arc { - Arc::new(self.iter().map(|ts| deintern(*ts)).collect()) - } -} +// impl Internable for Vec { +// type Interned = Vec>; +// fn get_owned(&self) -> Arc { +// Arc::new(self.iter().map(|ts| deintern(*ts)).collect()) +// } +// } +// impl Internable for [api::TStr] { +// type Interned = Vec>; +// fn get_owned(&self) -> Arc { +// Arc::new(self.iter().map(|ts| deintern(*ts)).collect()) +// } +// } /// The number of references held to any token by the interner. const BASE_RC: usize = 3; @@ -258,7 +260,7 @@ pub fn init_replica(req: impl DynRequester + 'static) { }) } -pub fn intern(t: &(impl Internable + ?Sized)) -> Tok { +pub async fn intern(t: &(impl Internable + ?Sized)) -> Tok { let data = t.get_owned(); let mut g = interner(); let job = format!("{t:?} in {}", if g.master.is_some() { "replica" } else { "master" }); @@ -268,7 +270,7 @@ pub fn intern(t: &(impl Internable + ?Sized)) -> Tok< return tok; } let marker = match &mut g.master { - Some(c) => data.clone().intern(&**c), + Some(c) => data.clone().intern(&**c).await, None => T::Marker::from_id(NonZeroU64::new(ID.fetch_add(1, atomic::Ordering::Relaxed)).unwrap()), }; @@ -279,13 +281,13 @@ pub fn intern(t: &(impl Internable + ?Sized)) -> Tok< tok } -fn deintern(marker: M) -> Tok { +async fn deintern(marker: M) -> Tok { let mut g = interner(); if let Some(tok) = M::Interned::bimap(&mut g.interners).by_marker(marker) { return tok; } let master = g.master.as_mut().expect("ID not in local interner and this is master"); - let token = marker.resolve(&**master); + let token = marker.resolve(&**master).await; M::Interned::bimap(&mut g.interners).insert(token.clone()); token } @@ -311,16 +313,29 @@ pub fn sweep_replica() -> api::Retained { #[macro_export] macro_rules! intern { ($ty:ty : $expr:expr) => {{ + use std::future::Future; + use std::pin::Pin; + type Interned = <$ty as $crate::interner::Internable>::Interned; + type Output = $crate::interner::Tok; + type InternFuture = Pin>>; thread_local! { - static VALUE: $crate::interner::Tok<<$ty as $crate::interner::Internable>::Interned> - = $crate::interner::intern::< - <$ty as $crate::interner::Internable>::Interned - >($expr as &$ty); + static VALUE: + Pin>> = + std::rc::Rc::pin(async_once_cell::Lazy::new(Box::pin(async { + $crate::interner::intern::($expr as &$ty).await + }) as InternFuture)); } - VALUE.with(|v| v.clone()) + VALUE.with(|val| { + let val: Pin>> = val.clone(); + async move { val.as_ref().await.deref().clone() } + }) }}; } +pub async fn scratch() -> String { + Arc::pin(Lazy::new(async { "foobar".to_string() })).as_ref().await.deref().clone() +} + pub fn sweep_master(retained: api::Retained) { let mut g = interner(); assert!(g.master.is_none(), "Not master"); @@ -333,17 +348,18 @@ mod test { use std::num::NonZero; use orchid_api_traits::{Decode, enc_vec}; + use test_executors::spin_on; use super::*; use crate::api; #[test] fn test_i() { - let _: Tok = intern!(str: "foo"); - let _: Tok>> = intern!([Tok]: &[ - intern!(str: "bar"), - intern!(str: "baz") - ]); + let _: Tok = spin_on(intern!(str: "foo")); + let _: Tok>> = spin_on(intern!([Tok]: &[ + spin_on(intern!(str: "bar")), + spin_on(intern!(str: "baz")) + ])); } #[test] diff --git a/orchid-base/src/name.rs b/orchid-base/src/name.rs index 63400bf..45783b2 100644 --- a/orchid-base/src/name.rs +++ b/orchid-base/src/name.rs @@ -436,11 +436,12 @@ impl NameLike for VName {} /// cloning the token. #[macro_export] macro_rules! sym { - ($seg1:tt $( :: $seg:tt)*) => { - $crate::name::Sym::from_tok($crate::intern!([$crate::interner::Tok]: &[ - $crate::intern!(str: stringify!($seg1)) - $( , $crate::intern!(str: stringify!($seg)) )* - ])).unwrap() + ($seg1:tt $( :: $seg:tt)*) => { async { + $crate::name::Sym::from_tok($crate::intern!([$crate::interner::Tok]: &[ + $crate::intern!(str: stringify!($seg1)).await + $( , $crate::intern!(str: stringify!($seg)).await )* + ])).unwrap() + } }; (@NAME $seg:tt) => {} } diff --git a/orchid-base/src/reqnot.rs b/orchid-base/src/reqnot.rs index b19c15f..85043f3 100644 --- a/orchid-base/src/reqnot.rs +++ b/orchid-base/src/reqnot.rs @@ -24,7 +24,7 @@ trait_set! { for<'a> FnMut(&'a [u8], ReqNot) -> Pin + 'a>> + DynClone + Send + 'static; pub trait ReqFn = - for<'a> FnMut(RequestHandle, ::Req) -> Pin>> + for<'a> FnMut(RequestHandle<'a, T>, ::Req) -> Pin>>> + DynClone + Send + Sync + 'static; pub trait NotifFn = for<'a> FnMut(::Notif, ReqNot) -> Pin>> @@ -213,6 +213,7 @@ mod test { use async_std::future; use orchid_api_derive::Coding; use orchid_api_traits::{Channel, Request}; + use test_executors::spin_on; use super::{MsgSet, ReqNot}; use crate::clone; @@ -248,9 +249,9 @@ mod test { |_, _| panic!("Not receiving a request"), ); let sender = ReqNot::::new( - clone!(receiver; move |d, _| Box::pin(async { + clone!(receiver; move |d, _| clone!(receiver; Box::pin(async move { receiver.receive(d).await - })), + }))), |_, _| panic!("Should not receive notif"), |_, _| panic!("Should not receive request"), ); @@ -264,25 +265,23 @@ mod test { fn request() { let receiver = Arc::new(Mutex::>>::new(None)); let sender = Arc::new(ReqNot::::new( - { - let receiver = receiver.clone(); - move |d, _| receiver.lock().unwrap().as_ref().unwrap().receive(d) - }, + clone!(receiver; move |d, _| clone!(receiver; Box::pin(async move { + receiver.lock().unwrap().as_ref().unwrap().receive(d).await + }))), |_, _| panic!("Should not receive notif"), |_, _| panic!("Should not receive request"), )); *receiver.lock().unwrap() = Some(ReqNot::new( - { - let sender = sender.clone(); - move |d, _| sender.receive(d) - }, + clone!(sender; move |d, _| clone!(sender; Box::pin(async move { sender.receive(d).await }))), |_, _| panic!("Not receiving notifs"), |hand, req| { - assert_eq!(req, TestReq(5)); - hand.respond(&6u8) + Box::pin(async move { + assert_eq!(req, TestReq(5)); + hand.respond(&6u8).await + }) }, )); - let response = sender.request(TestReq(5)); + let response = spin_on(sender.request(TestReq(5))); assert_eq!(response, 6); } } diff --git a/orchid-host/src/subprocess.rs b/orchid-host/src/subprocess.rs index 100bed4..fe03d97 100644 --- a/orchid-host/src/subprocess.rs +++ b/orchid-host/src/subprocess.rs @@ -74,8 +74,6 @@ impl ExtPort for Subprocess { send_msg(&mut *self.stdin.lock().unwrap(), msg).unwrap() } fn recv<'a>(&self, cb: Box) -> futures::future::BoxFuture<()> { - async { - - } + async {} } } diff --git a/rustfmt.toml b/rustfmt.toml index 22936f6..405ddbd 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -7,7 +7,7 @@ style_edition = "2024" tab_spaces = 2 hard_tabs = true max_width = 100 -error_on_line_overflow = true +#error_on_line_overflow = true error_on_unformatted = true format_macro_matchers = true newline_style = "Unix" diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 1bb641e..fb3a900 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -31,14 +31,15 @@ fn main() -> io::Result { let mut contents = String::new(); File::open(file.path())?.read_to_string(&mut contents)?; for (l, line) in contents.lines().enumerate() { - if line.trim().starts_with("use") { - if let Some(c) = line.find("orchid_api") { - if Some(c) != line.find("orchid_api_") { - let dname = file.path().to_string_lossy().to_string(); - eprintln!("orchid_api imported in {dname} at {};{}", l + 1, c + 1) - } - } + if !line.trim().starts_with("use") { + continue; } + let Some(c) = line.find("orchid_api") else { continue }; + if Some(c) == line.find("orchid_api_") { + continue; + } + let dname = file.path().to_string_lossy().to_string(); + eprintln!("orchid_api imported in {dname} at {};{}", l + 1, c + 1) } } Ok(())