Skip to content
Merged
Changes from all commits
Commits
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
56 changes: 41 additions & 15 deletions cpp/src/arrow/util/async_generator.h
Original file line number Diff line number Diff line change
Expand Up @@ -748,21 +748,31 @@ class ReadaheadGenerator {
auto state = state_;
return fut.Then(
[state](const T& result) -> Future<T> {
state->MarkFinishedIfDone(result);
if (state->finished.load()) {
if (state->num_running.fetch_sub(1) == 1) {
state->final_future.MarkFinished();
bool mark_finished = false;
{
auto guard = state->mutex.Lock();
state->MarkFinishedIfDone(result);
--state->num_running;
if (state->finished) {
mark_finished = state->num_running == 0;
}
} else {
state->num_running.fetch_sub(1);
}
if (mark_finished) {
state->final_future.MarkFinished();
}
return result;
},
[state](const Status& err) -> Future<T> {
// If there is an error we need to make sure all running
// tasks finish before we return the error.
state->finished.store(true);
if (state->num_running.fetch_sub(1) == 1) {
bool mark_finished = false;
{
auto guard = state->mutex.Lock();
state->finished = true;
--state->num_running;
mark_finished = state->num_running == 0;
}
if (mark_finished) {
state->final_future.MarkFinished();
}
return state->final_future.Then([err]() -> Result<T> { return err; });
Expand All @@ -772,20 +782,34 @@ class ReadaheadGenerator {
Future<T> operator()() {
if (state_->readahead_queue.empty()) {
// This is the first request, let's pump the underlying queue
state_->num_running.store(state_->max_readahead);
{
auto guard = state_->mutex.Lock();
// We're going to push to the queue below, but we need
// to update `num_running` while we're holding the lock.
state_->num_running = state_->max_readahead;
}
for (int i = 0; i < state_->max_readahead; i++) {
auto next = state_->source_generator();
auto next_after_check = AddMarkFinishedContinuation(std::move(next));
state_->readahead_queue.push(std::move(next_after_check));
}
}
// Pop one and add one
auto result = state_->readahead_queue.front();
auto result = std::move(state_->readahead_queue.front());
state_->readahead_queue.pop();
if (state_->finished.load()) {
bool is_finished = false;
{
auto guard = state_->mutex.Lock();
is_finished = state_->finished;
if (!is_finished) {
// We're going to push to the queue below, but we need
// to update `num_running` while we're holding the lock.
++state_->num_running;
}
}
if (is_finished) {
state_->readahead_queue.push(AsyncGeneratorEnd<T>());
} else {
state_->num_running.fetch_add(1);
auto back_of_queue = state_->source_generator();
auto back_of_queue_after_check =
AddMarkFinishedContinuation(std::move(back_of_queue));
Expand All @@ -800,16 +824,18 @@ class ReadaheadGenerator {
: source_generator(std::move(source_generator)), max_readahead(max_readahead) {}

void MarkFinishedIfDone(const T& next_result) {
// ASSERT_HELD(mutex)
if (IsIterationEnd(next_result)) {
finished.store(true);
finished = true;
}
}

AsyncGenerator<T> source_generator;
int max_readahead;
Future<> final_future = Future<>::Make();
std::atomic<int> num_running{0};
std::atomic<bool> finished{false};
int num_running{0}; // GUARDED_BY(mutex)
bool finished{false}; // GUARDED_BY(mutex)
arrow::util::Mutex mutex;
std::queue<Future<T>> readahead_queue;
};

Expand Down
Loading