Skip to content

pipeline: avoid missing final indexing progress end #993

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
SuperDuckGOGOGO wants to merge 1 commit into
base: master
Choose a base branch
from
+28 −5
Open

pipeline: avoid missing final indexing progress end #993

Show file tree
Hide file tree
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
13 changes: 10 additions & 3 deletions src/pipeline.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,11 @@ bool indexer_Parse(SemaManager *completion, WorkingFiles *wfiles, Project *proje
}

struct RAII {
~RAII() { stats.completed++; }
~RAII() {
stats.completed++;
if (main_waiter)
main_waiter->cv.notify_one();
}
} raii;
if (!matcher.matches(request.path)) {
LOG_IF_S(INFO, loud) << "skip " << request.path;
Expand Down Expand Up @@ -756,10 +760,13 @@ void mainLoop() {
freeUnusedMemory();
has_indexed = false;
}
auto progress_changed = [&last_completed]() {
return stats.completed.load(std::memory_order_relaxed) != last_completed;
};
if (backlog.empty())
main_waiter->wait(g_quit, on_indexed, on_request);
main_waiter->waitWithCondition(g_quit, progress_changed, on_indexed, on_request);
else
main_waiter->waitUntil(backlog[0].deadline, on_indexed, on_request);
main_waiter->waitUntilWithCondition(backlog[0].deadline, progress_changed, on_indexed, on_request);
}
}

Expand Down
20 changes: 18 additions & 2 deletions src/threaded_queue.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,20 @@ struct MultiQueueWaiter {
return false;
}

template <typename Predicate>
static bool shouldWake(Predicate &predicate, std::initializer_list<BaseThreadQueue *> queues) {
return predicate() || hasState(queues);
}

template <typename... BaseThreadQueue> bool wait(std::atomic<bool> &quit, BaseThreadQueue... queues) {
return waitWithCondition(quit, [] { return false; }, queues...);
}

template <typename Predicate, typename... BaseThreadQueue>
bool waitWithCondition(std::atomic<bool> &quit, Predicate &&predicate, BaseThreadQueue... queues) {
MultiQueueLock<BaseThreadQueue...> l(queues...);
while (!quit.load(std::memory_order_relaxed)) {
if (hasState({queues...}))
if (shouldWake(predicate, {queues...}))
return false;
cv.wait(l);
}
Expand All @@ -63,8 +73,14 @@ struct MultiQueueWaiter {

template <typename... BaseThreadQueue>
void waitUntil(std::chrono::steady_clock::time_point t, BaseThreadQueue... queues) {
waitUntilWithCondition(t, [] { return false; }, queues...);
}

template <typename Predicate, typename... BaseThreadQueue>
void waitUntilWithCondition(std::chrono::steady_clock::time_point t, Predicate &&predicate,
BaseThreadQueue... queues) {
MultiQueueLock<BaseThreadQueue...> l(queues...);
if (!hasState({queues...}))
if (!shouldWake(predicate, {queues...}))
cv.wait_until(l, t);
}
};
Expand Down