From f2f09b3730764b3919d8e038b5da8aaafd8c4f42 Mon Sep 17 00:00:00 2001 From: chendongsheng Date: Mon, 12 Apr 2021 15:37:04 +0800 Subject: [PATCH] fixed codex --- mindspore/ccsrc/ps/core/abstract_node.cc | 4 +-- mindspore/ccsrc/ps/core/abstract_node.h | 2 +- .../ccsrc/ps/core/communicator/http_client.cc | 29 +++++++++---------- .../ccsrc/ps/core/communicator/http_client.h | 5 ++-- .../core/communicator/http_message_handler.cc | 10 +++---- .../core/communicator/http_message_handler.h | 4 +-- .../ccsrc/ps/core/communicator/tcp_server.cc | 6 ++-- .../ccsrc/ps/core/communicator/tcp_server.h | 2 +- mindspore/ccsrc/ps/core/server_node.cc | 6 ++-- mindspore/ccsrc/ps/core/server_node.h | 2 +- mindspore/ccsrc/ps/worker.cc | 1 + mindspore/ccsrc/ps/worker.h | 2 +- 12 files changed, 36 insertions(+), 37 deletions(-) diff --git a/mindspore/ccsrc/ps/core/abstract_node.cc b/mindspore/ccsrc/ps/core/abstract_node.cc index 105cbd7357..37dc00df75 100644 --- a/mindspore/ccsrc/ps/core/abstract_node.cc +++ b/mindspore/ccsrc/ps/core/abstract_node.cc @@ -526,8 +526,8 @@ void AbstractNode::ProcessSendDataResp(std::shared_ptr meta, const auto it = receive_messages_.find(request_id); VectorPtr received_data = std::make_shared>(size, 0); if (size > 0) { - int ret = memcpy_s(received_data.get()->data(), size, data, size); - if (ret != 0) { + auto ret = memcpy_s(received_data.get()->data(), size, data, size); + if (ret != EOK) { MS_LOG(EXCEPTION) << "The memcpy_s error, errorno(" << ret << ")"; } } diff --git a/mindspore/ccsrc/ps/core/abstract_node.h b/mindspore/ccsrc/ps/core/abstract_node.h index eae22c3351..7ada48a5ad 100644 --- a/mindspore/ccsrc/ps/core/abstract_node.h +++ b/mindspore/ccsrc/ps/core/abstract_node.h @@ -130,7 +130,7 @@ class AbstractNode : public Node { // the key is rank_id, the value is rank_id's actual request_id std::unordered_map actual_rank_request_ids_; std::mutex rank_request_ids_mutex; - timeval scheduler_time_; + timeval scheduler_time_{0, 0}; std::unordered_map handlers_; }; } // namespace core diff --git a/mindspore/ccsrc/ps/core/communicator/http_client.cc b/mindspore/ccsrc/ps/core/communicator/http_client.cc index 2642d78a1e..897113ec7d 100644 --- a/mindspore/ccsrc/ps/core/communicator/http_client.cc +++ b/mindspore/ccsrc/ps/core/communicator/http_client.cc @@ -48,7 +48,7 @@ Status HttpClient::Post(const std::string &url, const void *body, size_t len, st struct evhttp_connection *connection = evhttp_connection_base_new(event_base_, dns_base_, handler->GetHostByUri(), handler->GetUriPort()); - if (!connection) { + if (connection == nullptr) { MS_LOG(ERROR) << "Create http connection failed!"; return Status::BADREQUEST; } @@ -78,7 +78,7 @@ Status HttpClient::Get(const std::string &url, std::shared_ptr struct evhttp_connection *connection = evhttp_connection_base_new(event_base_, dns_base_, handler->GetHostByUri(), handler->GetUriPort()); - if (!connection) { + if (connection == nullptr) { MS_LOG(ERROR) << "Create http connection failed!"; return Status::BADREQUEST; } @@ -94,7 +94,7 @@ void HttpClient::ReadCallback(struct evhttp_request *request, void *arg) { MS_EXCEPTION_IF_NULL(request); MS_EXCEPTION_IF_NULL(arg); auto handler = static_cast(arg); - if (event_base_loopexit(handler->http_base(), nullptr) != 0) { + if (event_base_loopexit(const_cast(handler->http_base()), nullptr) != 0) { MS_LOG(EXCEPTION) << "event base loop exit failed!"; } } @@ -104,9 +104,8 @@ int HttpClient::ReadHeaderDoneCallback(struct evhttp_request *request, void *arg MS_EXCEPTION_IF_NULL(arg); auto handler = static_cast(arg); handler->set_request(request); - MS_LOG(DEBUG) << "The http response code is:" << evhttp_request_get_response_code(request) - << ", The request code line is:" << evhttp_request_get_response_code_line(request); struct evkeyvalq *headers = evhttp_request_get_input_headers(request); + MS_EXCEPTION_IF_NULL(headers); struct evkeyval *header; TAILQ_FOREACH(header, headers, next) { MS_LOG(DEBUG) << "The key:" << header->key << ",The value:" << header->value; @@ -136,7 +135,7 @@ void HttpClient::RequestErrorCallback(enum evhttp_request_error error, void *arg MS_EXCEPTION_IF_NULL(arg); auto handler = static_cast(arg); MS_LOG(ERROR) << "The request failed, the error is:" << error; - if (event_base_loopexit(handler->http_base(), nullptr) != 0) { + if (event_base_loopexit(const_cast(handler->http_base()), nullptr) != 0) { MS_LOG(EXCEPTION) << "event base loop exit failed!"; } } @@ -150,28 +149,30 @@ void HttpClient::ConnectionCloseCallback(struct evhttp_connection *connection, v } } -void HttpClient::AddHeaders(const std::map &headers, struct evhttp_request *request, +void HttpClient::AddHeaders(const std::map &headers, const struct evhttp_request *request, std::shared_ptr handler) { MS_EXCEPTION_IF_NULL(request); - if (evhttp_add_header(evhttp_request_get_output_headers(request), "Host", handler->GetHostByUri()) != 0) { + if (evhttp_add_header(evhttp_request_get_output_headers(const_cast(request)), "Host", + handler->GetHostByUri()) != 0) { MS_LOG(EXCEPTION) << "Add header failed!"; } for (auto &header : headers) { - if (evhttp_add_header(evhttp_request_get_output_headers(request), header.first.data(), header.second.data()) != 0) { + if (evhttp_add_header(evhttp_request_get_output_headers(const_cast(request)), header.first.data(), + header.second.data()) != 0) { MS_LOG(EXCEPTION) << "Add header failed!"; } } } void HttpClient::InitRequest(std::shared_ptr handler, const std::string &url, - struct evhttp_request *request) { + const struct evhttp_request *request) { MS_EXCEPTION_IF_NULL(request); MS_EXCEPTION_IF_NULL(handler); handler->set_http_base(event_base_); handler->ParseUrl(url); - evhttp_request_set_header_cb(request, ReadHeaderDoneCallback); - evhttp_request_set_chunked_cb(request, ReadChunkDataCallback); - evhttp_request_set_error_cb(request, RequestErrorCallback); + evhttp_request_set_header_cb(const_cast(request), ReadHeaderDoneCallback); + evhttp_request_set_chunked_cb(const_cast(request), ReadChunkDataCallback); + evhttp_request_set_error_cb(const_cast(request), RequestErrorCallback); MS_LOG(DEBUG) << "The url is:" << url << ", The host is:" << handler->GetHostByUri() << ", The port is:" << handler->GetUriPort() << ", The request_url is:" << handler->GetRequestPath(); @@ -196,8 +197,6 @@ Status HttpClient::CreateRequest(std::shared_ptr handler, st } if (handler->request()) { - MS_LOG(DEBUG) << "The http response code is:" << evhttp_request_get_response_code(handler->request()) - << ", The request code line is:" << evhttp_request_get_response_code_line(handler->request()); return Status(evhttp_request_get_response_code(handler->request())); } return Status::INTERNAL; diff --git a/mindspore/ccsrc/ps/core/communicator/http_client.h b/mindspore/ccsrc/ps/core/communicator/http_client.h index 954e5a3256..26d2fb1996 100644 --- a/mindspore/ccsrc/ps/core/communicator/http_client.h +++ b/mindspore/ccsrc/ps/core/communicator/http_client.h @@ -76,9 +76,10 @@ class HttpClient { static void RequestErrorCallback(enum evhttp_request_error error, void *arg); static void ConnectionCloseCallback(struct evhttp_connection *connection, void *arg); - void AddHeaders(const std::map &headers, struct evhttp_request *request, + void AddHeaders(const std::map &headers, const struct evhttp_request *request, std::shared_ptr handler); - void InitRequest(std::shared_ptr handler, const std::string &url, struct evhttp_request *request); + void InitRequest(std::shared_ptr handler, const std::string &url, + const struct evhttp_request *request); Status CreateRequest(std::shared_ptr handler, struct evhttp_connection *connection, struct evhttp_request *request, HttpMethod method); diff --git a/mindspore/ccsrc/ps/core/communicator/http_message_handler.cc b/mindspore/ccsrc/ps/core/communicator/http_message_handler.cc index f816c51f28..ec749a469e 100644 --- a/mindspore/ccsrc/ps/core/communicator/http_message_handler.cc +++ b/mindspore/ccsrc/ps/core/communicator/http_message_handler.cc @@ -43,7 +43,7 @@ void HttpMessageHandler::InitHttpMessage() { MS_EXCEPTION_IF_NULL(event_uri_); const char *query = evhttp_uri_get_query(event_uri_); - if (query) { + if (query != nullptr) { MS_LOG(WARNING) << "The query is:" << query; evhttp_parse_query_str(query, &path_params_); } @@ -142,7 +142,7 @@ std::string HttpMessageHandler::GetRequestPath() { } std::string path_res(path); const char *query = evhttp_uri_get_query(event_uri_); - if (query) { + if (query != nullptr) { path_res.append("?"); path_res.append(query); } @@ -248,7 +248,7 @@ void HttpMessageHandler::set_content_len(const uint64_t &len) { content_len_ = l uint64_t HttpMessageHandler::content_len() { return content_len_; } -event_base *HttpMessageHandler::http_base() { return event_base_; } +const event_base *HttpMessageHandler::http_base() { return event_base_; } void HttpMessageHandler::set_http_base(const struct event_base *base) { MS_EXCEPTION_IF_NULL(base); @@ -260,9 +260,7 @@ void HttpMessageHandler::set_request(const struct evhttp_request *req) { event_request_ = const_cast(req); } -struct evhttp_request *HttpMessageHandler::request() { - return event_request_; -} +const struct evhttp_request *HttpMessageHandler::request() { return event_request_; } void HttpMessageHandler::InitBodySize() { body_->resize(content_len()); } diff --git a/mindspore/ccsrc/ps/core/communicator/http_message_handler.h b/mindspore/ccsrc/ps/core/communicator/http_message_handler.h index 96b5932a31..11b421bea2 100644 --- a/mindspore/ccsrc/ps/core/communicator/http_message_handler.h +++ b/mindspore/ccsrc/ps/core/communicator/http_message_handler.h @@ -100,10 +100,10 @@ class HttpMessageHandler { void ReceiveMessage(const void *buffer, size_t num); void set_content_len(const uint64_t &len); uint64_t content_len(); - event_base *http_base(); + const event_base *http_base(); void set_http_base(const struct event_base *base); void set_request(const struct evhttp_request *req); - struct evhttp_request *request(); + const struct evhttp_request *request(); void InitBodySize(); VectorPtr body(); void set_body(VectorPtr body); diff --git a/mindspore/ccsrc/ps/core/communicator/tcp_server.cc b/mindspore/ccsrc/ps/core/communicator/tcp_server.cc index 726bd03253..c23c2a607f 100644 --- a/mindspore/ccsrc/ps/core/communicator/tcp_server.cc +++ b/mindspore/ccsrc/ps/core/communicator/tcp_server.cc @@ -42,7 +42,7 @@ void TcpConnection::SendMessage(const void *buffer, size_t num) const { } } -TcpServer *TcpConnection::GetServer() const { return server_; } +const TcpServer *TcpConnection::GetServer() const { return server_; } const evutil_socket_t &TcpConnection::GetFd() const { return fd_; } @@ -283,7 +283,7 @@ void TcpServer::ListenerCallback(struct evconnlistener *, evutil_socket_t fd, st MS_EXCEPTION_IF_NULL(sockaddr); struct bufferevent *bev = bufferevent_socket_new(base, fd, BEV_OPT_CLOSE_ON_FREE | BEV_OPT_THREADSAFE); - if (!bev) { + if (bev == nullptr) { MS_LOG(ERROR) << "Error constructing buffer event!"; int ret = event_base_loopbreak(base); if (ret != 0) { @@ -361,7 +361,7 @@ void TcpServer::EventCallback(struct bufferevent *bev, std::int16_t events, void struct evbuffer *output = bufferevent_get_output(bev); size_t remain = evbuffer_get_length(output); auto conn = static_cast(data); - auto srv = conn->GetServer(); + auto srv = const_cast(conn->GetServer()); if (events & BEV_EVENT_EOF) { MS_LOG(INFO) << "Event buffer end of file!"; diff --git a/mindspore/ccsrc/ps/core/communicator/tcp_server.h b/mindspore/ccsrc/ps/core/communicator/tcp_server.h index f75fe356f0..64c36cb6e1 100644 --- a/mindspore/ccsrc/ps/core/communicator/tcp_server.h +++ b/mindspore/ccsrc/ps/core/communicator/tcp_server.h @@ -57,7 +57,7 @@ class TcpConnection { bool SendMessage(std::shared_ptr message) const; bool SendMessage(std::shared_ptr meta, const Protos &protos, const void *data, size_t size) const; virtual void OnReadHandler(const void *buffer, size_t numBytes); - TcpServer *GetServer() const; + const TcpServer *GetServer() const; const evutil_socket_t &GetFd() const; void set_callback(const Callback &callback); diff --git a/mindspore/ccsrc/ps/core/server_node.cc b/mindspore/ccsrc/ps/core/server_node.cc index baaffce57e..65f90da3df 100644 --- a/mindspore/ccsrc/ps/core/server_node.cc +++ b/mindspore/ccsrc/ps/core/server_node.cc @@ -42,7 +42,7 @@ bool ServerNode::Start(const uint32_t &timeout) { void ServerNode::set_handler(const RequestHandler &handler) { request_handler_ = handler; } -void ServerNode::Response(std::shared_ptr conn, std::shared_ptr meta, void *data, +void ServerNode::Response(std::shared_ptr conn, std::shared_ptr meta, const void *data, size_t size) { MS_EXCEPTION_IF_NULL(conn); MS_EXCEPTION_IF_NULL(meta); @@ -102,8 +102,8 @@ void ServerNode::ProcessSendData(std::shared_ptr conn, std::share MS_EXCEPTION_IF_NULL(meta); MS_EXCEPTION_IF_NULL(data); std::shared_ptr res(new unsigned char[size]); - int ret = memcpy_s(res.get(), size, data, size); - if (ret != 0) { + auto ret = memcpy_s(res.get(), size, data, size); + if (ret != EOK) { MS_LOG(EXCEPTION) << "The memcpy_s error, errorno(" << ret << ")"; } MS_LOG(DEBUG) << "The node role is:" << CommUtil::NodeRoleToString(node_info_.node_role_) diff --git a/mindspore/ccsrc/ps/core/server_node.h b/mindspore/ccsrc/ps/core/server_node.h index 09f40c5c8c..3622543a63 100644 --- a/mindspore/ccsrc/ps/core/server_node.h +++ b/mindspore/ccsrc/ps/core/server_node.h @@ -46,7 +46,7 @@ class ServerNode : public AbstractNode { DataPtr data, size_t size)>; void set_handler(const RequestHandler &handler); - void Response(std::shared_ptr conn, std::shared_ptr meta, void *data, size_t size); + void Response(std::shared_ptr conn, std::shared_ptr meta, const void *data, size_t size); private: void CreateTcpServer(); diff --git a/mindspore/ccsrc/ps/worker.cc b/mindspore/ccsrc/ps/worker.cc index 28dacb4247..6495608218 100644 --- a/mindspore/ccsrc/ps/worker.cc +++ b/mindspore/ccsrc/ps/worker.cc @@ -947,6 +947,7 @@ void Worker::SendForPush(int cmd, const KVMessage &send, const KVPartitioner &pa void Worker::SendForPull(int cmd, const KVMessage &send, const KVPartitioner &partitioner, const std::map &attrs, std::vector *vals, std::vector *lens) { + MS_EXCEPTION_IF_NULL(vals); PartitionKVMessages messages; partitioner(send, &messages, {}); std::vector rank_ids; diff --git a/mindspore/ccsrc/ps/worker.h b/mindspore/ccsrc/ps/worker.h index efbabd33fc..ee216f37fb 100644 --- a/mindspore/ccsrc/ps/worker.h +++ b/mindspore/ccsrc/ps/worker.h @@ -81,7 +81,7 @@ class Worker { void Finalize(); private: - Worker() : running_(false), key_cnt_(0) {} + Worker() : server_num_(-1), running_(false), key_cnt_(0) {} ~Worker() = default; Worker(const Worker &) = delete; Worker &operator=(const Worker &) = delete;