mirror of
https://github.com/kidfromjupiter/nearby.git
synced 2026-09-16 15:36:12 -04:00
Fix use of deprecated MutexLock.
PiperOrigin-RevId: 877419825
This commit is contained in:
committed by
Copybara-Service
parent
e91e5fab0f
commit
574808daa6
@@ -38,7 +38,7 @@ bool Timer::Create(int delay, int interval, absl::AnyInvocable<void()> callback)
|
||||
return false;
|
||||
}
|
||||
|
||||
absl::MutexLock lock(&mutex_);
|
||||
absl::MutexLock lock(mutex_);
|
||||
if (timer_ != nullptr) {
|
||||
GNCLoggerError(@"Timer has already started.");
|
||||
return false;
|
||||
@@ -59,7 +59,7 @@ bool Timer::Create(int delay, int interval, absl::AnyInvocable<void()> callback)
|
||||
absl::AnyInvocable<void()> callback_to_run = nullptr;
|
||||
bool is_one_shot = (intervalInNanoseconds == DISPATCH_TIME_FOREVER);
|
||||
{
|
||||
absl::MutexLock lock(&mutex_);
|
||||
absl::MutexLock lock(mutex_);
|
||||
// If Stop() was called concurrently, the callback will be null.
|
||||
if (!callback_ || callback_running_) {
|
||||
return;
|
||||
@@ -76,7 +76,7 @@ bool Timer::Create(int delay, int interval, absl::AnyInvocable<void()> callback)
|
||||
callback_to_run();
|
||||
}
|
||||
{
|
||||
absl::MutexLock lock(&mutex_);
|
||||
absl::MutexLock lock(mutex_);
|
||||
if (!is_one_shot && callback_to_run) {
|
||||
// For periodic timers, move the callback back for the next run.
|
||||
callback_ = std::move(callback_to_run);
|
||||
@@ -93,7 +93,7 @@ bool Timer::Create(int delay, int interval, absl::AnyInvocable<void()> callback)
|
||||
}
|
||||
|
||||
bool Timer::Stop() {
|
||||
absl::MutexLock lock(&mutex_);
|
||||
absl::MutexLock lock(mutex_);
|
||||
if (timer_ != nullptr) {
|
||||
dispatch_source_cancel(timer_);
|
||||
timer_ = nullptr;
|
||||
|
||||
Reference in New Issue
Block a user