Skip to content

futurize::invoke: use std::invoke and forwarding #3019

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

Merged
merged 1 commit into from
Oct 4, 2025
Merged

futurize::invoke: use std::invoke and forwarding #3019

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
8 changes: 4 additions & 4 deletions include/seastar/core/future.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1994,14 +1994,14 @@ template<typename T>
template<typename Func, typename... FuncArgs>
typename futurize<T>::type futurize<T>::invoke(Func&& func, FuncArgs&&... args) noexcept {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Forward the function itself, not just the arguments. This allows
    an rvalue-qualified operator() to be called if present.

950b54e beat you to it, so now you get to rebase and I get to re-run CI

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah haha, weird how it was like that for 8 years or whatever then suddenly two very similar changes collide.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rebased and commit message updated.

try {
using ret_t = decltype(std::forward<Func>(func)(std::forward<FuncArgs>(args)...));
using ret_t = std::invoke_result_t<Func, FuncArgs&&...>;
if constexpr (std::is_void_v<ret_t>) {
std::forward<Func>(func)(std::forward<FuncArgs>(args)...);
std::invoke(std::forward<Func>(func), std::forward<FuncArgs>(args)...);
return make_ready_future<>();
} else if constexpr (is_future<ret_t>::value) {
return std::forward<Func>(func)(std::forward<FuncArgs>(args)...);
return std::invoke(std::forward<Func>(func), std::forward<FuncArgs>(args)...);
} else {
return convert(std::forward<Func>(func)(std::forward<FuncArgs>(args)...));
return convert(std::invoke(std::forward<Func>(func), std::forward<FuncArgs>(args)...));
}
} catch (...) {
return current_exception_as_future();
Expand Down