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

!1996 修复on_start死锁

Browse Source 
Merge pull request !1996 from zhangyixin/master
This commit is contained in:
openharmony_ci 2024-11-04 11:12:36 +00:00 committed by Gitee
commit c5a78217f0
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 77 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
device/plugins/native_hook/src/hook_client.cpp
View File

@ -245,6 +245,7 @@ void* MallocHookStart(void* disableHookCallback)
COMMON::PrintMallinfoLog("before hook(byte) => ", g_miStart);
g_mallocTimes = 0;
g_hookClient.reset();
GetMainThreadRuntimeStackRange(g_filterStaLibRange);
if (g_hookClient != nullptr) {
return nullptr;
} else {
@ -271,7 +272,6 @@ bool ohos_malloc_hook_on_start(void (*disableHookCallback)())
pthread_setspecific(g_hookTid, nullptr);
pthread_key_create(&g_updateThreadNameCount, nullptr);
pthread_setspecific(g_updateThreadNameCount, reinterpret_cast<void *>(0));
GetMainThreadRuntimeStackRange(g_filterStaLibRange);
constexpr int paramBufferLen = 128;
char paramOutBuf[paramBufferLen] = {0};
int ret = GetParameter("persist.hiviewdfx.profiler.mem.filter", "", paramOutBuf, paramBufferLen);
@ -632,6 +632,11 @@ void* hook_calloc(void* (*fn)(size_t, size_t), size_t number, size_t size)
#endif
return pRet;
}
std::weak_ptr<HookSocketClient> weakClient = g_hookClient;
auto holder = weakClient.lock();
if (holder == nullptr) {
return pRet;
}
StackRawData rawdata = {{{{0}}}};
const char* stackptr = nullptr;
const char* stackendptr = nullptr;
@ -675,17 +680,13 @@ void* hook_calloc(void* (*fn)(size_t, size_t), size_t number, size_t size)
if (g_ClientConfig.sampleInterval >= THRESHOLD) {
Addr2Bitpool(pRet);
}
std::weak_ptr<HookSocketClient> weakClient = g_hookClient;
auto holder = weakClient.lock();
if (holder != nullptr) {
int realSize = 0;
if (g_ClientConfig.fpunwind) {
realSize = sizeof(BaseStackRawData) + (fpStackDepth * sizeof(uint64_t));
} else {
realSize = sizeof(BaseStackRawData) + sizeof(rawdata.regs);
}
holder->SendStackWithPayload(&rawdata, realSize, stackptr, stackSize);
int realSize = 0;
if (g_ClientConfig.fpunwind) {
realSize = sizeof(BaseStackRawData) + (fpStackDepth * sizeof(uint64_t));
} else {
realSize = sizeof(BaseStackRawData) + sizeof(rawdata.regs);
}
holder->SendStackWithPayload(&rawdata, realSize, stackptr, stackSize);
g_mallocTimes++;
#ifdef PERFORMANCE_DEBUG
struct timespec end = {};
@ -741,6 +742,11 @@ void* hook_realloc(void* (*fn)(void*, size_t), void* ptr, size_t size)
#endif
return pRet;
}
std::weak_ptr<HookSocketClient> weakClient = g_hookClient;
auto holder = weakClient.lock();
if (holder == nullptr) {
return pRet;
}
StackRawData rawdata = {{{{0}}}};
StackRawData freeData = {{{{0}}}};
const char* stackptr = nullptr;
@ -792,27 +798,23 @@ void* hook_realloc(void* (*fn)(void*, size_t), void* ptr, size_t size)
if (g_ClientConfig.sampleInterval >= THRESHOLD) {
Addr2Bitpool(pRet);
}
std::weak_ptr<HookSocketClient> weakClient = g_hookClient;
auto holder = weakClient.lock();
if (holder != nullptr) {
int realSize = 0;
int freeRealSize = 0;
freeData.type = FREE_MSG;
freeData.pid = rawdata.pid;
freeData.tid = rawdata.tid;
freeData.mallocSize = 0;
freeData.addr = ptr;
freeData.ts = rawdata.ts;
if (g_ClientConfig.fpunwind) {
realSize = sizeof(BaseStackRawData) + (fpStackDepth * sizeof(uint64_t));
freeRealSize = sizeof(BaseStackRawData);
} else {
realSize = sizeof(BaseStackRawData) + sizeof(rawdata.regs);
freeRealSize = realSize;
}
holder->SendStackWithPayload(&freeData, freeRealSize, nullptr, 0); // 0: Don't unwind the freeData
holder->SendStackWithPayload(&rawdata, realSize, stackptr, stackSize);
int realSize = 0;
int freeRealSize = 0;
freeData.type = FREE_MSG;
freeData.pid = rawdata.pid;
freeData.tid = rawdata.tid;
freeData.mallocSize = 0;
freeData.addr = ptr;
freeData.ts = rawdata.ts;
if (g_ClientConfig.fpunwind) {
realSize = sizeof(BaseStackRawData) + (fpStackDepth * sizeof(uint64_t));
freeRealSize = sizeof(BaseStackRawData);
} else {
realSize = sizeof(BaseStackRawData) + sizeof(rawdata.regs);
freeRealSize = realSize;
}
holder->SendStackWithPayload(&freeData, freeRealSize, nullptr, 0); // 0: Don't unwind the freeData
holder->SendStackWithPayload(&rawdata, realSize, stackptr, stackSize);
#ifdef PERFORMANCE_DEBUG
g_mallocTimes++;
struct timespec end = {};
@ -889,6 +891,11 @@ void hook_free(void (*free_func)(void*), void* p)
struct timespec start = {};
clock_gettime(CLOCK_REALTIME, &start);
#endif
std::weak_ptr<HookSocketClient> weakClient = g_hookClient;
auto holder = weakClient.lock();
if (holder == nullptr) {
return;
}
StackRawData rawdata = {{{{0}}}};
const char* stackptr = nullptr;
const char* stackendptr = nullptr;
@ -931,17 +938,13 @@ void hook_free(void (*free_func)(void*), void* p)
rawdata.tid = static_cast<uint32_t>(GetCurThreadId());
rawdata.mallocSize = 0;
rawdata.addr = p;
std::weak_ptr<HookSocketClient> weakClient = g_hookClient;
auto holder = weakClient.lock();
if (holder != nullptr) {
int realSize = 0;
if (g_ClientConfig.fpunwind) {
realSize = sizeof(BaseStackRawData) + (fpStackDepth * sizeof(uint64_t));
} else {
realSize = sizeof(BaseStackRawData) + sizeof(rawdata.regs);
}
holder->SendStackWithPayload(&rawdata, realSize, stackptr, stackSize);
int realSize = 0;
if (g_ClientConfig.fpunwind) {
realSize = sizeof(BaseStackRawData) + (fpStackDepth * sizeof(uint64_t));
} else {
realSize = sizeof(BaseStackRawData) + sizeof(rawdata.regs);
}
holder->SendStackWithPayload(&rawdata, realSize, stackptr, stackSize);
#ifdef PERFORMANCE_DEBUG
g_mallocTimes++;
struct timespec end = {};
@ -1008,6 +1011,11 @@ void* hook_mmap(void*(*fn)(void*, size_t, int, int, int, off_t),
#endif
return ret;
}
std::weak_ptr<HookSocketClient> weakClient = g_hookClient;
auto holder = weakClient.lock();
if (holder == nullptr) {
return ret;
}
StackRawData rawdata = {{{{0}}}};
const char* stackptr = nullptr;
const char* stackendptr = nullptr;
@ -1048,11 +1056,6 @@ void* hook_mmap(void*(*fn)(void*, size_t, int, int, int, off_t),
rawdata.tid = static_cast<uint32_t>(GetCurThreadId());
rawdata.mallocSize = length;
rawdata.addr = ret;
std::weak_ptr<HookSocketClient> weakClient = g_hookClient;
auto holder = weakClient.lock();
if (holder == nullptr) {
return ret;
}
if (fd >= 0) {
rawdata.type = MMAP_FILE_PAGE_MSG;
char path[FD_PATH_LENGTH] = {0};
@ -1105,13 +1108,17 @@ int hook_munmap(int(*fn)(void*, size_t), void* addr, size_t length)
if (g_ClientConfig.mmapDisable || IsPidChanged()) {
return ret;
}
#ifdef PERFORMANCE_DEBUG
struct timespec start = {};
clock_gettime(CLOCK_REALTIME, &start);
#endif
int stackSize = 0;
std::weak_ptr<HookSocketClient> weakClient = g_hookClient;
auto holder = weakClient.lock();
if (holder == nullptr) {
return ret;
}
StackRawData rawdata = {{{{0}}}};
const char* stackptr = nullptr;
const char* stackendptr = nullptr;
@ -1152,17 +1159,13 @@ int hook_munmap(int(*fn)(void*, size_t), void* addr, size_t length)
rawdata.tid = static_cast<uint32_t>(GetCurThreadId());
rawdata.mallocSize = length;
rawdata.addr = addr;
std::weak_ptr<HookSocketClient> weakClient = g_hookClient;
auto holder = weakClient.lock();
if (holder != nullptr) {
int realSize = 0;
if (g_ClientConfig.fpunwind) {
realSize = sizeof(BaseStackRawData) + (fpStackDepth * sizeof(uint64_t));
} else {
realSize = sizeof(BaseStackRawData) + sizeof(rawdata.regs);
}
holder->SendStackWithPayload(&rawdata, realSize, stackptr, stackSize);
int realSize = 0;
if (g_ClientConfig.fpunwind) {
realSize = sizeof(BaseStackRawData) + (fpStackDepth * sizeof(uint64_t));
} else {
realSize = sizeof(BaseStackRawData) + sizeof(rawdata.regs);
}
holder->SendStackWithPayload(&rawdata, realSize, stackptr, stackSize);
#ifdef PERFORMANCE_DEBUG
g_mallocTimes++;
struct timespec end = {};
@ -1187,6 +1190,11 @@ int hook_prctl(int(*fn)(int, ...),
if (reinterpret_cast<char*>(arg5) == nullptr || IsPidChanged()) {
return ret;
}
std::weak_ptr<HookSocketClient> weakClient = g_hookClient;
auto holder = weakClient.lock();
if (holder == nullptr) {
return ret;
}
if (option == PR_SET_VMA && arg2 == PR_SET_VMA_ANON_NAME) {
#ifdef PERFORMANCE_DEBUG
struct timespec start = {};
@ -1204,11 +1212,7 @@ int hook_prctl(int(*fn)(int, ...),
HILOG_BASE_ERROR(LOG_CORE, "memcpy_s tag failed");
}
rawdata.name[sizeof(rawdata.name) - 1] = '\0';
std::weak_ptr<HookSocketClient> weakClient = g_hookClient;
auto holder = weakClient.lock();
if (holder != nullptr) {
holder->SendStackWithPayload(&rawdata, sizeof(BaseStackRawData) + tagLen, nullptr, 0);
}
holder->SendStackWithPayload(&rawdata, sizeof(BaseStackRawData) + tagLen, nullptr, 0);
#ifdef PERFORMANCE_DEBUG
g_mallocTimes++;
struct timespec end = {};
@ -1233,6 +1237,11 @@ void hook_memtrace(void* addr, size_t size, const char* tag, bool isUsing)
struct timespec start = {};
clock_gettime(CLOCK_REALTIME, &start);
#endif
std::weak_ptr<HookSocketClient> weakClient = g_hookClient;
auto holder = weakClient.lock();
if (holder == nullptr) {
return;
}
int stackSize = 0;
StackRawData rawdata = {{{{0}}}};
const char* stackptr = nullptr;
@ -1274,18 +1283,14 @@ void hook_memtrace(void* addr, size_t size, const char* tag, bool isUsing)
rawdata.tid = static_cast<uint32_t>(GetCurThreadId());
rawdata.mallocSize = size;
rawdata.addr = addr;
std::weak_ptr<HookSocketClient> weakClient = g_hookClient;
auto holder = weakClient.lock();
rawdata.tagId = isUsing ? GetTagId(holder, tag) : 0;
if (holder != nullptr) {
int realSize = 0;
if (g_ClientConfig.fpunwind) {
realSize = sizeof(BaseStackRawData) + (fpStackDepth * sizeof(uint64_t));
} else {
realSize = sizeof(BaseStackRawData) + sizeof(rawdata.regs);
}
holder->SendStackWithPayload(&rawdata, realSize, stackptr, stackSize);
int realSize = 0;
if (g_ClientConfig.fpunwind) {
realSize = sizeof(BaseStackRawData) + (fpStackDepth * sizeof(uint64_t));
} else {
realSize = sizeof(BaseStackRawData) + sizeof(rawdata.regs);
}
holder->SendStackWithPayload(&rawdata, realSize, stackptr, stackSize);
#ifdef PERFORMANCE_DEBUG
g_mallocTimes++;
struct timespec end = {};