openharmony/developtools_hiperf
1
0
Fork 0
mirror of https://gitee.com/openharmony/developtools_hiperf synced 2025-02-17 06:39:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!613 创建mmap失败时停止采集

Browse Source 
Merge pull request !613 from yuanye/master
This commit is contained in:
openharmony_ci 2024-10-16 01:46:56 +00:00 committed by Gitee
commit 8e2463cec9
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/perf_events.cpp
View File

@ -1117,12 +1117,15 @@ bool PerfEvents::CreateFdEvents(void)
fdNumber++;
// if sampling, mmap ring buffer
bool createMmapSucc = true;
if (recordCallBack_) {
if (isSpe_) {
CreateSpeMmap(fdItem, eventItem.attr);
} else {
CreateMmap(fdItem, eventItem.attr);
}
createMmapSucc = isSpe_ ?
CreateSpeMmap(fdItem, eventItem.attr) : CreateMmap(fdItem, eventItem.attr);
}
if (!createMmapSucc) {
printf("create mmap fail\n");
HIPERF_HILOGI(MODULE_DEFAULT, "create mmap fail");
return false;
}
// update group leader
int groupFdCacheNum = groupFdCache[icpu][ipid];
@ -1209,7 +1212,7 @@ bool PerfEvents::CreateSpeMmap(const FdItem &item, const perf_event_attr &attr)
if (it == cpuMmap_.end()) {
void *rbuf = mmap(nullptr, (1 + auxMmapPages_) * pageSize_, (PROT_READ | PROT_WRITE), MAP_SHARED,
item.fd.Get(), 0);
CHECK_TRUE(rbuf == MMAP_FAILED, false, 0, "");
CHECK_TRUE(rbuf == MMAP_FAILED, false, 1, "");
void *auxRbuf = mmap(nullptr, auxMmapPages_ * pageSize_, (PROT_READ | PROT_WRITE), MAP_SHARED,
item.fd.Get(), 0);
MmapFd mmapItem;