openharmony/arkcompiler_ets_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkcompiler_ets_runtime synced 2024-10-07 08:03:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!7515 Fix runtime info mmap bugfix

Browse Source 
Merge pull request !7515 from herongpeng/fix_mmap
This commit is contained in:
openharmony_ci 2024-05-28 06:37:12 +00:00 committed by Gitee
commit 0fc1a33cbe
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 40 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ecmascript/compiler/aot_compiler.cpp
View File

@ -76,6 +76,14 @@ std::pair<bool, int> CheckVersion(JSRuntimeOptions &runtimeOptions, bool result)
return std::pair(false, 0);
}
bool IsExistsPkgInfo(AotCompilerPreprocessor &cPreprocessor)
{
if (cPreprocessor.GetMainPkgArgs()) {
return true;
}
return false;
}
int Main(const int argc, const char **argv)
{
if (argc < 2) { // 2: at least have two arguments
@ -125,7 +133,7 @@ int Main(const int argc, const char **argv)
if (!cPreprocessor.HandleTargetCompilerMode(cOptions) || !cPreprocessor.HandlePandaFileNames(argc, argv)) {
return ERR_HELP;
}
if (JSNApi::IsAotEscape(cPreprocessor.GetMainPkgArgs()->GetPgoDir())) {
if (IsExistsPkgInfo(cPreprocessor) && JSNApi::IsAotEscape(cPreprocessor.GetMainPkgArgs()->GetPgoDir())) {
LOG_COMPILER(ERROR) << " Stop compile AOT because there are more crashes";
return ERR_FAIL;
}
@ -221,7 +229,9 @@ int Main(const int argc, const char **argv)
if (runtimeOptions.IsTargetCompilerMode()) {
compilerStats.PrintCompilerStatsLog();
}
ohos::EnableAotListHelper::GetInstance()->AddEnableListCount(cPreprocessor.GetMainPkgArgs()->GetPgoDir());
if (IsExistsPkgInfo(cPreprocessor)) {
ohos::EnableAotListHelper::GetInstance()->AddEnableListCount(cPreprocessor.GetMainPkgArgs()->GetPgoDir());
}
}
LOG_COMPILER(INFO) << (ret ? "ts aot compile success" : "ts aot compile failed");

48
ecmascript/ohos/aot_runtime_info.h
View File

@ -85,20 +85,24 @@ public:
return time.tv_sec * USEC_PER_SEC + time.tv_nsec / NSEC_PER_USEC;
}
std::vector<RuntimeInfoPart> GetCrashRuntimeInfoList(const std::string &soBuildId) const
std::vector<RuntimeInfoPart> GetCrashRuntimeInfoList() const
{
std::string realOutPath = GetCrashSandBoxRealPath();
std::vector<RuntimeInfoPart> list;
if (realOutPath == "") {
if (!FileExist(realOutPath.c_str())) {
LOG_ECMA(INFO) << "Get crash sanbox path fail.";
return list;
}
std::string soBuildId = GetRuntimeBuildId();
if (soBuildId == "") {
LOG_ECMA(INFO) << "can't get so buildId.";
return list;
}
list = GetRuntimeInfoByPath(realOutPath, soBuildId);
return list;
}
std::vector<RuntimeInfoPart> GetRealPathRuntimeInfoList(const std::string &pgoRealPath,
const std::string &soBuildId) const
std::vector<RuntimeInfoPart> GetRealPathRuntimeInfoList(const std::string &pgoRealPath) const
{
std::vector<RuntimeInfoPart> list;
std::string realOutPath;
@ -107,15 +111,20 @@ public:
if (!ecmascript::RealPath(runtimePgoRealPath, realOutPath, false)) {
return list;
}
if (realOutPath == "") {
if (!FileExist(realOutPath.c_str())) {
LOG_ECMA(INFO) << "Get pgo real path fail.";
return list;
}
std::string soBuildId = GetRuntimeBuildId();
if (soBuildId == "") {
LOG_ECMA(INFO) << "can't get so buildId.";
return list;
}
list = GetRuntimeInfoByPath(realOutPath, soBuildId);
return list;
}
void BuildCompileRuntimeInfo(const std::string &type, const std::string &pgoPath)
void BuildCompileRuntimeInfo(const std::string &type, const std::string &pgoPath) const
{
std::string soBuildId = GetRuntimeBuildId();
if (soBuildId == "") {
@ -135,14 +144,14 @@ public:
SetRuntimeInfo(realOutPath, lines);
}
void BuildCrashRuntimeInfo(const std::string &type)
void BuildCrashRuntimeInfo(const std::string &type) const
{
std::string soBuildId = GetRuntimeBuildId();
if (soBuildId == "") {
LOG_ECMA(INFO) << "can't get so buildId.";
return;
}
std::vector<RuntimeInfoPart> lines = GetCrashRuntimeInfoList(soBuildId);
std::vector<RuntimeInfoPart> lines = GetCrashRuntimeInfoList();
uint64_t timestamp = GetMicrosecondsTimeStamp();
RuntimeInfoPart buildLine = RuntimeInfoPart(soBuildId, std::to_string(timestamp), type);
lines.emplace_back(buildLine);
@ -166,16 +175,11 @@ public:
std::map<RuntimeInfoType, int> CollectCrashSum(const std::string &pgoRealPath = "")
{
std::map<RuntimeInfoType, int> escapeMap;
std::string soBuildId = GetRuntimeBuildId();
if (soBuildId == "") {
LOG_ECMA(INFO) << "can't get so buildId.";
return escapeMap;
}
std::vector<RuntimeInfoPart> runtimeInfoParts;
if (pgoRealPath == "") {
runtimeInfoParts = GetCrashRuntimeInfoList(soBuildId);
runtimeInfoParts = GetCrashRuntimeInfoList();
} else {
runtimeInfoParts = GetRealPathRuntimeInfoList(pgoRealPath, soBuildId);
runtimeInfoParts = GetRealPathRuntimeInfoList(pgoRealPath);
}
for (const auto &runtimeInfoPart: runtimeInfoParts) {
RuntimeInfoType runtimeInfoType = GetRuntimeInfoTypeByStr(runtimeInfoPart.type);
@ -184,7 +188,7 @@ public:
return escapeMap;
}
std::string GetRuntimeBuildId()
std::string GetRuntimeBuildId() const
{
std::string realPath;
if (!FileExist(OhosConstants::RUNTIME_SO_PATH)) {
@ -197,12 +201,16 @@ public:
if (!FileExist(realPath.c_str())) {
return "";
}
fileMap = ecmascript::FileMap(realPath.c_str(), FILE_RDONLY, PAGE_PROT_READ);
ecmascript::MemMap fileMap = ecmascript::FileMap(realPath.c_str(), FILE_RDONLY, PAGE_PROT_READ);
if (fileMap.GetOriginAddr() == nullptr) {
LOG_ECMA(INFO) << "runtime info file mmap failed";
return "";
}
ecmascript::PagePreRead(fileMap.GetOriginAddr(), fileMap.GetSize());
return ParseELFSectionsForBuildId();
std::string buildId = ParseELFSectionsForBuildId(fileMap);
ecmascript::FileUnMap(fileMap);
fileMap.Reset();
return buildId;
}
static std::string GetRuntimeInfoTypeStr(RuntimeInfoType type)
@ -303,7 +311,7 @@ private:
return realOutPath;
}
std::string ParseELFSectionsForBuildId() const
std::string ParseELFSectionsForBuildId(ecmascript::MemMap &fileMap) const
{
llvm::ELF::Elf64_Ehdr *ehdr = reinterpret_cast<llvm::ELF::Elf64_Ehdr *>(fileMap.GetOriginAddr());
char *addr = reinterpret_cast<char *>(ehdr);
@ -382,8 +390,6 @@ private:
{
return (align) - 1;
}
ecmascript::MemMap fileMap;
};
} // namespace panda::ecmascript
#endif // ECMASCRIPT_COMPILER_OHOS_RUNTIME_BUILD_INFO_H

2
ecmascript/ohos/enable_aot_list_helper.h
View File

@ -118,7 +118,7 @@ public:
return false;
}
void AddEnableListCount(const std::string &pgoPath) const
void AddEnableListCount(const std::string &pgoPath = "") const
{
ohos::AotRuntimeInfo aotRuntimeInfo;
aotRuntimeInfo.BuildCompileRuntimeInfo(