m53297601
/
mindspore
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

!8837 fixed codedex

Browse Source 
From: @anancds
Reviewed-by: 
Signed-off-by:
pull/8837/MERGE
mindspore-ci-bot 4 years ago committed by Gitee
parent c65ce4f32f 7c73bc50f4
commit f894fa5b86
15 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File

3
cmake/external_libs/libevent.cmake
Unescape View File

@ -11,7 +11,7 @@ endif ()
mindspore_add_pkg(libevent
VER 2.1.12
LIBS event event_pthreads
LIBS event event_pthreads event_core
URL ${REQ_URL}
MD5 ${MD5}
CMAKE_OPTION -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_TESTING=OFF)
@ -20,3 +20,4 @@ include_directories(${libevent_INC})
add_library(mindspore::event ALIAS libevent::event)
add_library(mindspore::event_pthreads ALIAS libevent::event_pthreads)
add_library(mindspore::event_core ALIAS libevent::event_core)

5
cmake/package.cmake
Unescape View File

@ -80,8 +80,8 @@ if (USE_GLOG)
endif ()
file(GLOB_RECURSE LIBEVENT_LIB_LIST
${libevent_LIBPATH}/libevent*
${libevent_LIBPATH}/libevent_pthreads*
${libevent_LIBPATH}/libevent*${CMAKE_SHARED_LIBRARY_SUFFIX}*
${libevent_LIBPATH}/libevent_pthreads*${CMAKE_SHARED_LIBRARY_SUFFIX}*
)
install(
@ -89,6 +89,7 @@ install(
DESTINATION ${INSTALL_LIB_DIR}
COMPONENT mindspore
)
if (ENABLE_MINDDATA)
install(
TARGETS _c_dataengine _c_mindrecord

1
mindspore/ccsrc/CMakeLists.txt
Unescape View File

@ -304,6 +304,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Windows")
else ()
if (ENABLE_CPU AND (ENABLE_D OR ENABLE_GPU))
target_link_libraries(mindspore mindspore::pslite proto_input mindspore::protobuf mindspore::event mindspore::event_pthreads ${zeromq_DIRPATH}/zmq_install/lib/libzmq.a)
target_link_libraries(mindspore -Wl,--no-as-needed mindspore::event_core)
if (${ENABLE_IBVERBS} STREQUAL "ON")
target_link_libraries(mindspore ibverbs rdmacm)
endif()

1
mindspore/ccsrc/ps/core/cluster_config.h
Unescape View File

@ -28,7 +28,6 @@
namespace mindspore {
namespace ps {
namespace core {
constexpr uint32_t kHeartbeatInterval = 3;
class ClusterConfig {

2
mindspore/ccsrc/ps/core/comm_util.cc
Unescape View File

@ -26,7 +26,6 @@
namespace mindspore {
namespace ps {
namespace core {
bool CommUtil::CheckIpWithRegex(const std::string &ip) {
std::regex pattern("((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?).){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)");
std::smatch res;
@ -76,7 +75,6 @@ void CommUtil::GetAvailableInterfaceAndIP(std::string *interface, std::string *i
MS_EXCEPTION_IF_NULL(if_address);
freeifaddrs(if_address);
}
} // namespace core
} // namespace ps
} // namespace mindspore

1
mindspore/ccsrc/ps/core/comm_util.h
Unescape View File

@ -49,7 +49,6 @@
namespace mindspore {
namespace ps {
namespace core {
class CommUtil {
public:
static bool CheckIpWithRegex(const std::string &ip);

8
mindspore/ccsrc/ps/core/http_message_handler.cc
Unescape View File

@ -37,7 +37,6 @@
namespace mindspore {
namespace ps {
namespace core {
void HttpMessageHandler::InitHttpMessage() {
MS_EXCEPTION_IF_NULL(event_request_);
event_uri_ = evhttp_request_get_evhttp_uri(event_request_);
@ -176,10 +175,13 @@ void HttpMessageHandler::SendResponse() {
evhttp_send_reply(event_request_, resp_code_, nullptr, resp_buf_);
}
void HttpMessageHandler::QuickResponse(int code, const std::string &body) {
void HttpMessageHandler::QuickResponse(int code, const unsigned char *body, size_t len) {
MS_EXCEPTION_IF_NULL(event_request_);
MS_EXCEPTION_IF_NULL(body);
MS_EXCEPTION_IF_NULL(resp_buf_);
AddRespString(body);
if (evbuffer_add(resp_buf_, body, len) == -1) {
MS_LOG(EXCEPTION) << "Add body to response body failed.";
}
evhttp_send_reply(event_request_, code, nullptr, resp_buf_);
}

4
mindspore/ccsrc/ps/core/http_message_handler.h
Unescape View File

@ -37,7 +37,6 @@
namespace mindspore {
namespace ps {
namespace core {
using HttpHeaders = std::map<std::string, std::list<std::string>>;
class HttpMessageHandler {
@ -79,7 +78,7 @@ class HttpMessageHandler {
// Make sure code and all response body has finished set
void SendResponse();
void QuickResponse(int code, const std::string &body);
void QuickResponse(int code, const unsigned char *body, size_t len);
void SimpleResponse(int code, const HttpHeaders &headers, const std::string &body);
// If message is empty, libevent will use default error code message instead
@ -100,7 +99,6 @@ class HttpMessageHandler {
// Body length should no more than MAX_POST_BODY_LEN, default 64kB
void ParsePostParam();
};
} // namespace core
} // namespace ps
} // namespace mindspore

6
mindspore/ccsrc/ps/core/http_server.cc
Unescape View File

@ -41,7 +41,6 @@
namespace mindspore {
namespace ps {
namespace core {
HttpServer::~HttpServer() { Stop(); }
bool HttpServer::InitServer() {
@ -50,6 +49,10 @@ bool HttpServer::InitServer() {
}
is_stop_ = false;
int result = evthread_use_pthreads();
if (result != 0) {
MS_LOG(EXCEPTION) << "Use event pthread failed!";
}
event_base_ = event_base_new();
MS_EXCEPTION_IF_NULL(event_base_);
event_http_ = evhttp_new(event_base_);
@ -164,7 +167,6 @@ void HttpServer::Stop() {
is_stop_ = true;
}
}
} // namespace core
} // namespace ps
} // namespace mindspore

3
mindspore/ccsrc/ps/core/http_server.h
Unescape View File

@ -25,6 +25,7 @@
#include <event2/keyvalq_struct.h>
#include <event2/listener.h>
#include <event2/util.h>
#include <event2/thread.h>
#include <cstdio>
#include <cstdlib>
@ -37,7 +38,6 @@
namespace mindspore {
namespace ps {
namespace core {
typedef enum eHttpMethod {
HM_GET = 1 << 0,
HM_POST = 1 << 1,
@ -92,7 +92,6 @@ class HttpServer {
bool is_init_;
std::atomic<bool> is_stop_;
};
} // namespace core
} // namespace ps
} // namespace mindspore

2
mindspore/ccsrc/ps/core/tcp_client.cc
Unescape View File

@ -35,7 +35,6 @@
namespace mindspore {
namespace ps {
namespace core {
TcpClient::TcpClient(const std::string &address, std::uint16_t port)
: event_base_(nullptr),
event_timeout_(nullptr),
@ -254,7 +253,6 @@ void TcpClient::SendMessageWithTimer() {
ev = evtimer_new(event_base_, SendHeartBeatCallback, this);
evtimer_add(ev, &timeout);
}
} // namespace core
} // namespace ps
} // namespace mindspore

1
mindspore/ccsrc/ps/core/tcp_message_handler.h
Unescape View File

@ -30,7 +30,6 @@
namespace mindspore {
namespace ps {
namespace core {
using messageReceive = std::function<void(const CommMessage &message)>;
class TcpMessageHandler {

2
mindspore/ccsrc/ps/core/tcp_server.cc
Unescape View File

@ -32,7 +32,6 @@
namespace mindspore {
namespace ps {
namespace core {
void TcpConnection::InitConnection() {
tcp_message_handler_.SetCallback([&](const CommMessage &message) {
OnServerReceiveMessage on_server_receive = server_->GetServerReceive();
@ -301,7 +300,6 @@ void TcpServer::SendMessage(const CommMessage &message) {
uint16_t TcpServer::BoundPort() const { return server_port_; }
void TcpServer::SetMessageCallback(const OnServerReceiveMessage &cb) { message_callback_ = cb; }
} // namespace core
} // namespace ps
} // namespace mindspore

2
mindspore/ccsrc/ps/core/tcp_server.h
Unescape View File

@ -36,7 +36,6 @@
namespace mindspore {
namespace ps {
namespace core {
class TcpServer;
class TcpConnection {
public:
@ -106,7 +105,6 @@ class TcpServer {
std::recursive_mutex connection_mutex_;
OnServerReceiveMessage message_callback_;
};
} // namespace core
} // namespace ps
} // namespace mindspore

3
tests/ut/cpp/ps/core/http_server_test.cc
Unescape View File

@ -75,7 +75,8 @@ class TestHttpServer : public UT::Common {
EXPECT_STREQ(resp->GetUriQuery().c_str(), "key1=value1");
EXPECT_STREQ(resp->GetRequestUri().c_str(), "/httpget?key1=value1");
EXPECT_STREQ(resp->GetUriPath().c_str(), "/httpget");
resp->QuickResponse(200, "get request success!\n");
const unsigned char ret[] = "get request success!\n";
resp->QuickResponse(200, ret, 22);
},
std::placeholders::_1);

Write Preview
Loading…
Cancel
Save