Skip to content

add livekit_ffi_dispose #453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
theomonnom merged 3 commits into from
Oct 2, 2024
Merged

add livekit_ffi_dispose #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f4b891
dispose
theomonnom Oct 2, 2024
966e0df
Update mod.rs
theomonnom Oct 2, 2024
4c9e3b5
Update mod.rs
theomonnom Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions livekit-ffi/src/cabi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@ pub extern "C" fn livekit_ffi_drop_handle(handle_id: FfiHandleId) -> bool {
FFI_SERVER.drop_handle(handle_id)
}

#[no_mangle]
pub extern "C" fn livekit_ffi_dispose() {
FFI_SERVER.async_runtime.block_on(FFI_SERVER.dispose());
}

#[cfg(target_os = "android")]
pub mod android {
use jni::{
Expand Down
6 changes: 4 additions & 2 deletions livekit-ffi/src/server/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ pub struct FfiServer {
/// Store all Ffi handles inside an HashMap, if this isn't efficient enough
/// We can still use Box::into_raw & Box::from_raw in the future (but keep it safe for now)
ffi_handles: DashMap<FfiHandleId, Box<dyn FfiHandle>>,
async_runtime: tokio::runtime::Runtime,
pub async_runtime: tokio::runtime::Runtime,

next_id: AtomicU64,
config: Mutex<Option<FfiConfig>>,
Expand Down Expand Up @@ -135,7 +135,9 @@ impl FfiServer {
}

pub async fn dispose(&self) {
log::info!("disposing the FfiServer, closing all rooms...");
self.logger.set_capture_logs(false);

log::info!("disposing ffi server");

// Close all rooms
let mut rooms = Vec::new();
Expand Down