p83571920
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!22981 Fix ps core leak 

Merge pull request !22981 from ZPaC/fix-ps-core-leak
This commit is contained in:
i-robot 2021-09-07 01:34:39 +00:00 committed by Gitee
parent 38db445a4c 88a5155fa9
commit bcabb7d5a9
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mindspore/ccsrc/ps/core/node.cc
View File

@ -85,8 +85,8 @@ bool Node::SendMessageSync(const std::shared_ptr<TcpClient> &client, const std::
} }
bool Node::Wait(uint64_t request_id, const uint32_t &timeout) { bool Node::Wait(uint64_t request_id, const uint32_t &timeout) {
std::unique_lock<std::mutex> lock(message_tracker_mutex_); std::unique_lock<std::mutex> tracker_lock(message_tracker_mutex_);
bool res = message_tracker_cond_.wait_for(lock, std::chrono::seconds(timeout), [&] { bool res = message_tracker_cond_.wait_for(tracker_lock, std::chrono::seconds(timeout), [&] {
if (message_tracker_.count(request_id)) { if (message_tracker_.count(request_id)) {
bool ret = message_tracker_[request_id].first == message_tracker_[request_id].second; bool ret = message_tracker_[request_id].first == message_tracker_[request_id].second;
return ret; return ret;
@ -94,6 +94,13 @@ bool Node::Wait(uint64_t request_id, const uint32_t &timeout) {
return false; return false;
}); });
(void)message_tracker_.erase(request_id); (void)message_tracker_.erase(request_id);
tracker_lock.unlock();
std::unique_lock<std::mutex> msgs_lock(receive_messages_mutex_);
if (receive_messages_.count(request_id) != 0) {
(void)receive_messages_.erase(request_id);
}
msgs_lock.unlock();
return res; return res;
} }