update hook code

Author: gaohaoyuan

.gitignore

@@ -1,4 +1,5 @@
+.vscode/
+.cache/
 build/
 out/
-.vscode/
 compile_commands.json

CMakeLists.txt

@@ -21,7 +21,8 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 endif()
 
 add_subdirectory(aosp_file)
-add_subdirectory(backtrace_helper)
+add_subdirectory(unwindstack/cmake)
+add_subdirectory(backtrace)
 
 if (ANDROID_ABI MATCHES "arm64-v8a")
     set(VNDK_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/aosp_file/com.android.vndk.v30/lib64")
@@ -32,9 +33,9 @@ else ()
 endif ()
 
 # 添加 .so
-add_library(alloc_hook SHARED ${CMAKE_SOURCE_DIR}/src/host_alloc_hook.cpp ${CMAKE_SOURCE_DIR}/src/dma_alloc_hook.cpp)
+add_library(alloc_hook SHARED ${CMAKE_SOURCE_DIR}/src/alloc_hook.cpp)
 # 链接需要的库和头文件
-target_link_libraries(alloc_hook PRIVATE backtrace_helper)
+target_link_libraries(alloc_hook PRIVATE helper)
 # 安装到 out/lib 目录
 install(TARGETS alloc_hook DESTINATION ${CMAKE_INSTALL_PREFIX}/out/lib)
 

src/alloc_hook.cpp

@@ -0,0 +1,74 @@
+#include <dlfcn.h>
+#include <pthread.h>
+#include <cstddef>
+#include <type_traits>
+
+#include "DebugData.h"
+#include "PointerData.h"
+#include "malloc_debug.h"
+
+class AllocHook {
+public:
+    AllocHook() { 
+        void* ptr [2] = { &Db_storage, &Pd_storage }; 
+        debug_initialize(ptr); 
+    }
+    ~AllocHook() { debug_finalize(); }
+
+    void* malloc(size_t size) { return debug_malloc(size); }
+    void free(void* ptr) { debug_free(ptr); }
+    void* calloc(size_t a, size_t b) { return debug_calloc(a, b); }
+    void* realloc(void* ptr, size_t size) { return debug_realloc(ptr, size); }
+    int posix_memalign(void** ptr, size_t alignment, size_t size) { return debug_posix_memalign(ptr, alignment, size); }
+    int ioctl(int fd, int request, void* arg) { return debug_ioctl(fd, request, arg); }
+    int close(int fd) { return debug_close(fd); }
+
+    static AllocHook& inst();
+
+private:
+    static std::aligned_storage<sizeof(DebugData), alignof(DebugData)>::type Db_storage;
+    static std::aligned_storage<sizeof(PointerData), alignof(PointerData)>::type Pd_storage;
+};
+std::aligned_storage<sizeof(DebugData), alignof(DebugData)>::type AllocHook::Db_storage;
+std::aligned_storage<sizeof(PointerData), alignof(PointerData)>::type AllocHook::Pd_storage;
+
+AllocHook& AllocHook::inst() {
+    static AllocHook hook;
+    return hook;
+}
+
+extern "C" {
+void* malloc(size_t size) {
+    return AllocHook::inst().malloc(size);
+}
+
+void free(void* ptr) {
+    AllocHook::inst().free(ptr);
+}
+
+void* calloc(size_t a, size_t b) {
+    return AllocHook::inst().calloc(a, b);
+}
+
+void* realloc(void* ptr, size_t size) {
+    return AllocHook::inst().realloc(ptr, size);
+}
+
+int posix_memalign(void** ptr, size_t alignment, size_t size) {
+    return AllocHook::inst().posix_memalign(ptr, alignment, size);
+}
+
+int ioctl(int fd, int request, ...) {
+    va_list ap;
+    va_start(ap, request);
+    void* arg = va_arg(ap, void*);
+    va_end(ap);
+
+    return AllocHook::inst().ioctl(fd, request, arg);
+}
+
+int close(int fd) {
+    return AllocHook::inst().close(fd);
+}
+
+}