From dbb5c63cfc560767f68eb7e01b387b651c0871d2 Mon Sep 17 00:00:00 2001
From: "gengchao4@huawei.com" <gengchao4@huawei.com>
Date: Thu, 25 Mar 2021 10:35:32 +0800
Subject: [PATCH 1/2] add errorno

---
 ge/common/auth/file_saver.cc | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/ge/common/auth/file_saver.cc b/ge/common/auth/file_saver.cc
index 12999e54..53740c9c 100755
--- a/ge/common/auth/file_saver.cc
+++ b/ge/common/auth/file_saver.cc
@@ -103,9 +103,10 @@ Status FileSaver::SaveWithFileHeader(const std::string &file_path, const ModelFi
     GE_CHK_BOOL_EXEC(WriteData(data, static_cast<uint32_t>(len), fd) == SUCCESS, ret = FAILED, "WriteData FAILED");
   } while (0);
   // Close file
-  if (mmClose(fd) != 0) {  // mmClose 0: success
-    GELOGE(FAILED, "Close file failed.");
-    ret = FAILED;
+  auto ret_close = mmClose(fd);
+  if (ret_close != EN_OK) {
+    GELOGE(FAILED, "Close file failed. mmpa_errorno = %ld, %s", ret_close, strerror(errno));
+    return FAILED;
   }
   return ret;
 }
@@ -140,7 +141,11 @@ Status FileSaver::SaveWithFileHeader(const std::string &file_path, const ModelFi
     }
   } while (0);
   // Close file
-  GE_CHK_BOOL_RET_STATUS(mmClose(fd) == EN_OK, FAILED, "Close file failed.");
+  auto ret_close = mmClose(fd);
+  if (ret_close != EN_OK) {
+    GELOGE(FAILED, "Close file failed. mmpa_errorno = %ld, %s", ret_close, strerror(errno));
+    return FAILED;
+  }
   return ret;
 }
 
@@ -305,7 +310,7 @@ Status FileSaver::SaveWithFileHeader(const std::string &file_path, const ModelFi
       // Write partition data
       auto &cur_partition_datas = all_partition_datas[index];
       for (const auto &partition_data : cur_partition_datas) {
-        GELOGI("GC:size[%u]", partition_data.size);
+        GELOGI("part_size[%u]", partition_data.size);
         GE_CHK_BOOL_TRUE_EXEC_WITH_LOG(
             WriteData(static_cast<const void *>(partition_data.data), partition_data.size, fd) != SUCCESS, ret = FAILED;
             break);
@@ -313,7 +318,11 @@ Status FileSaver::SaveWithFileHeader(const std::string &file_path, const ModelFi
     }
   } while (0);
   // Close file
-  GE_CHK_BOOL_RET_STATUS(mmClose(fd) == EN_OK, FAILED, "Close file failed.");
+  auto ret_close = mmClose(fd);
+  if (ret_close != EN_OK) {
+    GELOGE(FAILED, "Close file failed. mmpa_errorno = %ld, %s", ret_close, strerror(errno));
+    return FAILED;
+  }
   return ret;
 }
 
@@ -334,9 +343,10 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status FileSaver::SaveToFile(co
   GE_CHK_BOOL_EXEC(SUCCESS == WriteData(data, (uint32_t)len, fd), ret = FAILED, "WriteData FAILED");
 
   // Close file
-  if (mmClose(fd) != 0) {  // mmClose 0: success
-    GELOGE(FAILED, "Close file failed.");
-    ret = FAILED;
+  auto ret_close = mmClose(fd);
+  if (ret_close != EN_OK) {
+    GELOGE(FAILED, "Close file failed. mmpa_errorno = %ld, %s", ret_close, strerror(errno));
+    return FAILED;
   }
   return ret;
 }

From cc31b6cb3a5c3bf4b46f8b190f6c0a7f4d8b79fa Mon Sep 17 00:00:00 2001
From: "gengchao4@huawei.com" <gengchao4@huawei.com>
Date: Fri, 26 Mar 2021 17:17:10 +0800
Subject: [PATCH 2/2] add errorno

---
 ge/common/auth/file_saver.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ge/common/auth/file_saver.cc b/ge/common/auth/file_saver.cc
index 53740c9c..624fdcc1 100755
--- a/ge/common/auth/file_saver.cc
+++ b/ge/common/auth/file_saver.cc
@@ -105,7 +105,7 @@ Status FileSaver::SaveWithFileHeader(const std::string &file_path, const ModelFi
   // Close file
   auto ret_close = mmClose(fd);
   if (ret_close != EN_OK) {
-    GELOGE(FAILED, "Close file failed. mmpa_errorno = %ld, %s", ret_close, strerror(errno));
+    GELOGE(FAILED, "Close file failed. mmpa_errorno = %d, %s", ret_close, strerror(errno));
     return FAILED;
   }
   return ret;
@@ -143,7 +143,7 @@ Status FileSaver::SaveWithFileHeader(const std::string &file_path, const ModelFi
   // Close file
   auto ret_close = mmClose(fd);
   if (ret_close != EN_OK) {
-    GELOGE(FAILED, "Close file failed. mmpa_errorno = %ld, %s", ret_close, strerror(errno));
+    GELOGE(FAILED, "Close file failed. mmpa_errorno = %d, %s", ret_close, strerror(errno));
     return FAILED;
   }
   return ret;
@@ -320,7 +320,7 @@ Status FileSaver::SaveWithFileHeader(const std::string &file_path, const ModelFi
   // Close file
   auto ret_close = mmClose(fd);
   if (ret_close != EN_OK) {
-    GELOGE(FAILED, "Close file failed. mmpa_errorno = %ld, %s", ret_close, strerror(errno));
+    GELOGE(FAILED, "Close file failed. mmpa_errorno = %d, %s", ret_close, strerror(errno));
     return FAILED;
   }
   return ret;
@@ -345,7 +345,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status FileSaver::SaveToFile(co
   // Close file
   auto ret_close = mmClose(fd);
   if (ret_close != EN_OK) {
-    GELOGE(FAILED, "Close file failed. mmpa_errorno = %ld, %s", ret_close, strerror(errno));
+    GELOGE(FAILED, "Close file failed. mmpa_errorno = %d, %s", ret_close, strerror(errno));
     return FAILED;
   }
   return ret;