Skip to content
Open
Show file tree
Hide file tree
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
8 changes: 6 additions & 2 deletions r/src/RTasks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,11 @@ Status RTasks::Finish() {
}
}

// then wait for the parallel tasks to finish
// submit the delayed parallel tasks and wait for them to finish
if (use_threads_) {
for (auto& task : delayed_parallel_tasks_) {
parallel_tasks_->Append(std::move(task));
}
status &= parallel_tasks_->Finish();
}

Expand All @@ -50,14 +53,15 @@ Status RTasks::Finish() {

void RTasks::Append(bool parallel, RTasks::Task&& task) {
if (parallel && use_threads_) {
parallel_tasks_->Append(std::move(task));
delayed_parallel_tasks_.push_back(std::move(task));
} else {
delayed_serial_tasks_.push_back(std::move(task));
}
}

void RTasks::Reset() {
delayed_serial_tasks_.clear();
delayed_parallel_tasks_.clear();

stop_source_.Reset();
if (use_threads_) {
Expand Down
1 change: 1 addition & 0 deletions r/src/r_task_group.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ class RTasks {
StopSource stop_source_;
std::shared_ptr<arrow::internal::TaskGroup> parallel_tasks_;
std::vector<Task> delayed_serial_tasks_;
std::vector<Task> delayed_parallel_tasks_;
};

} // namespace r
Expand Down
Loading