Skip to content

No public description #13910

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

No public description #13910

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions infra/indexer/merge_queue.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ void SingleThreadMergeQueue::ThreadFunction() {
std::unique_ptr<InMemoryIndex> index_to_merge = nullptr;

{
absl::MutexLock queue_lock(&queue_mutex_);
absl::MutexLock queue_lock(queue_mutex_);
queue_mutex_.Await(
absl::Condition(this, &SingleThreadMergeQueue::WaitForReading)
);
Expand All @@ -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 {
Expand All @@ -116,7 +116,7 @@ void SingleThreadMergeQueue::ThreadFunction() {
}

void SingleThreadMergeQueue::Add(std::unique_ptr<InMemoryIndex> new_index) {
absl::MutexLock queue_lock(&queue_mutex_);
absl::MutexLock queue_lock(queue_mutex_);
state_.SetAdded();
queue_mutex_.Await(
absl::Condition(this, &SingleThreadMergeQueue::WaitForWriting));
Expand All @@ -127,21 +127,21 @@ void SingleThreadMergeQueue::Add(std::unique_ptr<InMemoryIndex> 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);
}

Expand All @@ -152,11 +152,11 @@ void SingleThreadMergeQueue::Cancel() {

std::unique_ptr<InMemoryIndex> 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_);
}

Expand Down
Loading