openharmony/developtools_hiperf
1
0
Fork 0
mirror of https://gitee.com/openharmony/developtools_hiperf synced 2024-11-27 01:30:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix stat pid not exist

Browse Source 
Change-Id: I94a9ca6b55b3a212a53868c9651f2ea5d5287b39
Signed-off-by: leiguangyu <leiguangyu@huawei.com>
This commit is contained in:
leiguangyu 2024-11-07 20:43:36 +08:00
parent 0c0a8a871b
commit b1ffd8daa8
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/subcommand_stat.cpp
View File

@ -650,6 +650,10 @@ bool SubCommandStat::OnSubCommand(std::vector<std::string> &args)
HLOGV("CheckAppIsRunning() failed");
return false;
}
if (!CheckOptionPidAndApp(selectPids_)) {
HLOGV("CheckOptionPidAndApp() failed");
return false;
}
perfEvents_.SetCpu(selectCpus_);
std::vector<pid_t> pids;

17
test/unittest/common/native/subcommand_stat_test.cpp
View File

@ -18,6 +18,7 @@
#include <cinttypes>
#include <condition_variable>
#include <mutex>
#include <random>
#include <regex>
#include <sstream>
#include <thread>
@ -2245,10 +2246,24 @@ HWTEST_F(SubCommandStatTest, TestOnSubCommand_app_running, TestSize.Level1)
*/
HWTEST_F(SubCommandStatTest, CheckPidAndApp, TestSize.Level1)
{
pid_t existPid = -1;
const std::string basePath {"/proc/"};
std::vector<std::string> subDirs = GetSubDirs(basePath);
for (const auto &subDir : subDirs) {
if (!IsDigits(subDir)) {
continue;
}
pid_t pid = std::stoll(subDir);
existPid = max(existPid, pid);
}
std::string cmd = "stat -p " + std::to_string(existPid + rand() % 100 + 1) + " -d 2";
EXPECT_EQ(Command::DispatchCommand(cmd), false);
StdoutRecord stdoutRecord;
stdoutRecord.Start();
const auto startTime = chrono::steady_clock::now();
EXPECT_EQ(Command::DispatchCommand("stat -p 700001 -d 2"), true);
std::string existCmd = "stat -p " + std::to_string(existPid) + " -d 2";
EXPECT_EQ(Command::DispatchCommand(existCmd), true);
const auto costMs = std::chrono::duration_cast<std::chrono::milliseconds>(
chrono::steady_clock::now() - startTime);
EXPECT_LE(costMs.count(), defaultRunTimeoutMs);