From 07b4a741be5f9612aac61b3bcfc45675e29e682f Mon Sep 17 00:00:00 2001 From: OSS-Fuzz Team Date: Sun, 31 Aug 2025 01:11:00 -0700 Subject: [PATCH] No public description Indexer-PiperOrigin-RevId: 801436655 --- infra/indexer/merge_queue.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/infra/indexer/merge_queue.cc b/infra/indexer/merge_queue.cc index cb8d08f99ecf..edb188589c1b 100644 --- a/infra/indexer/merge_queue.cc +++ b/infra/indexer/merge_queue.cc @@ -88,7 +88,7 @@ void SingleThreadMergeQueue::ThreadFunction() { std::unique_ptr index_to_merge = nullptr; { - absl::MutexLock queue_lock(&queue_mutex_); + absl::MutexLock queue_lock(queue_mutex_); queue_mutex_.Await( absl::Condition(this, &SingleThreadMergeQueue::WaitForReading) ); @@ -104,7 +104,7 @@ void SingleThreadMergeQueue::ThreadFunction() { } // Drop queue_mutex_ if (index_to_merge) { - absl::MutexLock index_lock(&index_mutex_); + absl::MutexLock index_lock(index_mutex_); if (!index_) { index_ = std::move(index_to_merge); } else { @@ -116,7 +116,7 @@ void SingleThreadMergeQueue::ThreadFunction() { } void SingleThreadMergeQueue::Add(std::unique_ptr new_index) { - absl::MutexLock queue_lock(&queue_mutex_); + absl::MutexLock queue_lock(queue_mutex_); state_.SetAdded(); queue_mutex_.Await( absl::Condition(this, &SingleThreadMergeQueue::WaitForWriting)); @@ -127,21 +127,21 @@ void SingleThreadMergeQueue::Add(std::unique_ptr new_index) { void SingleThreadMergeQueue::WaitUntilComplete() { { - absl::MutexLock queue_lock(&queue_mutex_); + absl::MutexLock queue_lock(queue_mutex_); state_.SetWaiting(); } thread_.join(); { - absl::MutexLock queue_lock(&queue_mutex_); + absl::MutexLock queue_lock(queue_mutex_); state_.SetFinished(); } } void SingleThreadMergeQueue::Cancel() { { - absl::MutexLock queue_lock(&queue_mutex_); + absl::MutexLock queue_lock(queue_mutex_); state_.SetFinished(/*cancelled=*/true); } @@ -152,11 +152,11 @@ void SingleThreadMergeQueue::Cancel() { std::unique_ptr SingleThreadMergeQueue::TakeIndex() { { - absl::MutexLock queue_lock(&queue_mutex_); + absl::MutexLock queue_lock(queue_mutex_); state_.SetTaken(); } - absl::MutexLock index_lock(&index_mutex_); + absl::MutexLock index_lock(index_mutex_); return std::move(index_); }