Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 953f9c41 authored by Yun-hao Chung's avatar Yun-hao Chung Committed by Automerger Merge Worker
Browse files

Merge "Floss: Add extra delay in cleanup before exit" into main am: aafb9928 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3235607



Change-Id: I29db8688ff7f3e9fcb607d9738b8dd7cbf513eb4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 655e7a46 aafb9928

system/gd/rust/linux/service/src/main.rs

+6 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ const STACK_TURN_OFF_TIMEOUT_MS: Duration = Duration::from_millis(4000); 
const STACK_CLEANUP_TIMEOUT_MS: Duration = Duration::from_millis(1000);

// Time bt_stack_manager waits for cleanup profiles

const STACK_CLEANUP_PROFILES_TIMEOUT_MS: Duration = Duration::from_millis(100);

// Extra time to wait before terminating the process

const EXTRA_WAIT_BEFORE_KILL_MS: Duration = Duration::from_millis(1000);



const INIT_LOGGING_MAX_RETRY: u8 = 3;
@@ -307,6 +309,10 @@ extern "C" fn handle_sigterm(_signum: i32) { 
            log::debug!("Waiting for stack to clean up for {:?}", STACK_CLEANUP_TIMEOUT_MS);

            let _ = notifier.thread_notify.wait_timeout(guard, STACK_CLEANUP_TIMEOUT_MS);

        }



        // Extra delay to give the rest of the cleanup processes some time to finish after

        // finishing btif cleanup.

        std::thread::sleep(EXTRA_WAIT_BEFORE_KILL_MS);

    }



    log::debug!("Sigterm completed");