From 5bb20f6ac9218b1e3b426c0b68566be7f85ad495 Mon Sep 17 00:00:00 2001 From: Zhijun Fu <37800433+zhijunfu@users.noreply.github.com> Date: Mon, 6 Jan 2020 21:35:40 +0800 Subject: [PATCH] remove unused params in grpc macros (#6677) * remove unused params in grpc macros * format * fix * format * fix --- src/ray/rpc/gcs_server/gcs_rpc_client.h | 58 +++++++------------ src/ray/rpc/grpc_client.h | 16 ++--- .../rpc/node_manager/node_manager_client.h | 11 ++-- .../object_manager/object_manager_client.h | 6 +- src/ray/rpc/worker/core_worker_client.h | 16 ++--- 5 files changed, 43 insertions(+), 64 deletions(-) diff --git a/src/ray/rpc/gcs_server/gcs_rpc_client.h b/src/ray/rpc/gcs_server/gcs_rpc_client.h index e29e725be..0ef5550c0 100644 --- a/src/ray/rpc/gcs_server/gcs_rpc_client.h +++ b/src/ray/rpc/gcs_server/gcs_rpc_client.h @@ -29,92 +29,78 @@ class GcsRpcClient { }; /// Add job info to gcs server. - VOID_RPC_CLIENT_METHOD(JobInfoGcsService, AddJob, request, callback, - job_info_grpc_client_, ) + VOID_RPC_CLIENT_METHOD(JobInfoGcsService, AddJob, job_info_grpc_client_, ) /// Mark job as finished to gcs server. - VOID_RPC_CLIENT_METHOD(JobInfoGcsService, MarkJobFinished, request, callback, - job_info_grpc_client_, ) + VOID_RPC_CLIENT_METHOD(JobInfoGcsService, MarkJobFinished, job_info_grpc_client_, ) /// Get actor data from GCS Service. - VOID_RPC_CLIENT_METHOD(ActorInfoGcsService, GetActorInfo, request, callback, - actor_info_grpc_client_, ) + VOID_RPC_CLIENT_METHOD(ActorInfoGcsService, GetActorInfo, actor_info_grpc_client_, ) /// Register an actor to GCS Service. - VOID_RPC_CLIENT_METHOD(ActorInfoGcsService, RegisterActorInfo, request, callback, + VOID_RPC_CLIENT_METHOD(ActorInfoGcsService, RegisterActorInfo, actor_info_grpc_client_, ) /// Update actor info in GCS Service. - VOID_RPC_CLIENT_METHOD(ActorInfoGcsService, UpdateActorInfo, request, callback, - actor_info_grpc_client_, ) + VOID_RPC_CLIENT_METHOD(ActorInfoGcsService, UpdateActorInfo, actor_info_grpc_client_, ) /// Add actor checkpoint data to GCS Service. - VOID_RPC_CLIENT_METHOD(ActorInfoGcsService, AddActorCheckpoint, request, callback, + VOID_RPC_CLIENT_METHOD(ActorInfoGcsService, AddActorCheckpoint, actor_info_grpc_client_, ) /// Get actor checkpoint data from GCS Service. - VOID_RPC_CLIENT_METHOD(ActorInfoGcsService, GetActorCheckpoint, request, callback, + VOID_RPC_CLIENT_METHOD(ActorInfoGcsService, GetActorCheckpoint, actor_info_grpc_client_, ) /// Get actor checkpoint id data from GCS Service. - VOID_RPC_CLIENT_METHOD(ActorInfoGcsService, GetActorCheckpointID, request, callback, + VOID_RPC_CLIENT_METHOD(ActorInfoGcsService, GetActorCheckpointID, actor_info_grpc_client_, ) /// Register a node to GCS Service. - VOID_RPC_CLIENT_METHOD(NodeInfoGcsService, RegisterNode, request, callback, - node_info_grpc_client_, ) + VOID_RPC_CLIENT_METHOD(NodeInfoGcsService, RegisterNode, node_info_grpc_client_, ) /// Unregister a node from GCS Service. - VOID_RPC_CLIENT_METHOD(NodeInfoGcsService, UnregisterNode, request, callback, - node_info_grpc_client_, ) + VOID_RPC_CLIENT_METHOD(NodeInfoGcsService, UnregisterNode, node_info_grpc_client_, ) /// Get information of all nodes from GCS Service. - VOID_RPC_CLIENT_METHOD(NodeInfoGcsService, GetAllNodeInfo, request, callback, - node_info_grpc_client_, ) + VOID_RPC_CLIENT_METHOD(NodeInfoGcsService, GetAllNodeInfo, node_info_grpc_client_, ) /// Report heartbeat of a node to GCS Service. - VOID_RPC_CLIENT_METHOD(NodeInfoGcsService, ReportHeartbeat, request, callback, - node_info_grpc_client_, ) + VOID_RPC_CLIENT_METHOD(NodeInfoGcsService, ReportHeartbeat, node_info_grpc_client_, ) /// Report batch heartbeat to GCS Service. - VOID_RPC_CLIENT_METHOD(NodeInfoGcsService, ReportBatchHeartbeat, request, callback, + VOID_RPC_CLIENT_METHOD(NodeInfoGcsService, ReportBatchHeartbeat, node_info_grpc_client_, ) /// Get node's resources from GCS Service. - VOID_RPC_CLIENT_METHOD(NodeInfoGcsService, GetResources, request, callback, - node_info_grpc_client_, ) + VOID_RPC_CLIENT_METHOD(NodeInfoGcsService, GetResources, node_info_grpc_client_, ) /// Update resources of a node in GCS Service. - VOID_RPC_CLIENT_METHOD(NodeInfoGcsService, UpdateResources, request, callback, - node_info_grpc_client_, ) + VOID_RPC_CLIENT_METHOD(NodeInfoGcsService, UpdateResources, node_info_grpc_client_, ) /// Delete resources of a node in GCS Service. - VOID_RPC_CLIENT_METHOD(NodeInfoGcsService, DeleteResources, request, callback, - node_info_grpc_client_, ) + VOID_RPC_CLIENT_METHOD(NodeInfoGcsService, DeleteResources, node_info_grpc_client_, ) /// Get object's locations from GCS Service. - VOID_RPC_CLIENT_METHOD(ObjectInfoGcsService, GetObjectLocations, request, callback, + VOID_RPC_CLIENT_METHOD(ObjectInfoGcsService, GetObjectLocations, object_info_grpc_client_, ) /// Add location of object to GCS Service. - VOID_RPC_CLIENT_METHOD(ObjectInfoGcsService, AddObjectLocation, request, callback, + VOID_RPC_CLIENT_METHOD(ObjectInfoGcsService, AddObjectLocation, object_info_grpc_client_, ) /// Remove location of object to GCS Service. - VOID_RPC_CLIENT_METHOD(ObjectInfoGcsService, RemoveObjectLocation, request, callback, + VOID_RPC_CLIENT_METHOD(ObjectInfoGcsService, RemoveObjectLocation, object_info_grpc_client_, ) /// Add a task to GCS Service. - VOID_RPC_CLIENT_METHOD(TaskInfoGcsService, AddTask, request, callback, - task_info_grpc_client_, ) + VOID_RPC_CLIENT_METHOD(TaskInfoGcsService, AddTask, task_info_grpc_client_, ) /// Get task information from GCS Service. - VOID_RPC_CLIENT_METHOD(TaskInfoGcsService, GetTask, request, callback, - task_info_grpc_client_, ) + VOID_RPC_CLIENT_METHOD(TaskInfoGcsService, GetTask, task_info_grpc_client_, ) /// Delete tasks from GCS Service. - VOID_RPC_CLIENT_METHOD(TaskInfoGcsService, DeleteTasks, request, callback, - task_info_grpc_client_, ) + VOID_RPC_CLIENT_METHOD(TaskInfoGcsService, DeleteTasks, task_info_grpc_client_, ) private: /// The gRPC-generated stub. diff --git a/src/ray/rpc/grpc_client.h b/src/ray/rpc/grpc_client.h index 7171ced6d..2e1687b66 100644 --- a/src/ray/rpc/grpc_client.h +++ b/src/ray/rpc/grpc_client.h @@ -20,17 +20,17 @@ namespace rpc { }) // Define a void RPC client method. -#define VOID_RPC_CLIENT_METHOD(SERVICE, METHOD, request, callback, rpc_client, SPECS) \ - void METHOD(const METHOD##Request &request, \ - const ClientCallback &callback) SPECS { \ - RAY_UNUSED(INVOKE_RPC_CALL(SERVICE, METHOD, request, callback, rpc_client)); \ +#define VOID_RPC_CLIENT_METHOD(SERVICE, METHOD, rpc_client, SPECS) \ + void METHOD(const METHOD##Request &request, \ + const ClientCallback &callback) SPECS { \ + RAY_UNUSED(INVOKE_RPC_CALL(SERVICE, METHOD, request, callback, rpc_client)); \ } // Define a RPC client method that returns ray::Status. -#define RPC_CLIENT_METHOD(SERVICE, METHOD, request, callback, rpc_client, SPECS) \ - ray::Status METHOD(const METHOD##Request &request, \ - const ClientCallback &callback) SPECS { \ - return INVOKE_RPC_CALL(SERVICE, METHOD, request, callback, rpc_client); \ +#define RPC_CLIENT_METHOD(SERVICE, METHOD, rpc_client, SPECS) \ + ray::Status METHOD(const METHOD##Request &request, \ + const ClientCallback &callback) SPECS { \ + return INVOKE_RPC_CALL(SERVICE, METHOD, request, callback, rpc_client); \ } template diff --git a/src/ray/rpc/node_manager/node_manager_client.h b/src/ray/rpc/node_manager/node_manager_client.h index 9aedfd926..aae2d8473 100644 --- a/src/ray/rpc/node_manager/node_manager_client.h +++ b/src/ray/rpc/node_manager/node_manager_client.h @@ -33,12 +33,10 @@ class NodeManagerClient { /// /// \param[in] request The request message. /// \param[in] callback The callback function that handles reply. - VOID_RPC_CLIENT_METHOD(NodeManagerService, ForwardTask, request, callback, - grpc_client_, ) + VOID_RPC_CLIENT_METHOD(NodeManagerService, ForwardTask, grpc_client_, ) /// Get current node stats. - VOID_RPC_CLIENT_METHOD(NodeManagerService, GetNodeStats, request, callback, - grpc_client_, ) + VOID_RPC_CLIENT_METHOD(NodeManagerService, GetNodeStats, grpc_client_, ) void GetNodeStats(const ClientCallback &callback) { GetNodeStatsRequest request; @@ -70,11 +68,10 @@ class NodeManagerWorkerClient } /// Request a worker lease. - RPC_CLIENT_METHOD(NodeManagerService, RequestWorkerLease, request, callback, - grpc_client_, ) + RPC_CLIENT_METHOD(NodeManagerService, RequestWorkerLease, grpc_client_, ) /// Return a worker lease. - RPC_CLIENT_METHOD(NodeManagerService, ReturnWorker, request, callback, grpc_client_, ) + RPC_CLIENT_METHOD(NodeManagerService, ReturnWorker, grpc_client_, ) private: /// Constructor. diff --git a/src/ray/rpc/object_manager/object_manager_client.h b/src/ray/rpc/object_manager/object_manager_client.h index 8d4450105..01f6ec937 100644 --- a/src/ray/rpc/object_manager/object_manager_client.h +++ b/src/ray/rpc/object_manager/object_manager_client.h @@ -41,21 +41,21 @@ class ObjectManagerClient { /// /// \param request The request message. /// \param callback The callback function that handles reply from server - VOID_RPC_CLIENT_METHOD(ObjectManagerService, Push, request, callback, + VOID_RPC_CLIENT_METHOD(ObjectManagerService, Push, grpc_clients_[push_rr_index_++ % num_connections_], ) /// Pull object from remote object manager /// /// \param request The request message /// \param callback The callback function that handles reply from server - VOID_RPC_CLIENT_METHOD(ObjectManagerService, Pull, request, callback, + VOID_RPC_CLIENT_METHOD(ObjectManagerService, Pull, grpc_clients_[pull_rr_index_++ % num_connections_], ) /// Tell remote object manager to free objects /// /// \param request The request message /// \param callback The callback function that handles reply - VOID_RPC_CLIENT_METHOD(ObjectManagerService, FreeObjects, request, callback, + VOID_RPC_CLIENT_METHOD(ObjectManagerService, FreeObjects, grpc_clients_[freeobjects_rr_index_++ % num_connections_], ) private: diff --git a/src/ray/rpc/worker/core_worker_client.h b/src/ray/rpc/worker/core_worker_client.h index d6ee6e635..7fd0f8f69 100644 --- a/src/ray/rpc/worker/core_worker_client.h +++ b/src/ray/rpc/worker/core_worker_client.h @@ -152,20 +152,16 @@ class CoreWorkerClient : public std::enable_shared_from_this, new GrpcClient(address, port, client_call_manager)); }; - RPC_CLIENT_METHOD(CoreWorkerService, AssignTask, request, callback, grpc_client_, + RPC_CLIENT_METHOD(CoreWorkerService, AssignTask, grpc_client_, override) + + RPC_CLIENT_METHOD(CoreWorkerService, DirectActorCallArgWaitComplete, grpc_client_, override) - RPC_CLIENT_METHOD(CoreWorkerService, DirectActorCallArgWaitComplete, request, callback, - grpc_client_, override) + RPC_CLIENT_METHOD(CoreWorkerService, GetObjectStatus, grpc_client_, override) - RPC_CLIENT_METHOD(CoreWorkerService, GetObjectStatus, request, callback, grpc_client_, - override) + RPC_CLIENT_METHOD(CoreWorkerService, KillActor, grpc_client_, override) - RPC_CLIENT_METHOD(CoreWorkerService, KillActor, request, callback, grpc_client_, - override) - - RPC_CLIENT_METHOD(CoreWorkerService, GetCoreWorkerStats, request, callback, - grpc_client_, override) + RPC_CLIENT_METHOD(CoreWorkerService, GetCoreWorkerStats, grpc_client_, override) ray::Status PushActorTask(std::unique_ptr request, const ClientCallback &callback) override {