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

!17517 Fix Exception ms_context coredump at thread::~thread() 

From: @zhangzhaoju
Reviewed-by: @zh_qh,@ginfung
Signed-off-by: @zh_qh
This commit is contained in:
mindspore-ci-bot 2021-06-04 11:42:39 +08:00 committed by Gitee
parent a0b14b52e4 799f16f591
commit 278c8977d8
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mindspore/core/utils/ms_context.cc
View File

@ -126,9 +126,23 @@ void MsContext::CreateTensorPrintThread(PrintThreadCrt ctr) {
acl_tdt_print_ = ctr(print_file_path, acl_handle_);
}
static void JoinAclPrintThread(std::thread *thread) {
try {
if (thread->joinable()) {
MS_LOG(INFO) << "join acl tdt host receive process";
thread->join();
}
} catch (const std::exception &e) {
MS_LOG(ERROR) << "tdt thread join failed: " << e.what();
}
}
void MsContext::DestroyTensorPrintThread() {
// if TdtHandle::DestroyHandle called at taskmanger, all acl_handle_ will be set to nullptr;
// but not joined the print thread, so add a protect to join the thread.
if (acl_handle_ == nullptr) {
MS_LOG(INFO) << "The acl handle has been destroyed and the point is nullptr";
JoinAclPrintThread(&acl_tdt_print_);
return;
}
aclError stopStatus = acltdtStopChannel(acl_handle_);
@ -137,14 +151,7 @@ void MsContext::DestroyTensorPrintThread() {
return;
}
MS_LOG(INFO) << "Succeed stop acl data channel for host queue ";
try {
if (acl_tdt_print_.joinable()) {
MS_LOG(INFO) << "join acl tdt host receive process";
acl_tdt_print_.join();
}
} catch (const std::exception &e) {
MS_LOG(ERROR) << "tdt thread join failed: " << e.what();
}
JoinAclPrintThread(&acl_tdt_print_);
aclError destroydStatus = acltdtDestroyChannel(acl_handle_);
if (destroydStatus != ACL_SUCCESS) {
MS_LOG(ERROR) << "Failed destroy acl channel and the destroyStatus is " << destroydStatus << std::endl;