From c2f611067328a894ff953035e6cc13bfc3f5869e Mon Sep 17 00:00:00 2001 From: porum Date: Fri, 29 Dec 2023 17:55:52 +0800 Subject: [PATCH 1/3] fix decode_log_file_c_impl compile error --- mars/xlog/crypt/decode_log_file_c_impl/CMakeLists.txt | 2 +- mars/xlog/crypt/decode_log_file_c_impl/decode_log_file.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mars/xlog/crypt/decode_log_file_c_impl/CMakeLists.txt b/mars/xlog/crypt/decode_log_file_c_impl/CMakeLists.txt index 932802e8c..8dec228e3 100644 --- a/mars/xlog/crypt/decode_log_file_c_impl/CMakeLists.txt +++ b/mars/xlog/crypt/decode_log_file_c_impl/CMakeLists.txt @@ -14,4 +14,4 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) add_executable(decode_log_file decode_log_file.c micro-ecc-master/uECC.c) -target_link_libraries(decode_log_file libzstd_static) \ No newline at end of file +target_link_libraries(decode_log_file libzstd_static z) \ No newline at end of file diff --git a/mars/xlog/crypt/decode_log_file_c_impl/decode_log_file.c b/mars/xlog/crypt/decode_log_file_c_impl/decode_log_file.c index 059807fae..547f9cb1a 100644 --- a/mars/xlog/crypt/decode_log_file_c_impl/decode_log_file.c +++ b/mars/xlog/crypt/decode_log_file_c_impl/decode_log_file.c @@ -196,6 +196,7 @@ bool zstdDecompress(const char* compressedBytes, size_t compressedBytesSize, cha ZSTD_inBuffer input = {compressedBytes, compressedBytesSize, 0}; ZSTD_outBuffer output = {NULL, compressedBytesSize, 0}; bool done = false; + size_t lastPos = output.pos; while (!done) { if (output.pos >= uncompLength) { From aa3454e6988a7032436fb4ad0f1873649deecf05 Mon Sep 17 00:00:00 2001 From: porum <48167317+porum@users.noreply.github.com> Date: Wed, 28 Aug 2024 15:26:23 +0800 Subject: [PATCH 2/3] Fixed incorrect thread start call --- mars/xlog/src/appender.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mars/xlog/src/appender.cc b/mars/xlog/src/appender.cc index 652f5949f..3da89cd9d 100644 --- a/mars/xlog/src/appender.cc +++ b/mars/xlog/src/appender.cc @@ -318,7 +318,7 @@ void XloggerAppender::Open(const XLogConfig& _config) { config_.cachedir_, config_.logdir_, config_.nameprefix_)); - thread_timeout_cache_->start_after(3 * 60 * 1000); + thread_moveold_->start_after(3 * 60 * 1000); #ifdef __APPLE__ setAttrProtectionNone(config_.cachedir_.c_str()); #endif From 9e4c11d32536747cea9bdcec1b29a80beb4dc04e Mon Sep 17 00:00:00 2001 From: porum <48167317+porum@users.noreply.github.com> Date: Tue, 19 May 2026 11:38:15 +0800 Subject: [PATCH 3/3] 16KB --- mars/CMakeLists.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mars/CMakeLists.txt b/mars/CMakeLists.txt index 169d926b1..15f87aa57 100644 --- a/mars/CMakeLists.txt +++ b/mars/CMakeLists.txt @@ -48,6 +48,11 @@ if(ANDROID) file(GLOB SELF_SRC_FILES libraries/mars_android_sdk/jni/JNI_OnLoad.cc libraries/mars_xlog_sdk/jni/import.cc) add_library(${SELF_LIB_NAME} SHARED ${SELF_SRC_FILES}) + set_target_properties( + ${SELF_LIB_NAME} + PROPERTIES + LINK_FLAGS "-Wl,-z,max-page-size=16384 -Wl,-z,common-page-size=16384" + ) install(TARGETS ${SELF_LIB_NAME} LIBRARY DESTINATION ${SELF_LIBS_OUT} ARCHIVE DESTINATION ${SELF_LIBS_OUT}) get_filename_component(EXPORT_XLOG_EXP_FILE libraries/mars_android_sdk/jni/export.exp ABSOLUTE) set(SELF_XLOG_LINKER_FLAG "-Wl,--gc-sections -Wl,--version-script='${EXPORT_XLOG_EXP_FILE}'") @@ -67,6 +72,11 @@ if(ANDROID) set(SELF_LIB_NAME marsstn) file(GLOB SELF_SRC_FILES libraries/mars_android_sdk/jni/*.cc) add_library(${SELF_LIB_NAME} SHARED ${SELF_SRC_FILES}) + set_target_properties( + ${SELF_LIB_NAME} + PROPERTIES + LINK_FLAGS "-Wl,-z,max-page-size=16384 -Wl,-z,common-page-size=16384" + ) install(TARGETS ${SELF_LIB_NAME} LIBRARY DESTINATION ${SELF_LIBS_OUT} ARCHIVE DESTINATION ${SELF_LIBS_OUT}) link_directories(${SELF_LIBS_OUT}) find_library(CRYPT_LIB crypto PATHS openssl/openssl_lib_android/${ANDROID_ABI} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)