net:icmp-client use AnyInvocable

iceboy233 · Feb 16, 2025 · 0769b7e · 0769b7e
1 parent ee7aa17
commit 0769b7e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/net/BUILD b/net/BUILD
@@ -96,6 +96,7 @@ cc_library(
         ":timer-list",
         "//base:types",
         "@com_google_absl//absl/container:flat_hash_map",
+        "@com_google_absl//absl/functional:any_invocable",
         "@org_boost_boost//:endian",
         "@org_boost_boost//:process",
         "@org_boost_boost//:smart_ptr",

diff --git a/net/icmp-client.cc b/net/icmp-client.cc
@@ -45,7 +45,7 @@ class IcmpClient::Operation : public boost::intrusive_ref_counter<
         IcmpClient &client,
         const icmp::endpoint &endpoint,
         uint16_t sequence_number,
-        std::function<void(std::error_code, ConstBufferSpan)> callback);
+        absl::AnyInvocable<void(std::error_code, ConstBufferSpan) &&> callback);
     ~Operation();
 
     Operation(const Operation &) = delete;
@@ -58,7 +58,7 @@ class IcmpClient::Operation : public boost::intrusive_ref_counter<
     IcmpClient &client_;
     icmp::endpoint endpoint_;
     uint16_t sequence_number_;
-    std::function<void(std::error_code, ConstBufferSpan)> callback_;
+    absl::AnyInvocable<void(std::error_code, ConstBufferSpan) &&> callback_;
     std::optional<TimerList::Timer> timer_;
     IcmpHeader request_header_;
 };
@@ -76,10 +76,10 @@ IcmpClient::IcmpClient(const any_io_executor &executor, const Options &options)
 void IcmpClient::request(
     const icmp::endpoint &endpoint,
     ConstBufferSpan buffer,
-    std::function<void(std::error_code, ConstBufferSpan)> callback) {
+    absl::AnyInvocable<void(std::error_code, ConstBufferSpan) &&> callback) {
     uint16_t sequence_number = next_sequence_number_;
     if (operations_.find(sequence_number) != operations_.end()) {
-        callback(make_error_code(std::errc::no_buffer_space), {});
+        std::move(callback)(make_error_code(std::errc::no_buffer_space), {});
         return;
     }
     ++next_sequence_number_;
@@ -125,7 +125,7 @@ IcmpClient::Operation::Operation(
     IcmpClient &client,
     const icmp::endpoint &endpoint,
     uint16_t sequence_number,
-    std::function<void(std::error_code, ConstBufferSpan)> callback)
+    absl::AnyInvocable<void(std::error_code, ConstBufferSpan) &&> callback)
     : client_(client),
       endpoint_(endpoint),
       sequence_number_(sequence_number),
@@ -158,7 +158,7 @@ void IcmpClient::Operation::start(ConstBufferSpan buffer) {
 }
 
 void IcmpClient::Operation::finish(std::error_code ec, ConstBufferSpan buffer) {
-    callback_(ec, buffer);
+    std::move(callback_)(ec, buffer);
     intrusive_ptr_release(this);
 }
 

diff --git a/net/icmp-client.h b/net/icmp-client.h
@@ -3,11 +3,11 @@
 
 #include <chrono>
 #include <cstdint>
-#include <functional>
 #include <memory>
 #include <system_error>
 
 #include "absl/container/flat_hash_map.h"
+#include "absl/functional/any_invocable.h"
 #include "base/types.h"
 #include "net/asio.h"
 #include "net/timer-list.h"
@@ -31,7 +31,7 @@ class IcmpClient {
     void request(
         const icmp::endpoint &endpoint,
         ConstBufferSpan buffer,
-        std::function<void(std::error_code, ConstBufferSpan)> callback);
+        absl::AnyInvocable<void(std::error_code, ConstBufferSpan) &&> callback);
 
 private:
     class Operation;