From ec631997b0263b4293019652cc0dce9681a2adb2 Mon Sep 17 00:00:00 2001 From: maning202007 Date: Sat, 19 Sep 2020 20:11:34 +0800 Subject: [PATCH] fix some safe warnings in debugger --- mindspore/ccsrc/debug/debugger/debugger.cc | 5 +++-- mindspore/ccsrc/debug/debugger/debugger.h | 2 +- mindspore/ccsrc/debug/debugger/grpc_client.cc | 4 ++-- mindspore/ccsrc/runtime/device/ascend/dump/data_dumper.cc | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/mindspore/ccsrc/debug/debugger/debugger.cc b/mindspore/ccsrc/debug/debugger/debugger.cc index 3bcf073229..84a3c9fe08 100644 --- a/mindspore/ccsrc/debug/debugger/debugger.cc +++ b/mindspore/ccsrc/debug/debugger/debugger.cc @@ -306,7 +306,7 @@ void Debugger::PostDebugOp() { } } -std::map, std::string> &Debugger::GetStreamTaskToOpnameMap() { +std::map, std::string> Debugger::GetStreamTaskToOpnameMap() const { return stream_task_to_opname_; } @@ -749,7 +749,8 @@ uint64_t BytestoInt64(const std::vector &buffer) { uint64_t ret; ret = ((uint64_t)buffer[7] << 56) | ((uint64_t)buffer[6] << 48) | ((uint64_t)buffer[5] << 40) | - ((uint64_t)buffer[4] << 32) | (buffer[3] << 24) | (buffer[2] << 16) | (buffer[1] << 8) | buffer[0]; + ((uint64_t)buffer[4] << 32) | ((uint64_t)buffer[3] << 24) | ((uint64_t)buffer[2] << 16) | + ((uint64_t)buffer[1] << 8) | ((uint64_t)buffer[0]); return ret; } diff --git a/mindspore/ccsrc/debug/debugger/debugger.h b/mindspore/ccsrc/debug/debugger/debugger.h index 828b26d8f1..1661fa0402 100644 --- a/mindspore/ccsrc/debug/debugger/debugger.h +++ b/mindspore/ccsrc/debug/debugger/debugger.h @@ -94,7 +94,7 @@ class Debugger : public std::enable_shared_from_this { int32_t step_num() const; - std::map, std::string> &GetStreamTaskToOpnameMap(); + std::map, std::string> GetStreamTaskToOpnameMap() const; // check if any feature that uses the debugger backend is enabled bool DebuggerBackendEnabled(); diff --git a/mindspore/ccsrc/debug/debugger/grpc_client.cc b/mindspore/ccsrc/debug/debugger/grpc_client.cc index d5b3cf7d75..71e73a5fa4 100644 --- a/mindspore/ccsrc/debug/debugger/grpc_client.cc +++ b/mindspore/ccsrc/debug/debugger/grpc_client.cc @@ -79,9 +79,9 @@ std::vector ChunkString(std::string str, int graph_size) { } std::string buffer; buffer.resize(chunk_size); - errno_t err = memcpy_s(reinterpret_cast(buffer.data()), chunk_size, str.data() + size_iter, chunk_size); + auto err = memcpy_s(reinterpret_cast(buffer.data()), chunk_size, str.data() + size_iter, chunk_size); if (err != 0) { - MS_LOG(ERROR) << "memcpy_s failed. err code is: " << err; + MS_LOG(EXCEPTION) << "memcpy_s failed. errorno is: " << err; } buf.push_back(buffer); size_iter += CHUNK_SIZE; diff --git a/mindspore/ccsrc/runtime/device/ascend/dump/data_dumper.cc b/mindspore/ccsrc/runtime/device/ascend/dump/data_dumper.cc index 58e7f23446..5b62766b6e 100644 --- a/mindspore/ccsrc/runtime/device/ascend/dump/data_dumper.cc +++ b/mindspore/ccsrc/runtime/device/ascend/dump/data_dumper.cc @@ -116,7 +116,7 @@ void DataDumper::LoadDumpInfo() { auto debugger = mindspore::Debugger::GetInstance(); MS_EXCEPTION_IF_NULL(debugger); if (debugger->DebuggerBackendEnabled()) { - std::map, std::string> &stream_task_to_opname = debugger->GetStreamTaskToOpnameMap(); + std::map, std::string> stream_task_to_opname = debugger->GetStreamTaskToOpnameMap(); // extract stream id, task id and opname from runtime_info_map for overflow detection std::transform(runtime_info_map_.begin(), runtime_info_map_.end(), std::inserter(stream_task_to_opname, stream_task_to_opname.end()),