TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-14 22:56:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix failed to shutdown running task in scheduled executor.

Browse Source 
PiperOrigin-RevId: 787348234
This commit is contained in:
Edwin Wu
2025-07-25 21:14:38 -07:00
committed by Copybara-Service
parent fcd3cb0fc3
commit b587364fec
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/platform/implementation/apple/scheduled_executor.mm
+6 -5
View File
@@ -94,7 +94,6 @@ class ExecutorCancelable : public nearby::api::Cancelable {
namespace nearby {
namespace apple {
static const std::int64_t kExecutorShutdownDefaultTimeout = 500; // 0.5 seconds
ScheduledExecutor::ScheduledExecutor() { impl_ = [GNCOperationQueueImpl implWithMaxConcurrency:1]; }
@@ -107,7 +106,6 @@ ScheduledExecutor::~ScheduledExecutor() {
impl_ = nil;
}
void ScheduledExecutor::Shutdown() { Shutdown(kExecutorShutdownDefaultTimeout); }
std::shared_ptr<api::Cancelable> ScheduledExecutor::Schedule(Runnable &&runnable,
absl::Duration duration) {
@@ -159,16 +157,19 @@ bool ScheduledExecutor::DoSubmit(Runnable &&runnable) {
return true;
}
void ScheduledExecutor::Shutdown(std::int64_t timeout_millis) {
void ScheduledExecutor::Shutdown() {
if (impl_.shuttingDown) {
return;
}
// Prevent new/delayed operations from being queued/executed.
impl_.shuttingDown = YES;
// Block until either (a) all currently executing operations finish, or (b) the timeout expires.
// Block until all currently executing operations finish.
dispatch_group_t group = dispatch_group_create();
dispatch_group_async(group, dispatch_get_global_queue(DISPATCH_TARGET_QUEUE_DEFAULT, 0), ^{
[impl_.queue waitUntilAllOperationsAreFinished];
});
dispatch_group_wait(group, dispatch_time(DISPATCH_TIME_NOW, timeout_millis * NSEC_PER_MSEC));
dispatch_group_wait(group, DISPATCH_TIME_FOREVER);
}
} // namespace apple