Skip to content
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.

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

ARROW-18183: [C++] cpp-micro benchmarks are failing on mac arm machine #14562

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
45 changes: 37 additions & 8 deletions cpp/src/arrow/util/async_util.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "arrow/util/future.h"
#include "arrow/util/iterator.h"
#include "arrow/util/mutex.h"
#include "arrow/util/thread_pool.h"

#include <memory>

Expand Down Expand Up @@ -222,23 +223,51 @@ class ARROW_EXPORT AsyncTaskScheduler {
struct SubmitTask : public Task {
explicit SubmitTask(std::unique_ptr<State> state_holder)
: state_holder(std::move(state_holder)) {}

struct SubmitTaskCallback {
explicit SubmitTaskCallback(std::unique_ptr<State> state_holder)
: state_holder(std::move(state_holder)) {}
Status operator()(const T& item) {
SubmitTaskCallback(std::unique_ptr<State> state_holder, Future<> task_completion)
: state_holder(std::move(state_holder)),
task_completion(std::move(task_completion)) {}
void operator()(const Result<T>& maybe_item) {
if (!maybe_item.ok()) {
task_completion.MarkFinished(maybe_item.status());
return;
}
const auto& item = *maybe_item;
if (IsIterationEnd(item)) {
return Status::OK();
task_completion.MarkFinished();
return;
}
Status visit_st = state_holder->visitor(item);
if (!visit_st.ok()) {
task_completion.MarkFinished(std::move(visit_st));
return;
}
ARROW_RETURN_NOT_OK(state_holder->visitor(item));
state_holder->scheduler->AddTask(
std::make_unique<SubmitTask>(std::move(state_holder)));
return Status::OK();
task_completion.MarkFinished();
}
std::unique_ptr<State> state_holder;
Future<> task_completion;
};

Result<Future<>> operator()(AsyncTaskScheduler* scheduler) {
Future<T> next = state_holder->generator();
return next.Then(SubmitTaskCallback(std::move(state_holder)));
Future<> task = Future<>::Make();
// Consume as many items as we can (those that are already finished)
// synchronously to avoid recursion / stack overflow.
while (true) {
Future<T> next = state_holder->generator();
if (next.TryAddCallback(
[&] { return SubmitTaskCallback(std::move(state_holder), task); })) {
return task;
}
ARROW_ASSIGN_OR_RAISE(T item, next.result());
if (IsIterationEnd(item)) {
task.MarkFinished();
return task;
}
ARROW_RETURN_NOT_OK(state_holder->visitor(item));
}
}
std::unique_ptr<State> state_holder;
};
Expand Down