Introduced dylib extension format, cleared up shutdown sequence

orchid-host/src/extension.rs

@@ -19,7 +19,9 @@ use orchid_base::interner::{IStr, IStrv, es, ev, is, iv};
 use orchid_base::location::Pos;
 use orchid_base::logging::log;
 use orchid_base::name::Sym;
-use orchid_base::reqnot::{Client, ClientExt, MsgReaderExt, ReqHandleExt, ReqReaderExt, io_comm};
+use orchid_base::reqnot::{
+	Client, ClientExt, CommCtx, MsgReaderExt, ReqHandleExt, ReqReaderExt, io_comm,
+};
 use orchid_base::stash::{stash, with_stash};
 use orchid_base::tree::AtomRepr;
 
@@ -46,6 +48,7 @@ pub struct ReqPair<R: Request>(R, Sender<R::Response>);
 pub struct ExtensionData {
 	name: String,
 	ctx: Ctx,
+	comm_cx: Option<CommCtx>,
 	join_ext: Option<Box<dyn JoinHandle>>,
 	client: Rc<dyn Client>,
 	systems: Vec<SystemCtor>,
@@ -58,8 +61,10 @@ impl Drop for ExtensionData {
 	fn drop(&mut self) {
 		let client = self.client.clone();
 		let join_ext = self.join_ext.take().expect("Only called once in Drop");
+		let comm_cx = self.comm_cx.take().expect("Only used here");
 		stash(async move {
 			client.notify(api::HostExtNotif::Exit).await.unwrap();
+			comm_cx.exit().await.unwrap();
 			join_ext.join().await;
 		})
 	}
@@ -76,7 +81,7 @@ impl Extension {
 		let header2 = header.clone();
 		Ok(Self(Rc::new_cyclic(|weak: &Weak<ExtensionData>| {
 			// context not needed because exit is extension-initiated
-			let (client, _, comm) = io_comm(Rc::new(Mutex::new(init.input)), Mutex::new(init.output));
+			let (client, comm_cx, comm) = io_comm(init.input, init.output);
 			let weak2 = weak;
 			let weak = weak.clone();
 			let ctx2 = ctx.clone();
@@ -274,6 +279,7 @@ impl Extension {
 			ExtensionData {
 				name: header2.name.clone(),
 				ctx: ctx2,
+				comm_cx: Some(comm_cx),
 				systems: (header.systems.iter().cloned())
 					.map(|decl| SystemCtor { decl, ext: WeakExtension(weak2.clone()) })
 					.collect(),