openharmony/developtools_profiler
1
0
Fork 0
mirror of https://gitee.com/openharmony/developtools_profiler synced 2024-11-27 00:51:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

修改告警

Browse Source 
Signed-off-by: j00383476 <jinhai2@huawei.com>
This commit is contained in:
j00383476 2024-07-01 21:23:05 +08:00
parent acc7a597c7
commit a05c76e488
3 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
host/smartperf/client/client_command/control_call_cmd.cpp
View File

@ -329,9 +329,9 @@ std::string ControlCallCmd::GetAppStartTime() const
SPUtils::LoadCmd("rm -rfv /data/local/tmp/sp_trace_start.ftrace", cmdResult);
std::string traceName = std::string("/data/local/tmp/") + std::string("sp_trace_") + "start" + ".ftrace";
std::thread thGetTrace = std::thread([&sd, traceName]() { sd.GetTrace("start", traceName); });
std::thread thGetHisysId = std::thread([&sd]() { sd.GetHisysIdAndKill(); });
std::promise<std::string> promRadar;
std::promise<std::string> promRadarFrame;
std::thread thGetHisysId = std::thread([&sd]() { sd.GetHisysIdAndKill(); });
std::future<std::string> futureRadar = promRadar.get_future();
std::thread([promRadar = std::move(promRadar)]() mutable {
promRadar.set_value(SPUtils::GetRadar());

11
host/smartperf/client/client_command/include/navigation.h
View File

@ -37,10 +37,17 @@ private:
navigation(const navigation &);
navigation &operator = (const navigation &);
std::string packageName = "";
const int paramNine = 9;
const int paramTen = 10;
const int paramEleven = 11;
const int paramTwelve = 11;
const int paramTwo = 2;
const int paramThree = 3;
const int paramTwentyFour = 24;
};
struct DumpEntity {
std::string pid;
std::string winId;
const std::string pid;
const std::string winId;
};
}
}

21
host/smartperf/client/client_command/navigation.cpp
View File

@ -57,9 +57,9 @@ std::map<std::string, std::string> navigation::GetNavResult(std::string winId) c
{
std::map<std::string, std::string> navInfo;
std::string nameStr = "no-Navigation";
std::sttring paramStr = "";
const std::string winIdWitchSpace = " " + winId + " ";
const std::string cmd = "hidumper -s WindowManagerService -a '-w" + winIdWitchSpace + "-navigation'";
std::string paramStr = "";
const std::string winIdWithSpace = " " + winId + " ";
const std::string cmd = "hidumper -s WindowManagerService -a '-w" + winIdWithSpace + "-navigation'";
FILE *navfd = popen(cmd.c_str(), "r");
if (navfd == nullptr) {
navInfo["navPathName"] = nameStr;
@ -72,11 +72,11 @@ std::map<std::string, std::string> navigation::GetNavResult(std::string winId) c
size_t pos = line.find("]{ name:");
size_t pos2 = line.find_last_of("}");
if (line.find(",") != std::string::npos) {
size_t pos1 = line.find_last_of(",");
nameStr = line.substr(pos + 10, pos1 - pos - 11);
paramStr = line.substr(pos + 9, pos2 - pos1 - 10);
size_t pos1 = line.find(",");
nameStr = line.substr(pos + paramTen, pos1 - pos - paramEleven);
paramStr = line.substr(pos1 + paramNine, pos2 - pos1 - paramTen);
} else {
nameStr = line.substr(pos + 10, pos2 - pos - 12);
nameStr = line.substr(pos + paramTen, pos2 - pos - paramTwelve);
paramStr = "";
}
@ -110,10 +110,11 @@ std::string navigation::GetWinId(std::string processId) const
}
std::vector<std::string> params;
SPUtils::StrSplit(line, " ", params);
if (params[2].find("Pid") != std::string::npos && params[3].find("WinId") != std::string::npos) {
if (params[paramTwo].find("Pid") != std::string::npos &&
params[paramThree].find("WinId") != std::string::npos) {
continue;
}
if (params.size() > 24) {
if (params.size() > paramTwentyFour) {
DumpEntity dumpEntity { params[2], params[3] };
dumpEntityList.push_back(dumpEntity);
}
@ -124,7 +125,7 @@ std::string navigation::GetWinId(std::string processId) const
for (size_t i = 0; i < dumpEntityList.size(); i++) {
DumpEntity dumpItem = dumpEntityList[i];
if (dumpItem.pid == processId) {
wid = dumpItem.pid;
wid = dumpItem.winId;
break;
}