This is an automated email from the ASF dual-hosted git repository. xjiao pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mnemonic.git
commit 5f695fe11e1e0194bdf50433633603496e18b443 Author: Yanhui Zhao <[email protected]> AuthorDate: Sun Aug 22 04:43:27 2021 -0700 fixup! MNEMONIC-673: Add pmalloc package into mnemonic source to reduce external dependencies --- .../mnemonic-pmalloc-service/src/main/native/CMakeLists.txt | 6 +----- .../mnemonic-pmalloc-service/src/main/native/common.h | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/mnemonic-memory-services/mnemonic-pmalloc-service/src/main/native/CMakeLists.txt b/mnemonic-memory-services/mnemonic-pmalloc-service/src/main/native/CMakeLists.txt index 4d2af75..099a69c 100644 --- a/mnemonic-memory-services/mnemonic-pmalloc-service/src/main/native/CMakeLists.txt +++ b/mnemonic-memory-services/mnemonic-pmalloc-service/src/main/native/CMakeLists.txt @@ -40,11 +40,6 @@ include_directories(${JNI_INCLUDE_DIRS}) find_package(Threads REQUIRED) include_directories(${CMAKE_THREAD_LIBS_INIT}) -#find_library(LIBPMALLOC_LIBRARIES NAMES libpmalloc_static.a) -#if (NOT LIBPMALLOC_LIBRARIES) -# message(FATAL_ERROR "not found pmalloc library") -#endif (NOT LIBPMALLOC_LIBRARIES) - add_library(pmallocallocator SHARED common.c org_apache_mnemonic_service_memory_internal_PMallocServiceImpl.c @@ -62,6 +57,7 @@ add_library(pmallocallocator SHARED pmreport.c pmsync.c pmvalloc.c + pmalloc.c ) target_include_directories(pmallocallocator PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(pmallocallocator ${LIBPMALLOC_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) diff --git a/mnemonic-memory-services/mnemonic-pmalloc-service/src/main/native/common.h b/mnemonic-memory-services/mnemonic-pmalloc-service/src/main/native/common.h index 449a851..0d29f0c 100644 --- a/mnemonic-memory-services/mnemonic-pmalloc-service/src/main/native/common.h +++ b/mnemonic-memory-services/mnemonic-pmalloc-service/src/main/native/common.h @@ -35,7 +35,7 @@ extern "C" { #include <assert.h> #include <pthread.h> #include <jni.h> -#include <pmalloc.h> +#include "pmalloc.h" void throw(JNIEnv* env, const char* msg);
