Introduced dylib extension format, cleared up shutdown sequence

orchid-extension/Cargo.toml

@@ -36,6 +36,7 @@ tokio = { version = "1.49.0", optional = true, features = [] }
 tokio-util = { version = "0.7.17", optional = true, features = ["compat"] }
 
 trait-set = "0.3.0"
+unsync-pipe = { version = "0.2.0", path = "../unsync-pipe" }
 
 [features]
 tokio = ["dep:tokio", "dep:tokio-util"]

orchid-extension/src/binary.rs

@@ -9,7 +9,7 @@ use crate::ext_port::ExtPort;
 
 pub type ExtCx = api::binary::ExtensionContext;
 
-struct Spawner(api::binary::Spawner);
+struct Spawner(api::binary::SpawnerBin);
 impl Drop for Spawner {
 	fn drop(&mut self) { (self.0.drop)(self.0.data) }
 }
@@ -28,3 +28,22 @@ pub fn orchid_extension_main_body(cx: ExtCx, builder: ExtensionBuilder) {
 		spawn: Rc::new(move |fut| spawner.spawn(fut)),
 	});
 }
+
+/// Generate entrypoint for the dylib extension loader
+///
+/// # Usage
+///
+/// ```
+/// dylib_main! {
+///   ExtensionBuilder::new("orchid-std::main")
+/// }
+/// ```
+#[macro_export]
+macro_rules! dylib_main {
+	($builder:expr) => {
+		#[unsafe(no_mangle)]
+		pub extern "C" fn orchid_extension_main(cx: ::orchid_api::binary::ExtensionContext) {
+			$crate::binary::orchid_extension_main_body(cx, $builder);
+		}
+	};
+}

orchid-extension/src/entrypoint.rs

@@ -6,7 +6,6 @@ use std::rc::Rc;
 use std::{io, mem};
 
 use futures::future::{LocalBoxFuture, join_all};
-use futures::lock::Mutex;
 use futures::{AsyncRead, AsyncWrite, AsyncWriteExt, StreamExt, stream};
 use hashbrown::HashMap;
 use itertools::Itertools;
@@ -50,7 +49,7 @@ task_local::task_local! {
 fn get_client() -> Rc<dyn Client> { CLIENT.get() }
 pub async fn exit() {
 	let cx = CTX.get().borrow_mut().take();
-	cx.unwrap().exit().await
+	cx.unwrap().exit().await.unwrap()
 }
 
 /// Sent the client used for global [request] and [notify] functions within the
@@ -139,8 +138,7 @@ impl ExtensionBuilder {
 			ctx.output.as_mut().flush().await.unwrap();
 			let logger1 = LoggerImpl::from_api(&host_header.logger);
 			let logger2 = logger1.clone();
-			let (client, comm_ctx, extension_srv) =
-				io_comm(Rc::new(Mutex::new(ctx.output)), Mutex::new(ctx.input));
+			let (client, comm_ctx, extension_srv) = io_comm(ctx.output, ctx.input);
 			let extension_fut = extension_srv.listen(
 				async |n: Box<dyn MsgReader<'_>>| {
 					let notif = n.read().await.unwrap();

orchid-extension/src/tokio.rs

@@ -10,7 +10,7 @@ use crate::ext_port::ExtPort;
 /// value returned by [crate::system_ctor::SystemCtor::inst] to initiate
 /// shutdown.
 #[cfg(feature = "tokio")]
-pub async fn tokio_main(builder: ExtensionBuilder) -> ! {
+pub async fn tokio_entrypoint(builder: ExtensionBuilder) {
 	use tokio::io::{stderr, stdin, stdout};
 	use tokio::task::{LocalSet, spawn_local};
 	use tokio_util::compat::{TokioAsyncReadCompatExt, TokioAsyncWriteCompatExt};
@@ -27,5 +27,12 @@ pub async fn tokio_main(builder: ExtensionBuilder) -> ! {
 		});
 	});
 	local_set.await;
-	std::process::exit(0)
+}
+
+#[macro_export]
+macro_rules! tokio_main {
+	($builder:expr) => {
+		#[tokio::main]
+		pub async fn main() { $crate::tokio::tokio_entrypoint($builder).await }
+	};
 }