openharmony/developtools_hiperf
1
0
Fork 0
mirror of https://gitee.com/openharmony/developtools_hiperf synced 2024-12-12 10:16:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!588 增加开发者模式判断、修正错误提示中的单词拼写错误

Browse Source 
Merge pull request !588 from yuyanqing/OpenHarmony-5.0-Release
This commit is contained in:
openharmony_ci 2024-09-04 10:58:00 +00:00 committed by Gitee
commit 28d170e410
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/utilities.h
View File

@ -339,6 +339,7 @@ bool IsExistDebugByPid(const std::vector<pid_t> pids);
bool IsDebugableApp(const std::string& bundleName);
bool IsSupportNonDebuggableApp();
const std::string GetUserType();
bool GetDeveloperMode();
bool IsArkJsFile(const std::string& filepath);
std::string GetProcessName(int pid);
bool NeedAdaptSandboxPath(char *filename, int pid, u16 &headerSize);

5
src/main.cpp
View File

@ -42,6 +42,11 @@ using namespace OHOS::Developtools::HiPerf;
int main(const int argc, const char *argv[])
{
if (!GetDeveloperMode() && !IsAllowProfilingUid()) {
printf("error: not in developermode, exit.\n");
return -1;
}
std::ios::sync_with_stdio(false);
cin.tie(nullptr);

28
src/utilities.cpp
View File

@ -336,9 +336,10 @@ bool WriteStringToFile(const std::string &fileName, const std::string &value)
bool IsRoot()
{
#if is_linux || is_ohos
static bool isRoot = (getuid() == 0);
return isRoot;
#if defined(is_ohos) && is_ohos
std::string debugMode = "0";
debugMode = OHOS::system::GetParameter("const.debuggable", debugMode);
return debugMode == "1";
#else
return true;
#endif
@ -672,8 +673,8 @@ bool CheckAppIsRunning (std::vector<pid_t> &selectPids, const std::string &appPa
bool IsExistDebugByApp(const std::string& bundleName)
{
if (!IsSupportNonDebuggableApp() && !bundleName.empty() && !IsDebugableApp(bundleName)) {
HLOGE("--app option only support debug aplication.");
printf("--app option only support debug aplication\n");
HLOGE("--app option only support debug application.");
printf("--app option only support debug application\n");
return false;
}
return true;
@ -692,8 +693,8 @@ bool IsExistDebugByPid(const std::vector<pid_t> pids)
}
std::string bundleName = GetProcessName(pid);
if (!IsSupportNonDebuggableApp() && !IsDebugableApp(bundleName)) {
HLOGE("-p option only support debug aplication for %s", bundleName.c_str());
printf("-p option only support debug aplication\n");
HLOGE("-p option only support debug application for %s", bundleName.c_str());
printf("-p option only support debug application\n");
return false;
}
}
@ -739,7 +740,7 @@ bool IsDebugableApp(const std::string& bundleName)
bool IsSupportNonDebuggableApp()
{
// root first
if (IsRoot() || IsHiviewCall()) {
if (IsRoot()) {
return true;
}
// user mode
@ -764,6 +765,17 @@ const std::string GetUserType()
#endif
}
bool GetDeveloperMode()
{
#if defined(is_ohos) && is_ohos
bool developerMode = OHOS::system::GetBoolParameter("const.security.developermode.state", false);
HLOGD("GetDeveloperMode: developerMode is %d", developerMode);
return developerMode;
#else
return true;
#endif
}
bool LittleMemory()
{
std::ifstream file("/proc/meminfo");