style: Remove start_server_rpc.hpp. Simplify default completion token

Tradias · Sep 5, 2024 · 4045621 · 4045621
1 parent 61cdef6
commit 4045621
Show file tree

Hide file tree

Showing 17 changed files with 91 additions and 161 deletions.
diff --git a/src/agrpc/alarm.hpp b/src/agrpc/alarm.hpp
@@ -80,7 +80,7 @@ class BasicAlarm
      * completion signature is `void(bool)`. `true` if it expired, `false` if it was canceled.
      */
     template <class Deadline, class CompletionToken = detail::DefaultCompletionTokenT<Executor>>
-    auto wait(const Deadline& deadline, CompletionToken&& token = detail::DefaultCompletionTokenT<Executor>{}) &
+    auto wait(const Deadline& deadline, CompletionToken&& token = CompletionToken{}) &
     {
         using Initiation = detail::GrpcSenderInitiation<detail::AlarmInitFunction<Deadline>>;
         if constexpr (std::is_same_v<agrpc::UseSender, detail::RemoveCrefT<CompletionToken>>)
@@ -110,7 +110,7 @@ class BasicAlarm
      * completion signature is `void(bool, BasicAlarm)`. `true` if it expired, `false` if it was canceled.
      */
     template <class Deadline, class CompletionToken = detail::DefaultCompletionTokenT<Executor>>
-    auto wait(const Deadline& deadline, CompletionToken&& token = detail::DefaultCompletionTokenT<Executor>{}) &&
+    auto wait(const Deadline& deadline, CompletionToken&& token = CompletionToken{}) &&
     {
         using Initiation = detail::MoveAlarmSenderInitiation<Deadline>;
         if constexpr (std::is_same_v<agrpc::UseSender, detail::RemoveCrefT<CompletionToken>>)

diff --git a/src/agrpc/client_rpc.hpp b/src/agrpc/client_rpc.hpp
@@ -129,8 +129,7 @@ class ClientRPCUnaryBase<PrepareAsyncUnary, Executor> : public detail::ClientRPC
      */
     template <class CompletionToken = detail::DefaultCompletionTokenT<Executor>>
     static auto request(agrpc::GrpcContext& grpc_context, StubT& stub, grpc::ClientContext& context,
-                        const RequestT& request, ResponseT& response,
-                        CompletionToken&& token = detail::DefaultCompletionTokenT<Executor>{})
+                        const RequestT& request, ResponseT& response, CompletionToken&& token = CompletionToken{})
     {
         return detail::async_initiate_sender_implementation(
             grpc_context, detail::ClientUnaryRequestSenderInitiation<ResponseT>{context, response},
@@ -143,7 +142,7 @@ class ClientRPCUnaryBase<PrepareAsyncUnary, Executor> : public detail::ClientRPC
      */
     template <class CompletionToken = detail::DefaultCompletionTokenT<Executor>>
     static auto request(const Executor& executor, StubT& stub, grpc::ClientContext& context, const RequestT& request,
-                        ResponseT& response, CompletionToken&& token = detail::DefaultCompletionTokenT<Executor>{})
+                        ResponseT& response, CompletionToken&& token = CompletionToken{})
     {
         return ClientRPCUnaryBase::request(detail::query_grpc_context(executor), stub, context, request, response,
                                            static_cast<CompletionToken&&>(token));
@@ -184,7 +183,7 @@ class ClientRPCUnaryBase<PrepareAsyncUnary, Executor> : public detail::ClientRPC
      * completion signature is `void(grpc::Status)`.
      */
     template <class CompletionToken = detail::DefaultCompletionTokenT<Executor>>
-    auto finish(ResponseT& response, CompletionToken&& token = detail::DefaultCompletionTokenT<Executor>{})
+    auto finish(ResponseT& response, CompletionToken&& token = CompletionToken{})
     {
         return detail::async_initiate_sender_implementation(
             this->grpc_context(), detail::ClientFinishUnarySenderInitation<Response>{response},
@@ -320,7 +319,7 @@ class ClientRPC<agrpc::ClientRPCType::GENERIC_UNARY, Executor>
     template <class CompletionToken = detail::DefaultCompletionTokenT<Executor>>
     static auto request(agrpc::GrpcContext& grpc_context, const std::string& method, grpc::GenericStub& stub,
                         grpc::ClientContext& context, const grpc::ByteBuffer& request, grpc::ByteBuffer& response,
-                        CompletionToken&& token = detail::DefaultCompletionTokenT<Executor>{})
+                        CompletionToken&& token = CompletionToken{})
     {
         return detail::async_initiate_sender_implementation(
             grpc_context, detail::ClientUnaryRequestSenderInitiation<Response>{context, response},
@@ -334,7 +333,7 @@ class ClientRPC<agrpc::ClientRPCType::GENERIC_UNARY, Executor>
     template <class CompletionToken = detail::DefaultCompletionTokenT<Executor>>
     static auto request(const Executor& executor, const std::string& method, grpc::GenericStub& stub,
                         grpc::ClientContext& context, const grpc::ByteBuffer& request, grpc::ByteBuffer& response,
-                        CompletionToken&& token = detail::DefaultCompletionTokenT<Executor>{})
+                        CompletionToken&& token = CompletionToken{})
     {
         return ClientRPC::request(detail::query_grpc_context(executor), method, stub, context, request, response,
                                   static_cast<CompletionToken&&>(token));
@@ -376,7 +375,7 @@ class ClientRPC<agrpc::ClientRPCType::GENERIC_UNARY, Executor>
      * completion signature is `void(grpc::Status)`.
      */
     template <class CompletionToken = detail::DefaultCompletionTokenT<Executor>>
-    auto finish(grpc::ByteBuffer& response, CompletionToken&& token = detail::DefaultCompletionTokenT<Executor>{})
+    auto finish(grpc::ByteBuffer& response, CompletionToken&& token = CompletionToken{})
     {
         return detail::async_initiate_sender_implementation(
             this->grpc_context(), detail::ClientFinishUnarySenderInitation<Response>{response},
@@ -513,7 +512,7 @@ class ClientRPC<PrepareAsyncClientStreaming, Executor> : public detail::ClientRP
      * error details.
      */
     template <class CompletionToken = detail::DefaultCompletionTokenT<Executor>>
-    auto start(StubT& stub, ResponseT& response, CompletionToken&& token = detail::DefaultCompletionTokenT<Executor>{})
+    auto start(StubT& stub, ResponseT& response, CompletionToken&& token = CompletionToken{})
     {
         return detail::async_initiate_sender_implementation(
             this->grpc_context(),
@@ -542,7 +541,7 @@ class ClientRPC<PrepareAsyncClientStreaming, Executor> : public detail::ClientRP
      * `void(bool)`. `true` indicates that the metadata was read. If it is `false`, then the call is dead.
      */
     template <class CompletionToken = detail::DefaultCompletionTokenT<Executor>>
-    auto read_initial_metadata(CompletionToken&& token = detail::DefaultCompletionTokenT<Executor>{})
+    auto read_initial_metadata(CompletionToken&& token = CompletionToken{})
     {
         return detail::async_initiate_sender_implementation(
             this->grpc_context(), detail::ClientReadInitialMetadataWritableStreamSenderInitiation{},
@@ -557,8 +556,7 @@ class ClientRPC<PrepareAsyncClientStreaming, Executor> : public detail::ClientRP
      * `write(request, token)`.
      */
     template <class CompletionToken = detail::DefaultCompletionTokenT<Executor>>
-    auto write(const RequestT& request, grpc::WriteOptions options,
-               CompletionToken&& token = detail::DefaultCompletionTokenT<Executor>{})
+    auto write(const RequestT& request, grpc::WriteOptions options, CompletionToken&& token = CompletionToken{})
     {
         return detail::async_initiate_sender_implementation(
             this->grpc_context(), detail::ClientWriteSenderInitiation<RequestT>{request, options},
@@ -578,7 +576,7 @@ class ClientRPC<PrepareAsyncClientStreaming, Executor> : public detail::ClientRP
      * channel, etc).
      */
     template <class CompletionToken = detail::DefaultCompletionTokenT<Executor>>
-    auto write(const RequestT& request, CompletionToken&& token = detail::DefaultCompletionTokenT<Executor>{})
+    auto write(const RequestT& request, CompletionToken&& token = CompletionToken{})
     {
         return write(request, grpc::WriteOptions{}, static_cast<CompletionToken&&>(token));
     }
@@ -608,7 +606,7 @@ class ClientRPC<PrepareAsyncClientStreaming, Executor> : public detail::ClientRP
      * completion signature is `void(grpc::Status)`.
      */
     template <class CompletionToken = detail::DefaultCompletionTokenT<Executor>>
-    auto finish(CompletionToken&& token = detail::DefaultCompletionTokenT<Executor>{})
+    auto finish(CompletionToken&& token = CompletionToken{})
     {
         return detail::async_initiate_sender_implementation(
             this->grpc_context(), detail::ClientFinishWritableStreamSenderInitiation{},
@@ -715,8 +713,7 @@ class ClientRPCServerStreamingBase<PrepareAsyncServerStreaming, Executor>
      * error details.
      */
     template <class CompletionToken = detail::DefaultCompletionTokenT<Executor>>
-    auto start(StubT& stub, const RequestT& request,
-               CompletionToken&& token = detail::DefaultCompletionTokenT<Executor>{})
+    auto start(StubT& stub, const RequestT& request, CompletionToken&& token = CompletionToken{})
     {
         return detail::async_initiate_sender_implementation(
             this->grpc_context(),
@@ -736,7 +733,7 @@ class ClientRPCServerStreamingBase<PrepareAsyncServerStreaming, Executor>
      * stream has failed (or been cancelled).
      */
     template <class CompletionToken = detail::DefaultCompletionTokenT<Executor>>
-    auto read(ResponseT& response, CompletionToken&& token = detail::DefaultCompletionTokenT<Executor>{})
+    auto read(ResponseT& response, CompletionToken&& token = CompletionToken{})
     {
         return detail::async_initiate_sender_implementation(
             this->grpc_context(), detail::ClientReadSenderInitiation<Responder>{*this, response},
@@ -772,7 +769,7 @@ class ClientRPCServerStreamingBase<PrepareAsyncServerStreaming, Executor>
      * completion signature is `void(grpc::Status)`.
      */
     template <class CompletionToken = detail::DefaultCompletionTokenT<Executor>>
-    auto finish(CompletionToken&& token = detail::DefaultCompletionTokenT<Executor>{})
+    auto finish(CompletionToken&& token = CompletionToken{})
     {
         return detail::async_initiate_sender_implementation(
             this->grpc_context(), detail::ClientFinishServerStreamingSenderInitation{},
@@ -873,7 +870,7 @@ class ClientRPCBidiStreamingBase<ResponderT<RequestT, ResponseT>, Executor>
      * `void(bool)`. `true` indicates that the metadata was read. If it is `false`, then the call is dead.
      */
     template <class CompletionToken = detail::DefaultCompletionTokenT<Executor>>
-    auto read_initial_metadata(CompletionToken&& token = detail::DefaultCompletionTokenT<Executor>{})
+    auto read_initial_metadata(CompletionToken&& token = CompletionToken{})
     {
         return detail::async_initiate_sender_implementation(
             this->grpc_context(), detail::ClientReadInitialMetadataWritableStreamSenderInitiation{},
@@ -894,7 +891,7 @@ class ClientRPCBidiStreamingBase<ResponderT<RequestT, ResponseT>, Executor>
      * stream has failed (or been cancelled).
      */
     template <class CompletionToken = detail::DefaultCompletionTokenT<Executor>>
-    auto read(ResponseT& response, CompletionToken&& token = detail::DefaultCompletionTokenT<Executor>{})
+    auto read(ResponseT& response, CompletionToken&& token = CompletionToken{})
     {
         return detail::async_initiate_sender_implementation(
             this->grpc_context(), detail::ClientReadSenderInitiation<Responder>{*this, response},
@@ -915,8 +912,7 @@ class ClientRPCBidiStreamingBase<ResponderT<RequestT, ResponseT>, Executor>
      * channel, etc).
      */
     template <class CompletionToken = detail::DefaultCompletionTokenT<Executor>>
-    auto write(const RequestT& request, grpc::WriteOptions options,
-               CompletionToken&& token = detail::DefaultCompletionTokenT<Executor>{})
+    auto write(const RequestT& request, grpc::WriteOptions options, CompletionToken&& token = CompletionToken{})
     {
         return detail::async_initiate_sender_implementation(
             this->grpc_context(), detail::ClientWriteSenderInitiation<RequestT>{request, options},
@@ -927,7 +923,7 @@ class ClientRPCBidiStreamingBase<ResponderT<RequestT, ResponseT>, Executor>
      * @brief Send a message to the server (default WriteOptions)
      */
     template <class CompletionToken = detail::DefaultCompletionTokenT<Executor>>
-    auto write(const RequestT& request, CompletionToken&& token = detail::DefaultCompletionTokenT<Executor>{})
+    auto write(const RequestT& request, CompletionToken&& token = CompletionToken{})
     {
         return write(request, grpc::WriteOptions{}, static_cast<CompletionToken&&>(token));
     }
@@ -949,7 +945,7 @@ class ClientRPCBidiStreamingBase<ResponderT<RequestT, ResponseT>, Executor>
      * wire because the call is already dead (i.e., canceled, deadline expired, other side dropped the channel, etc).
      */
     template <class CompletionToken = detail::DefaultCompletionTokenT<Executor>>
-    auto writes_done(CompletionToken&& token = detail::DefaultCompletionTokenT<Executor>{})
+    auto writes_done(CompletionToken&& token = CompletionToken{})
     {
         return detail::async_initiate_sender_implementation(
             this->grpc_context(), detail::ClientWritesDoneSenderInitiation{},
@@ -985,7 +981,7 @@ class ClientRPCBidiStreamingBase<ResponderT<RequestT, ResponseT>, Executor>
      * completion signature is `void(grpc::Status)`.
      */
     template <class CompletionToken = detail::DefaultCompletionTokenT<Executor>>
-    auto finish(CompletionToken&& token = detail::DefaultCompletionTokenT<Executor>{})
+    auto finish(CompletionToken&& token = CompletionToken{})
     {
         return detail::async_initiate_sender_implementation(
             this->grpc_context(), detail::ClientFinishWritableStreamSenderInitiation{},
@@ -1096,7 +1092,7 @@ class ClientRPC<PrepareAsyncBidiStreaming, Executor>
      * error details.
      */
     template <class CompletionToken = detail::DefaultCompletionTokenT<Executor>>
-    auto start(StubT& stub, CompletionToken&& token = detail::DefaultCompletionTokenT<Executor>{})
+    auto start(StubT& stub, CompletionToken&& token = CompletionToken{})
     {
         return detail::async_initiate_sender_implementation(
             this->grpc_context(),
@@ -1158,8 +1154,7 @@ class ClientRPC<agrpc::ClientRPCType::GENERIC_STREAMING, Executor>
      * error details.
      */
     template <class CompletionToken = detail::DefaultCompletionTokenT<Executor>>
-    auto start(const std::string& method, grpc::GenericStub& stub,
-               CompletionToken&& token = detail::DefaultCompletionTokenT<Executor>{})
+    auto start(const std::string& method, grpc::GenericStub& stub, CompletionToken&& token = CompletionToken{})
     {
         return detail::async_initiate_sender_implementation(
             this->grpc_context(),

diff --git a/src/agrpc/detail/grpc_context_implementation.hpp b/src/agrpc/detail/grpc_context_implementation.hpp
@@ -99,8 +99,7 @@ struct DoOneResult : CompletionQueueEventResult
 
     static DoOneResult from(CompletionQueueEventResult handled_event, bool processed_local_work) noexcept
     {
-        return {{static_cast<uint32_t>(handled_event.flags_ |
-                                       (processed_local_work ? DoOneResult::PROCESSED_LOCAL_WORK : uint32_t{}))}};
+        return {{handled_event.flags_ | (processed_local_work ? DoOneResult::PROCESSED_LOCAL_WORK : uint32_t{})}};
     }
 
     explicit operator bool() const noexcept { return processed_local_work() || handled_event(); }

diff --git a/src/agrpc/detail/register_rpc_handler_asio_base.hpp b/src/agrpc/detail/register_rpc_handler_asio_base.hpp
@@ -18,7 +18,7 @@
 #include <agrpc/detail/association.hpp>
 #include <agrpc/detail/register_rpc_handler_base.hpp>
 #include <agrpc/detail/rethrow_first_arg.hpp>
-#include <agrpc/detail/rpc_request.hpp>
+#include <agrpc/detail/server_rpc_starter.hpp>
 #include <agrpc/detail/work_tracking_completion_handler.hpp>
 #include <agrpc/grpc_context.hpp>
 
@@ -104,7 +104,7 @@ struct RegisterRPCHandlerInitiator
             .release();
     }
 
-    detail::GetServerRPCServiceT<ServerRPC>& service_;
+    detail::ServerRPCServiceT<ServerRPC>& service_;
 };
 
 template <class Operation>

diff --git a/src/agrpc/detail/register_rpc_handler_base.hpp b/src/agrpc/detail/register_rpc_handler_base.hpp
@@ -45,7 +45,7 @@ class RegisterRPCHandlerOperationComplete
 template <class ServerRPC, class RPCHandler, class StopToken>
 struct RegisterRPCHandlerOperationBase
 {
-    using Service = detail::GetServerRPCServiceT<ServerRPC>;
+    using Service = detail::ServerRPCServiceT<ServerRPC>;
     using ServerRPCExecutor = typename ServerRPC::executor_type;
 
     RegisterRPCHandlerOperationBase(const ServerRPCExecutor& executor, Service& service, RPCHandler&& rpc_handler)

diff --git a/src/agrpc/detail/register_sender_rpc_handler.hpp b/src/agrpc/detail/register_sender_rpc_handler.hpp
@@ -20,9 +20,9 @@
 #include <agrpc/detail/execution.hpp>
 #include <agrpc/detail/forward.hpp>
 #include <agrpc/detail/register_rpc_handler_base.hpp>
-#include <agrpc/detail/rpc_request.hpp>
 #include <agrpc/detail/sender_of.hpp>
 #include <agrpc/detail/server_rpc_context_base.hpp>
+#include <agrpc/detail/server_rpc_starter.hpp>
 #include <agrpc/detail/utility.hpp>
 #include <agrpc/grpc_context.hpp>
 
@@ -51,7 +51,7 @@ template <class ServerRPC, class RPCHandler>
 class [[nodiscard]] RPCHandlerSender : public detail::SenderOf<void()>
 {
   private:
-    using Service = detail::GetServerRPCServiceT<ServerRPC>;
+    using Service = detail::ServerRPCServiceT<ServerRPC>;
 
   public:
     RPCHandlerSender(agrpc::GrpcContext& grpc_context, Service& service, RPCHandler&& rpc_handler)
@@ -155,7 +155,7 @@ void create_and_start_rpc_handler_operation(
 template <class ServerRPC, class RPCHandler, class StopToken, class Allocator>
 struct RPCHandlerOperation
 {
-    using Service = detail::GetServerRPCServiceT<ServerRPC>;
+    using Service = detail::ServerRPCServiceT<ServerRPC>;
     using Traits = typename ServerRPC::Traits;
     using Starter = detail::ServerRPCStarterT<ServerRPC>;
     using RPCHandlerInvokeResult = detail::RPCHandlerInvokeResultT<Starter&, RPCHandler&, ServerRPC&>;
@@ -263,9 +263,7 @@ struct RPCHandlerOperation
                  detail::InplaceWithFunction{},
                  [&]
                  {
-                     return initial_request()
-                         .start(rpc_, operation.service(), agrpc::use_sender)
-                         .connect(StartReceiver{*this});
+                     return starter().start(rpc_, operation.service(), agrpc::use_sender).connect(StartReceiver{*this});
                  })
     {
         base().increment_ref_count();
@@ -299,7 +297,7 @@ struct RPCHandlerOperation
                 detail::InplaceWithFunction{},
                 [&]
                 {
-                    return exec::connect(initial_request().invoke(rpc_handler(), rpc_), FinishReceiver{*this});
+                    return exec::connect(starter().invoke(rpc_handler(), rpc_), FinishReceiver{*this});
                 });
             return {};
         }
@@ -326,7 +324,7 @@ struct RPCHandlerOperation
 
     auto& rpc_handler() noexcept { return base().rpc_handler(); }
 
-    auto& initial_request() noexcept { return impl1_.second(); }
+    auto& starter() noexcept { return impl1_.second(); }
 
     auto& operation_state() noexcept { return impl2_.first(); }
 

diff --git a/src/agrpc/detail/server_rpc_context_base.hpp b/src/agrpc/detail/server_rpc_context_base.hpp
@@ -128,7 +128,7 @@ struct ServerRPCContextBaseAccess
 };
 
 template <class ServerRPC>
-using GetServerRPCServiceT = decltype(detail::ServerRPCContextBaseAccess::service(std::declval<ServerRPC&>()));
+using ServerRPCServiceT = decltype(detail::ServerRPCContextBaseAccess::service(std::declval<ServerRPC&>()));
 }
 
 AGRPC_NAMESPACE_END