From e362ff1b0a1a5b67d45c59c292e716329f734c64 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Wed, 11 Oct 2023 20:32:49 +0700 Subject: [PATCH] Add periodic session cleanup --- src/rtsp/gst/server.rs | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/rtsp/gst/server.rs b/src/rtsp/gst/server.rs index e2a8226..5800da7 100644 --- a/src/rtsp/gst/server.rs +++ b/src/rtsp/gst/server.rs @@ -26,6 +26,7 @@ use tokio::{ task::JoinSet, time::{timeout, Duration}, }; +use tokio_util::sync::CancellationToken; glib::wrapper! { /// The wrapped RTSPServer @@ -63,16 +64,40 @@ impl NeoRtspServer { // Attach server to default Glib context let _ = server.attach(None); let main_loop = Arc::new(MainLoop::new(None, false)); + // Run the Glib main loop. let main_loop_thread = main_loop.clone(); + let main_loop_cancel = CancellationToken::new(); + let main_loop_gaurd = main_loop_cancel.clone().drop_guard(); let handle = tokio::task::spawn_blocking(move || { main_loop_thread.run(); + drop(main_loop_gaurd); AnyResult::Ok(()) }); timeout(Duration::from_secs(5), self.imp().threads.write()) .await .with_context(|| "Timeout waiting to lock Server threads")? .spawn(async move { handle.await? }); + + let clean_up_server = server.clone(); + let handle = tokio::task::spawn_blocking(move || { + while !main_loop_cancel.is_cancelled() { + if let Some(sessions) = clean_up_server.session_pool() { + let cleanups = sessions.cleanup(); + if cleanups > 0 { + log::debug!("Cleaned up {cleanups} sessions"); + } + } + std::thread::sleep(Duration::from_secs(5)); + } + AnyResult::Ok(()) + }); + timeout(Duration::from_secs(5), self.imp().threads.write()) + .await + .with_context(|| "Timeout waiting to lock Server threads")? + .spawn(async move { handle.await? }); + + // Put copy of main loop inside the rtsp server timeout(Duration::from_secs(5), self.imp().main_loop.write()) .await .with_context(|| "Timeout waiting to lock Server main_loop")?