Browse Source

fix some safe warnings in debugger

tags/v1.0.0
maning202007 5 years ago
parent
commit
ec631997b0
4 changed files with 7 additions and 6 deletions
  1. +3
    -2
      mindspore/ccsrc/debug/debugger/debugger.cc
  2. +1
    -1
      mindspore/ccsrc/debug/debugger/debugger.h
  3. +2
    -2
      mindspore/ccsrc/debug/debugger/grpc_client.cc
  4. +1
    -1
      mindspore/ccsrc/runtime/device/ascend/dump/data_dumper.cc

+ 3
- 2
mindspore/ccsrc/debug/debugger/debugger.cc View File

@@ -306,7 +306,7 @@ void Debugger::PostDebugOp() {
} }
} }


std::map<std::pair<uint32_t, uint32_t>, std::string> &Debugger::GetStreamTaskToOpnameMap() {
std::map<std::pair<uint32_t, uint32_t>, std::string> Debugger::GetStreamTaskToOpnameMap() const {
return stream_task_to_opname_; return stream_task_to_opname_;
} }


@@ -749,7 +749,8 @@ uint64_t BytestoInt64(const std::vector<char> &buffer) {
uint64_t ret; uint64_t ret;


ret = ((uint64_t)buffer[7] << 56) | ((uint64_t)buffer[6] << 48) | ((uint64_t)buffer[5] << 40) | 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; return ret;
} }


+ 1
- 1
mindspore/ccsrc/debug/debugger/debugger.h View File

@@ -94,7 +94,7 @@ class Debugger : public std::enable_shared_from_this<Debugger> {


int32_t step_num() const; int32_t step_num() const;


std::map<std::pair<uint32_t, uint32_t>, std::string> &GetStreamTaskToOpnameMap();
std::map<std::pair<uint32_t, uint32_t>, std::string> GetStreamTaskToOpnameMap() const;


// check if any feature that uses the debugger backend is enabled // check if any feature that uses the debugger backend is enabled
bool DebuggerBackendEnabled(); bool DebuggerBackendEnabled();


+ 2
- 2
mindspore/ccsrc/debug/debugger/grpc_client.cc View File

@@ -79,9 +79,9 @@ std::vector<std::string> ChunkString(std::string str, int graph_size) {
} }
std::string buffer; std::string buffer;
buffer.resize(chunk_size); buffer.resize(chunk_size);
errno_t err = memcpy_s(reinterpret_cast<char *>(buffer.data()), chunk_size, str.data() + size_iter, chunk_size);
auto err = memcpy_s(reinterpret_cast<char *>(buffer.data()), chunk_size, str.data() + size_iter, chunk_size);
if (err != 0) { 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); buf.push_back(buffer);
size_iter += CHUNK_SIZE; size_iter += CHUNK_SIZE;


+ 1
- 1
mindspore/ccsrc/runtime/device/ascend/dump/data_dumper.cc View File

@@ -116,7 +116,7 @@ void DataDumper::LoadDumpInfo() {
auto debugger = mindspore::Debugger::GetInstance(); auto debugger = mindspore::Debugger::GetInstance();
MS_EXCEPTION_IF_NULL(debugger); MS_EXCEPTION_IF_NULL(debugger);
if (debugger->DebuggerBackendEnabled()) { if (debugger->DebuggerBackendEnabled()) {
std::map<std::pair<uint32_t, uint32_t>, std::string> &stream_task_to_opname = debugger->GetStreamTaskToOpnameMap();
std::map<std::pair<uint32_t, uint32_t>, std::string> stream_task_to_opname = debugger->GetStreamTaskToOpnameMap();
// extract stream id, task id and opname from runtime_info_map for overflow detection // 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::transform(runtime_info_map_.begin(), runtime_info_map_.end(),
std::inserter(stream_task_to_opname, stream_task_to_opname.end()), std::inserter(stream_task_to_opname, stream_task_to_opname.end()),


Loading…
Cancel
Save