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

Common log optimize

Browse Source
pull/1328/head
liyihan2@huawei.com 4 years ago
parent 1d24765b0c
commit e943ac3eab
2 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File

30
ge/common/auth/file_saver.cc
Unescape View File

@ -33,7 +33,8 @@ const int kFileOpSuccess = 0;
namespace ge {
Status FileSaver::OpenFile(int32_t &fd, const std::string &file_path) {
if (CheckPath(file_path) != SUCCESS) {
GELOGE(FAILED, "Check output file failed.");
GELOGE(FAILED, "[Open][File]Check output file failed, file_path:%s.", file_path);
REPORT_INPUT_ERROR("E10052", std::vector<std::string>({"path"}), std::vector<std::string>({file_path}));
return FAILED;
}
@ -45,7 +46,7 @@ Status FileSaver::OpenFile(int32_t &fd, const std::string &file_path) {
fd = mmOpen2(real_path, M_RDWR | M_CREAT | O_TRUNC, mode);
if (fd == EN_INVALID_PARAM || fd == EN_ERROR) {
// -1: Failed to open file; - 2: Illegal parameter
GELOGE(FAILED, "Open file failed. mmpa_errno = %d, %s", fd, strerror(errno));
GELOGE(FAILED, "[Open][File]Open file failed. mmpa_errno = fd:%d, error:%s", fd, strerror(errno));
return FAILED;
}
return SUCCESS;
@ -62,7 +63,7 @@ Status FileSaver::WriteData(const void *data, uint32_t size, int32_t fd) {
while (size > size_1g) {
write_count = mmWrite(fd, reinterpret_cast<void *>(seek), size_1g);
if (write_count == EN_INVALID_PARAM || write_count == EN_ERROR) {
GELOGE(FAILED, "Write data failed. mmpa_errorno = %ld, %s", write_count, strerror(errno));
GELOGE(FAILED, "[Write][Data]Write data failed. mmpa_errorno = write_count:%ld, error:%s", write_count, strerror(errno));
return FAILED;
}
size -= size_1g;
@ -75,7 +76,7 @@ Status FileSaver::WriteData(const void *data, uint32_t size, int32_t fd) {
// -1: Failed to write to file; - 2: Illegal parameter
if (write_count == EN_INVALID_PARAM || write_count == EN_ERROR) {
GELOGE(FAILED, "Write data failed. mmpa_errorno = %ld, %s", write_count, strerror(errno));
GELOGE(FAILED, "[Write][Data]Write data failed. mmpa_errorno = write_count:%ld, error:%s", write_count, strerror(errno));
return FAILED;
}
@ -85,7 +86,8 @@ Status FileSaver::WriteData(const void *data, uint32_t size, int32_t fd) {
Status FileSaver::SaveWithFileHeader(const std::string &file_path, const ModelFileHeader &file_header, const void *data,
int len) {
if (data == nullptr || len <= 0) {
GELOGE(FAILED, "Model_data is null or the length[%d] less than 1.", len);
GELOGE(FAILED, "[Save][File]Failed, model_data is null or the length[%d] is less than 1.", len);
REPORT_INNER_ERROR("E19999", "Init save file failed, model_data is null or the length:%d is less than 1.", len);
return FAILED;
}
@ -104,7 +106,7 @@ Status FileSaver::SaveWithFileHeader(const std::string &file_path, const ModelFi
} while (0);
// Close file
if (mmClose(fd) != 0) { // mmClose 0: success
GELOGE(FAILED, "Close file failed.");
GELOGE(FAILED, "[Save][File]Close file failed, error_code:%u.", ret);
ret = FAILED;
}
return ret;
@ -193,7 +195,8 @@ Status FileSaver::SaveToBuffWithFileHeader(const ModelFileHeader &file_header,
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status FileSaver::CheckPath(const std::string &file_path) {
// Determine file path length
if (file_path.size() >= MMPA_MAX_PATH) {
GELOGE(FAILED, "Path is too long:%zu", file_path.size());
GELOGE(FAILED, "[Check][FilePath]Failed, file path's length:%zu > mmpa_max_path:%zu", file_path.size(), MMPA_MAX_PATH);
REPORT_INPUT_ERROR("E10053", std::vector<std::string>({"length"}), std:;vector<std::string>({std::to_string(file_path.size())}));
return FAILED;
}
@ -212,7 +215,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status FileSaver::CheckPath(con
// If there is a path before the file name, create the path
if (path_split_pos != -1) {
if (CreateDirectory(std::string(file_path).substr(0, static_cast<size_t>(path_split_pos))) != kFileOpSuccess) {
GELOGE(FAILED, "CreateDirectory failed, file path:%s.", file_path.c_str());
GELOGE(FAILED, "[Create][Directory]Failed, file path:%s.", file_path.c_str());
return FAILED;
}
}
@ -223,7 +226,8 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status FileSaver::CheckPath(con
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status
FileSaver::SaveToFile(const string &file_path, const ge::ModelData &model, const ModelFileHeader *model_file_header) {
if (file_path.empty() || model.model_data == nullptr || model.model_len == 0) {
GELOGE(FAILED, "Incorrected input param. file_path.empty() || model.model_data == nullptr || model.model_len == 0");
GELOGE(FAILED, "[Save][File]Incorrect input param, file_path is empty or model_data is nullptr or model_len is 0");
REPORT_INNER_ERROR("E19999", "Save file failed, at least one of the input parameters(file_path, model_data, model_len) is incorrect")
return FAILED;
}
@ -240,7 +244,8 @@ FileSaver::SaveToFile(const string &file_path, const ge::ModelData &model, const
const Status ret = SaveWithFileHeader(file_path, file_header, model.model_data, file_header.length);
if (ret != SUCCESS) {
GELOGE(FAILED, "Save file failed, file_path:%s, file header len:%u.", file_path.c_str(), file_header.length);
GELOGE(FAILED, "[Save][File]Failed, file_path:%s, file_header_len:%u, error_code:%u.",
file_path.c_str(), file_header.length, ret);
return FAILED;
}
@ -320,7 +325,8 @@ Status FileSaver::SaveWithFileHeader(const std::string &file_path, const ModelFi
FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status FileSaver::SaveToFile(const string &file_path, const void *data,
int len) {
if (data == nullptr || len <= 0) {
GELOGE(FAILED, "Model_data is null or the length[%d] less than 1.", len);
GELOGE(FAILED, "[Save][File]Failed, model_data is null or the length[%d] is less than 1.", len);
REPORT_INNER_ERROR("E19999", "Save file failed, the model_data is null or its length:%d is less than 1.", len);
return FAILED;
}
@ -335,7 +341,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status FileSaver::SaveToFile(co
// Close file
if (mmClose(fd) != 0) { // mmClose 0: success
GELOGE(FAILED, "Close file failed.");
GELOGE(FAILED, "[Save][File]Close file failed, error_code:%u.", ret);
ret = FAILED;
}
return ret;

17
ge/common/debug/memory_dumper.cc
Unescape View File

@ -41,14 +41,16 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status MemoryDumper::DumpToFile
GE_CHECK_NOTNULL(filename);
GE_CHECK_NOTNULL(data);
if (len == 0) {
GELOGE(FAILED, "len is 0.");
GELOGE(FAILED, "[Dump][Data]Init failed, data length is 0.");
REPORT_INPUT_ERROR("E10054", std::vector<std::string>({"length"}), std::vector<std::string>({std::to_string(len)}));
return PARAM_INVALID;
}
// Open the file
int fd = OpenFile(filename);
if (fd == kInvalidFd) {
GELOGE(FAILED, "Open file failed.");
GELOGE(FAILED, "[Dump][Data]Open file failed, filename:%s.", filename.c_str());
REPORT_INPUT_ERROR("E10055", std::vector<std::string>({"filename"}), std::vector<std::string>({filename.c_str()}));
return FAILED;
}
@ -57,13 +59,13 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status MemoryDumper::DumpToFile
int32_t mmpa_ret = mmWrite(fd, data, len);
// mmWrite return -1:Failed to write data to file；return -2:Invalid parameter
if (mmpa_ret == EN_ERROR || mmpa_ret == EN_INVALID_PARAM) {
GELOGE(FAILED, "Write to file failed. errno = %d, %s", mmpa_ret, strerror(errno));
GELOGE(FAILED, "[Dump][Data]Write data to file failed. errno = mmpa_ret:%d, error:%s", mmpa_ret, strerror(errno));
ret = FAILED;
}
// Close the file
if (mmClose(fd) != EN_OK) { // mmClose return 0: success
GELOGE(FAILED, "Close file failed.");
GELOGE(FAILED, "[Dump][Data]Close file failed, error_code:%u.", ret);
ret = FAILED;
}
@ -89,7 +91,8 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status MemoryDumper::Open(const
fd_ = OpenFile(filename);
if (fd_ == kInvalidFd) {
GELOGE(FAILED, "Open %s failed.", filename);
GELOGE(FAILED, "[Open][File]Open file:%s failed.", filename);
REPORT_INNER_ERROR("E19999", "Open file:%s failed.", filename)
return FAILED;
}
@ -104,7 +107,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status MemoryDumper::Dump(void
int32_t mmpa_ret = mmWrite(fd_, data, len);
// mmWrite return -1:failed to write data to file；return -2:invalid parameter
if (mmpa_ret == EN_ERROR || mmpa_ret == EN_INVALID_PARAM) {
GELOGE(FAILED, "Write to file failed. errno = %d, %s", mmpa_ret, strerror(errno));
GELOGE(FAILED, "[Dump][Data]Write data to file failed, errno = mmpa_ret:%d, error:%s", mmpa_ret, strerror(errno));
return FAILED;
}
@ -157,7 +160,7 @@ int MemoryDumper::OpenFile(const char *filename) {
int32_t fd = mmOpen2(real_path.c_str(), M_RDWR | M_CREAT | O_TRUNC, mode);
if (fd == EN_ERROR || fd == EN_INVALID_PARAM) {
GELOGE(kInvalidFd, "open file failed. errno = %d, %s", fd, strerror(errno));
GELOGE(kInvalidFd, "[Open][File]Failed. errno = %d, %s", fd, strerror(errno));
return kInvalidFd;
}
return fd;

Write Preview
Loading…
Cancel
Save