From 04531e042a69656b85b61e45082bb39c79d49b44 Mon Sep 17 00:00:00 2001 From: y30045862 Date: Tue, 10 Oct 2023 17:03:48 +0800 Subject: [PATCH] =?UTF-8?q?app=5Ffile=5Fservice=E5=91=8A=E8=AD=A6=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=20Signed-off-by:=20yangjingbo10=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iaac8dced963c6fea45152986e1719d2e91fcee7d --- .../src/module_ipc/svc_session_manager.cpp | 3 +-- utils/include/b_resources/b_constants.h | 22 +++++++------------ 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/services/backup_sa/src/module_ipc/svc_session_manager.cpp b/services/backup_sa/src/module_ipc/svc_session_manager.cpp index 66564295c..f4ec832fb 100644 --- a/services/backup_sa/src/module_ipc/svc_session_manager.cpp +++ b/services/backup_sa/src/module_ipc/svc_session_manager.cpp @@ -576,11 +576,10 @@ uint32_t SvcSessionManager::CalAppProcessTime(const std::string &bundleName) const uint32_t invertMillisecond = 1000; StorageManager::BundleStats stat; uint32_t timeout; - uint64_t appSize; try { stat = StorageMgrAdapter::GetBundleStats(bundleName); - appSize = static_cast(stat.appSize_ + stat.dataSize_); + uint64_t appSize = static_cast(stat.appSize_ + stat.dataSize_); /* % UINT_MAX force conver uint64 to uint32 */ /* timeout = (AppSize / 3Ms) * 3 + 30 */ timeout = (uint32_t)(defaultTimeout + (appSize / processRate) * multiple % UINT_MAX); diff --git a/utils/include/b_resources/b_constants.h b/utils/include/b_resources/b_constants.h index 2f580d220..af90a541c 100644 --- a/utils/include/b_resources/b_constants.h +++ b/utils/include/b_resources/b_constants.h @@ -65,8 +65,7 @@ constexpr int BLOCK_PADDING_SIZE = 1024; // 打包文件尾部追加的全零字 constexpr off_t BIG_FILE_BOUNDARY = 1024 * 1024 * 1024; // 大文件边界 constexpr unsigned long BIG_FILE_NAME_SIZE = 16; // 大文件名长度(hash处理) -// 打包文件头部Header结构体各字段数组/字符串大小。 -constexpr int PATHNAME_MAX_SIZE = 100; +constexpr int PATHNAME_MAX_SIZE = 100; // 打包文件头部Header结构体各字段数组/字符串大小。 constexpr int MODE_MAX_SIZE = 8; constexpr int UGID_MAX_SIZE = 8; constexpr int FILESIZE_MAX_SIZE = 12; @@ -80,18 +79,13 @@ constexpr int DEV_MAX_SIZE = 8; constexpr int PREFIX_SIZE = 155; constexpr int PADDING_SIZE = 12; -// 读取backup.para字段值的最大长度 -constexpr uint32_t BACKUP_PARA_VALUE_MAX = 5; +constexpr int PATHES_TO_BACKUP_SIZE = 12; // 应用默认备份的目录个数 +constexpr uint32_t BACKUP_PARA_VALUE_MAX = 5; // 读取backup.para字段值的最大长度 +constexpr int SA_THREAD_POOL_COUNT = 1; // SA THREAD_POOL 最大线程数 +constexpr int EXT_CONNECT_MAX_COUNT = 3; // extension 最大启动数 +constexpr int EXT_CONNECT_MAX_TIME = 15000; // SA 启动 extension 等待连接最大时间 -// SA THREAD_POOL 最大线程数 -constexpr int SA_THREAD_POOL_COUNT = 1; -// extension 最大启动数 -constexpr int EXT_CONNECT_MAX_COUNT = 3; -// SA 启动 extension 等待连接最大时间 -constexpr int EXT_CONNECT_MAX_TIME = 15000; - -// 打包文件头部Header结构体fileSize字段最大值。 -constexpr off_t FILESIZE_MAX = 077777777777; +constexpr off_t FILESIZE_MAX = 077777777777; // 打包文件头部Header结构体fileSize字段最大值。 // 打包文件头部Header结构体typeFlag字段值。 constexpr char TYPEFLAG_REGULAR_FILE = '0'; @@ -165,7 +159,7 @@ constexpr int DEFAULT_VERSION_CODE = 0; static inline std::string_view DEFAULT_VERSION_NAME = "0.0.0.0"; // 应用默认备份的目录，其均为相对根路径的路径。为避免模糊匹配，务必以斜线为结尾。 -static inline std::array PATHES_TO_BACKUP = { +static inline std::array PATHES_TO_BACKUP = { "data/storage/el1/database/", "data/storage/el1/base/files/", "data/storage/el1/base/preferences/", -- Gitee